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

Commit 318d4002 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master 

Bug: 134405016
Change-Id: Ie4b12ddc2020f56401aaabbcd0c8d01abe764635
parents b5886ddb 1c0e23ef

Android.mk

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



LOCAL_STATIC_ANDROID_LIBRARIES := \

    $(ANDROID_SUPPORT_DESIGN_TARGETS) \

    android-support-transition \

    android-support-v13 \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-recyclerview \

    android-support-v7-palette \

    android-support-v4

    com.google.android.material_material \

    androidx.transition_transition \

    androidx.legacy_legacy-support-v13 \

    androidx.appcompat_appcompat \

    androidx.cardview_cardview \

    androidx.recyclerview_recyclerview \

    androidx.palette_palette \

    androidx.legacy_legacy-support-v4



LOCAL_STATIC_JAVA_LIBRARIES := \

    android-common \

AndroidManifest.xml

+1 −11
Original line number Diff line number Diff line
@@ -46,11 +46,6 @@ 
    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>

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

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

    <!-- Following used for QuickContacts -->

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

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

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

    <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL"/>

    <!-- Following used for Contact metadata syncing -->

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

    <!-- Following used for getting the status of the contacts sync adapter -->
@@ -283,11 +278,6 @@ 
            android:exported="false"

            android:theme="@style/PeopleTheme"/>



        <activity

            android:name=".activities.RequestDesiredPermissionsActivity"

            android:exported="false"

            android:theme="@style/PeopleTheme"/>



        <activity

            android:name=".activities.RequestImportVCardPermissionsActivity"

            android:exported="false"
@@ -594,7 +584,7 @@ 
            android:permission="android.permission.BIND_JOB_SERVICE"/>



        <provider

            android:name="android.support.v4.content.FileProvider"

            android:name="androidx.core.content.FileProvider"

            android:authorities="@string/contacts_file_provider_authority"

            android:exported="false"

            android:grantUriPermissions="true">

proguard.flags

+0 −2
Original line number Diff line number Diff line
@@ -32,8 +32,6 @@ 
-keep class com.android.contacts.format.FormatUtils { *; }

-keep class com.android.contacts.format.TextHighlighter { *; }

-keep class com.android.contacts.group.GroupUtil { *; }

-keep class com.android.contacts.interactions.CallLogInteraction { *; }

-keep class com.android.contacts.interactions.CallLogInteractionsLoader { *; }

-keep class com.android.contacts.interactions.ContactDeletionInteraction { *; }

-keep class com.android.contacts.interactions.ContactInteractionUtil { *; }

-keep class com.android.contacts.list.ContactListItemView { *; }

res/layout-land/contact_editor_fragment.xml

+21 −13
Original line number Diff line number Diff line
@@ -15,12 +15,17 @@ 
     limitations under the License.

-->



<com.android.contacts.editor.RawContactEditorView

<FrameLayout

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

    android:id="@+id/contact_editor_fragment"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:background="@color/background_primary" >



    <com.android.contacts.editor.RawContactEditorView

        android:id="@+id/raw_contacts_editor_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:background="@color/background_primary"

        android:orientation="horizontal"

        android:visibility="invisible">
@@ -34,12 +39,14 @@ 
            android:focusableInTouchMode="true"/>



        <ScrollView

            android:id="@+id/contact_editor_scroller"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:fadingEdge="none"

            android:fillViewport="true">



            <LinearLayout

                android:id="@+id/editor_fields_container"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical">
@@ -53,3 +60,4 @@ 
        </ScrollView>



    </com.android.contacts.editor.RawContactEditorView>

</FrameLayout>

res/layout-land/people_activity_toolbar.xml

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
        android:background="?attr/colorPrimary">



        <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->

        <android.support.v7.widget.Toolbar

        <androidx.appcompat.widget.Toolbar

            android:layout_width="match_parent"

            android:layout_height="?attr/actionBarSize"

            android:id="@+id/toolbar"