Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ccbe5e1 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android Pie into master"

parents 497a4359 096d9eb9

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) 
LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))



LOCAL_STATIC_ANDROID_LIBRARIES := \

    android-support-design \

    $(ANDROID_SUPPORT_DESIGN_TARGETS) \

    android-support-transition \

    android-support-v13 \

    android-support-v7-appcompat \

AndroidManifest.xml

+5 −3
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


<manifest xmlns:android="http://schemas.android.com/apk/res/android"

          package="com.android.contacts"

          android:versionCode="10721"

          android:versionName="1.7.21">

          android:versionCode="10731"

          android:versionName="1.7.31">



    <uses-sdk

        android:minSdkVersion="21"

        android:targetSdkVersion="25"/>

        android:targetSdkVersion="28"/>



    <original-package android:name="com.android.contacts"/>
@@ -56,6 +56,8 @@ 
    <!-- Following used for getting the status of the contacts sync adapter -->

    <uses-permission android:name="android.permission.READ_SYNC_STATS"/>

    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <!-- Required in P to run Service.startForeground() -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>



    <uses-feature

        android:name="android.hardware.telephony"

res/layout/drawer_fragment.xml

+2 −1
Original line number Diff line number Diff line
@@ -29,5 +29,6 @@ 
        android:background="@color/navigation_drawer_background_color"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:clipToPadding="false"

        android:divider="@null" />

</FrameLayout>

res/layout/nav_header_main.xml

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  Copyright (C) 2016 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<View

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/nav_status_bar_spacer"

    android:layout_width="match_parent"

    android:layout_height="@dimen/nav_header_height"

    android:background="@color/contacts_accent_color"

    android:importantForAccessibility="no"/>

res/values-am/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ 
    <string name="permission_explanation_header" msgid="5739405825039695327">"ታሪክዎን አብረው ይመልከቱ"</string>

    <string name="permission_explanation_subheader_calendar_and_SMS" msgid="5411144298889835768">"ኩነቶች እና መልዕክቶች"</string>

    <string name="permission_explanation_subheader_calendar" msgid="8785323496211704613">"ኩነቶች"</string>

    <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"መልእክቶች"</string>

    <string name="permission_explanation_subheader_SMS" msgid="1904552086449525567">"መልዕክቶች"</string>

    <string name="hamburger_feature_highlight_header" msgid="5762679188565585072">"ጥቆማዎች"</string>

    <string name="hamburger_feature_highlight_body" msgid="4403398269286898733">"እውቂያዎችዎን የተደራጁና ጠቃሚ እንደሆኑ ያቆዩ"</string>

    <string name="undo" msgid="1425165101664071422">"ቀልብስ"</string>