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

Commit 4d9e68b5 authored by Xin Li's avatar Xin Li
Browse files

Merge Android Pie into master 

Bug: 112104996
Change-Id: Id547347c690f84ad2939ef18816786e52f5705ea
parents 52ca98bf c0f99402

.gitignore

+1 −0
Original line number Diff line number Diff line 
bin/

gen/

*.iml

.project

.classpath

project.properties

Android.mk

+17 −10
Original line number Diff line number Diff line
@@ -9,18 +9,25 @@ LOCAL_SRC_FILES := \ 
    $(call all-java-files-under, src)



LOCAL_STATIC_ANDROID_LIBRARIES += \

    android-support-v4 \

    android-support-annotations \

    android-support-v7-recyclerview \

    android-support-v7-preference \

    android-support-car \

    android-support-transition \

    android-support-compat \

    android-support-media-compat \

    android-support-core-utils \

    android-support-core-ui \

    android-support-fragment \

    android-support-v7-appcompat \

    android-support-v7-preference \

    android-support-v7-recyclerview \

    android-support-v14-preference \

    android-support-v17-preference-leanback \

    android-support-v17-leanback \

    android-support-v17-preference-leanback \

    car-list \

    SettingsLib



LOCAL_STATIC_JAVA_LIBRARIES := \

    xz-java

    xz-java \

    android-support-annotations



LOCAL_PACKAGE_NAME := PackageInstaller

LOCAL_CERTIFICATE := platform

AndroidManifest.xml

+8 −1
Original line number Diff line number Diff line
@@ -17,17 +17,21 @@ 
    <uses-permission android:name="android.permission.OBSERVE_GRANT_REVOKE_PERMISSIONS" />

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

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

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

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

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

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

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

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

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

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



    <uses-permission android:name="com.google.android.permission.INSTALL_WEARABLE_PACKAGES" />



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



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

    <application android:name=".PackageInstallerApplication"

            android:label="@string/app_name"

            android:allowBackup="false"

            android:theme="@style/DialogWhenLarge"

            android:supportsRtl="true"
@@ -68,6 +72,9 @@ 
        <activity android:name=".InstallStaging"

                android:exported="false" />



        <activity android:name=".DeleteStagedFileOnResult"

            android:exported="false" />



        <activity android:name=".PackageInstallerActivity"

                android:exported="false" />

res/drawable/dialog_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


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

    <shape android:shape="rectangle">

        <corners android:radius="2dp" />

        <corners android:radius="?android:attr/dialogCornerRadius" />

        <solid android:color="?android:attr/colorBackground" />

    </shape>

</inset>

res/drawable/ic_arrow_back.xml

0 → 100644
+30 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2018 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

  -->



<!-- This Icon is used in as the back icon on ActionBar. ActionBar hard code the icon layout and

  ~  does not provide a way to customize it. Here to center the icon in action bar, we make up

  ~  the margin by add the extra space in the icon itself -->

<vector

    android:height="@dimen/car_primary_icon_size"

    android:width="@dimen/car_primary_icon_size"

    android:tint="@color/car_accent"

    android:viewportHeight="24.0"

    android:viewportWidth="24.0"

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

    <path

        android:fillColor="#FF000000"

        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>

</vector>