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

Commit 077965d0 authored by Winson Chung's avatar Winson Chung Committed by android-build-merger
Browse files

Merging ub-launcher3-qt-dev, build 5619253 

am: 0ef6fe00

Change-Id: I26a152016d7dceb61fc333e954c17de11cffbade
parents a8d4085e 0ef6fe00

Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ android_library { 
        "tests/tapl/**/*.java",

        "src/com/android/launcher3/util/SecureSettingsObserver.java",

        "src/com/android/launcher3/ResourceUtils.java",

        "src/com/android/launcher3/TestProtocol.java",

        "src/com/android/launcher3/testing/TestProtocol.java",

    ],

    manifest: "tests/tapl/AndroidManifest.xml",

    platform_apis: true,

AndroidManifest-common.xml

+7 −0
Original line number Diff line number Diff line
@@ -176,5 +176,12 @@ 
            </intent-filter>

        </activity>



        <provider

            android:name="com.android.launcher3.testing.TestInformationProvider"

            android:authorities="${packageName}.TestInfo"

            android:readPermission="android.permission.WRITE_SECURE_SETTINGS"

            android:writePermission="android.permission.WRITE_SECURE_SETTINGS"

            android:exported="true"

            android:enabled="false" />

    </application>

</manifest>

OWNERS

+4 −6
Original line number Diff line number Diff line
@@ -2,13 +2,11 @@ 
# gnl-eng@google.com (Googlers only)



# People who can approve changes for submission

#



adamcohen@google.com

hyunyoungs@google.com

mrcasey@google.com

sunnygoyal@google.com

twickham@google.com

winsonc@google.com
 


# Source of truth of this directory is actually in launcher team's

# unbundled branch ub-launcher3-[release variant] (e.g., master, edmonton).

# Pls try to wait for one of the owner's review if you have to force

# submit (e.g., for large refactor, breakage, etc) as we may want to

# cherry pick the change to our active developmental branch.

quickstep/AndroidManifest.xml

+5 −8
Original line number Diff line number Diff line
@@ -73,14 +73,6 @@ 
            </intent-filter>

        </provider>



        <provider

            android:name="com.android.quickstep.TestInformationProvider"

            android:authorities="${packageName}.TestInfo"

            android:readPermission="android.permission.WRITE_SECURE_SETTINGS"

            android:writePermission="android.permission.WRITE_SECURE_SETTINGS"

            android:exported="true">

        </provider>



        <service

            android:name="com.android.launcher3.uioverrides.dynamicui.WallpaperManagerCompatVL$ColorExtractionService"

            tools:node="remove" />
@@ -92,6 +84,11 @@ 
            android:clearTaskOnLaunch="true"

            android:exported="false" />



        <activity android:name="com.android.quickstep.LockScreenRecentsActivity"

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

                  android:showOnLockScreen="true"

                  android:directBootAware="true" />



    </application>



</manifest>

quickstep/recents_ui_overrides/res/layout/prediction_load_progress.xml

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

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

    style="?android:attr/progressBarStyleHorizontal"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="center"

    android:layout_marginLeft="20dp"

    android:layout_marginRight="20dp"

    android:indeterminate="true"

    android:indeterminateOnly="true"

    android:indeterminateTint="?workspaceTextColor" />