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

Commit f412f5e9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "UI tweaks for package installer"

parents b77167b6 0c0687d6

Android.mk

+12 −1
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_USE_AAPT2 := true

LOCAL_AAPT_FLAGS := --auto-add-overlay \

    --extra-packages android.support.v17.leanback:android.support.v7.preference:android.support.v14.preference:android.support.v17.preference:android.support.v7.appcompat:android.support.v7.recyclerview



LOCAL_RESOURCE_DIR := \

    frameworks/support/v17/leanback/res \

    frameworks/support/v7/preference/res \

    frameworks/support/v14/preference/res \

    frameworks/support/v17/preference-leanback/res \

    frameworks/support/v7/appcompat/res \

    frameworks/support/v7/recyclerview/res \

    frameworks/base/packages/SettingsLib/res \

    $(LOCAL_PATH)/res



LOCAL_MODULE_TAGS := optional

AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


    <application android:label="@string/app_name"

            android:allowBackup="false"

            android:theme="@style/Theme.DialogWhenLarge"

            android:theme="@style/DialogWhenLarge"

            android:supportsRtl="true"

            android:defaultToDeviceProtectedStorage="true"

            android:directBootAware="true">
@@ -54,25 +54,25 @@ 
        </activity>



        <activity android:name=".InstallInstalling"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:theme="@style/DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".InstallSuccess"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:theme="@style/DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".InstallFailed"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:theme="@style/DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".InstallStaging"

                android:theme="@style/Theme.DialogWhenLargeNoAnimation"

                android:theme="@style/DialogWhenLargeNoAnimation"

                android:exported="false" />



        <activity android:name=".UninstallerActivity"

                android:configChanges="orientation|keyboardHidden|screenSize"

                android:excludeFromRecents="true"

                android:theme="@style/Theme.AlertDialogActivity">

                android:theme="@style/AlertDialogActivity">

            <intent-filter android:priority="1">

                <action android:name="android.intent.action.DELETE" />

                <action android:name="android.intent.action.UNINSTALL_PACKAGE" />

res/layout/install_failed.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:orientation="horizontal"

            android:elevation="4dp"

            android:elevation="@dimen/headerElevation"

            android:gravity="center_vertical">



        <ImageView android:id="@+id/app_icon"

res/layout/install_installing.xml

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:orientation="horizontal"

            android:elevation="4dp"

            android:elevation="@dimen/headerElevation"

            android:gravity="center_vertical">



        <ImageView

res/layout/install_staging.xml

+2 −2
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
            android:layout_width="match_parent"

            android:layout_height="?android:attr/actionBarSize"

            android:background="?android:attr/colorPrimary"

            android:elevation="4dp"

            android:elevation="@dimen/headerElevation"

            android:gravity="center_vertical"

            android:orientation="horizontal">
@@ -57,7 +57,7 @@ 
    <TextView android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:background="?android:attr/colorPrimary"

            android:elevation="4dp"

            android:elevation="@dimen/headerElevation"

            android:paddingBottom="16dp"

            android:paddingLeft="16dp"

            android:paddingRight="16dp"