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

Commit f3d805e7 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 

Bug: 298295554
Merged-In: If4c6783472d7fa05a1162e2f176a613d28f7bec3
Change-Id: I63fb79ae0ea2c39d65ca17fcaa34a8e3b993619f
parents fc786807 8dda08c9

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ android_library { 
        "androidx.test.uiautomator_uiautomator",

        "androidx.preference_preference",

        "SystemUISharedLib",

        "SystemUIAnimationLib",

        "animationlib",

        "launcher-testing-shared",

    ],

    srcs: [
@@ -243,7 +243,7 @@ android_library { 
        "lottie",

        "SystemUISharedLib",

        "SystemUI-statsd",

        "SystemUIAnimationLib",

        "animationlib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    min_sdk_version: "current",
@@ -305,7 +305,7 @@ android_library { 
        "SystemUISharedLib",

        "Launcher3CommonDepsLib",

        "QuickstepResLib",

        "SystemUIAnimationLib",

        "animationlib",

    ],

    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,

AndroidManifest-common.xml

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

    <!-- for rotating surface by arbitrary degree -->

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

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

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

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



    <!--

    Permissions required for read/write access to the workspace data. These permission name

OWNERS

+2 −24
Original line number Diff line number Diff line
@@ -5,36 +5,14 @@ 
#



adamcohen@google.com

alexchau@google.com

andonian@google.com

awickham@google.com

brdayauon@google.com

brianji@google.com

captaincole@google.com

charlander@google.com

fbaron@google.com

ganjam@google.com

hwwang@google.com

hyunyoungs@google.com

jagrutdesai@google.com

jeremysim@google.com

jiuyu@google.com

jonmiranda@google.com

kylim@google.com

patmanning@google.com

peanutbutter@google.com

pinyaoting@google.com

randypfohl@google.com

saumyaprakash@google.com

sihua@google.com

sunnygoyal@google.com

tracyzhou@google.com

tsuharesu@google.com

twickham@google.com

vadimt@google.com

victortulias@google.com

winsonc@google.com

xuqiu@google.com

jonmiranda@google.com

alexchau@google.com



per-file FeatureFlags.java, globs = set noparent

per-file FeatureFlags.java = sunnygoyal@google.com, winsonc@google.com, adamcohen@google.com, hyunyoungs@google.com, captaincole@google.com

ext_tests/src/com/android/launcher3/testing/DebugTestInformationHandler.java

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


package com.android.launcher3.testing;



import static com.android.launcher3.testing.shared.TestProtocol.VIEW_AND_ACTIVITY_LEAKS;

import static com.android.launcher3.util.Executors.MAIN_EXECUTOR;

import static com.android.launcher3.util.Executors.MODEL_EXECUTOR;
@@ -25,10 +24,8 @@ import android.app.Application; 
import android.content.Context;

import android.os.Binder;

import android.os.Bundle;

import android.os.Process;

import android.system.Os;

import android.util.Log;

import android.view.View;



import androidx.annotation.Keep;

import androidx.annotation.Nullable;
@@ -42,7 +39,6 @@ import com.android.launcher3.testing.shared.TestProtocol; 
import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;

import java.util.LinkedList;

import java.util.Map;

import java.util.WeakHashMap;

import java.util.concurrent.CountDownLatch;
@@ -52,7 +48,6 @@ import java.util.concurrent.TimeUnit; 
 * Class to handle requests from tests, including debug ones.

 */

public class DebugTestInformationHandler extends TestInformationHandler {

    private static LinkedList sLeaks;

    private static Collection<String> sEvents;

    private static Application.ActivityLifecycleCallbacks sActivityLifecycleCallbacks;

    private static final Map<Activity, Boolean> sActivities =
@@ -67,6 +62,7 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                public void onActivityCreated(Activity activity, Bundle bundle) {

                    sActivities.put(activity, true);

                    ++sActivitiesCreatedCount;

                    Log.d(TestProtocol.FLAKY_ACTIVITY_COUNT, "onActivityCreated", new Exception());

                }



                @Override
@@ -158,19 +154,6 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                return response;

            }



            case TestProtocol.REQUEST_VIEW_LEAK: {

                if (sLeaks == null) sLeaks = new LinkedList();

                Log.d(VIEW_AND_ACTIVITY_LEAKS, "forcefully leaking 2 views");

                sLeaks.add(new View(mContext));

                sLeaks.add(new View(mContext));

                return response;

            }



            case TestProtocol.PRINT_VIEW_LEAK: {

                Log.d(VIEW_AND_ACTIVITY_LEAKS, "(pid=" + Process.myPid() + ") sLeaks=" + sLeaks);

                return response;

            }



            case TestProtocol.REQUEST_START_EVENT_LOGGING: {

                sEvents = new ArrayList<>();

                TestLogging.setEventConsumer(
@@ -218,29 +201,6 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                }

            }



            case TestProtocol.REQUEST_USE_TEST_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(

                        LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST);

                return response;

            }



            case TestProtocol.REQUEST_USE_TEST2_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(

                        LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TEST2);

                return response;

            }



            case TestProtocol.REQUEST_USE_TAPL_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(

                        LauncherSettings.Settings.ARG_DEFAULT_WORKSPACE_LAYOUT_TAPL);

                return response;

            }



            case TestProtocol.REQUEST_USE_DEFAULT_WORKSPACE_LAYOUT: {

                useTestWorkspaceLayout(null);

                return response;

            }



            case TestProtocol.REQUEST_HOTSEAT_ICON_NAMES: {

                return getLauncherUIProperty(Bundle::putStringArrayList, l -> {

                    ShortcutAndWidgetContainer hotseatIconsContainer =
@@ -278,20 +238,4 @@ public class DebugTestInformationHandler extends TestInformationHandler { 
                return super.call(method, arg, extras);

        }

    }



    private void useTestWorkspaceLayout(String layout) {

        final long identity = Binder.clearCallingIdentity();

        try {

            if (layout != null) {

                LauncherSettings.Settings.call(mContext.getContentResolver(),

                        LauncherSettings.Settings.METHOD_SET_USE_TEST_WORKSPACE_LAYOUT_FLAG,

                        layout);

            } else {

                LauncherSettings.Settings.call(mContext.getContentResolver(),

                        LauncherSettings.Settings.METHOD_CLEAR_USE_TEST_WORKSPACE_LAYOUT_FLAG);

            }

        } finally {

            Binder.restoreCallingIdentity(identity);

        }

    }

}

lint-baseline.xml

0 → 100644
+148 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<issues format="6" by="lint 8.0.0-dev" type="baseline" dependencies="true" variant="all" version="8.0.0-dev">



    <issue

        id="NewApi"

        message="Call requires API level 28 (current min is 26): `android.app.Person#getKey`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/notification/NotificationKeyData.java"

            line="72"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 29 (current min is 26): `android.content.res.Resources#getFloat`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/util/DynamicResource.java"

            line="73"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 30 (current min is 26): `android.graphics.Outline#setPath`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/popup/RoundedArrowDrawable.java"

            line="114"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 30 (current min is 26): `android.view.View#getWindowInsetsController`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"

            line="902"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 30 (current min is 26): `android.view.WindowInsets.Type#ime`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"

            line="902"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 30 (current min is 26): `android.view.WindowInsetsController#hide`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/widget/picker/WidgetsFullSheet.java"

            line="902"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 26): `android.appwidget.AppWidgetHostView#resetColorResources`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/widget/LauncherAppWidgetHostView.java"

            line="114"/>

    </issue>



    <issue

        id="NewApi"

        message="Call requires API level 31 (current min is 30): `android.appwidget.AppWidgetHostView#setColorResources`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/graphics/LauncherPreviewRenderer.java"

            line="415"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 28 (current min is 26): `android.appwidget.AppWidgetProviderInfo#widgetFeatures`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/widget/WidgetAddFlowHandler.java"

            line="93"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_LEFT`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"

            line="1814"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_LEFT`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"

            line="1824"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_RIGHT`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"

            line="1815"/>

    </issue>



    <issue

        id="NewApi"

        message="Field requires API level 29 (current min is 26): `android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction#ACTION_PAGE_RIGHT`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/PagedView.java"

            line="1823"/>

    </issue>



    <issue

        id="NewApi"

        message="Method reference requires API level 28 (current min is 26): `Person::getKey`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/model/data/WorkspaceItemInfo.java"

            line="195"/>

    </issue>



    <issue

        id="NewApi"

        message="Method reference requires API level 28 (current min is 26): `Person::getKey`">

        <location

            file="packages/apps/Launcher3/src/com/android/launcher3/notification/NotificationKeyData.java"

            line="73"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 26)">

        <location

            file="packages/apps/Launcher3/res/drawable/add_item_dialog_background.xml"

            line="6"/>

    </issue>



    <issue

        id="NewApi"

        message="`?android:attr/dialogCornerRadius` requires API level 28 (current min is 26)">

        <location

            file="packages/apps/Launcher3/res/drawable/add_item_dialog_background.xml"

            line="7"/>

    </issue>



    <issue

        id="NewApi"

        message="`@android:dimen/system_app_widget_background_radius` requires API level 31 (current min is 26)">

        <location

            file="packages/apps/Launcher3/res/drawable/widget_resize_frame.xml"

            line="20"/>

    </issue>



</issues>
 
 No newline at end of file