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

Commit cc71aa83 authored by Xin Li's avatar Xin Li Committed by Gerrit Code Review
Browse files

Merge "Merge Android 14 QPR3 to AOSP main" into main

parents 0f602c77 f39ebbd6

Android.bp

+11 −33
Original line number Diff line number Diff line
@@ -108,13 +108,11 @@ android_library { 
    ],

    srcs: [

        "tests/tapl/**/*.java",

        "tests/tapl/**/*.kt",

    ],

    resource_dirs: [],

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

    platform_apis: true,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



java_library_static {
@@ -132,9 +130,6 @@ java_library_static { 
        ],

    },

    static_libs: ["libprotobuf-java-lite"],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



java_library_static {
@@ -153,9 +148,6 @@ java_library_static { 
        "libprotobuf-java-lite",

        "launcher_log_protos_lite",

    ],

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



java_library {
@@ -167,9 +159,6 @@ java_library { 


    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// Library with all the dependencies for building Launcher3
@@ -187,6 +176,7 @@ android_library { 
        "androidx.preference_preference",

        "androidx.slice_slice-view",

        "androidx.cardview_cardview",

        "androidx.window_window",

        "com.google.android.material_material",

        "iconloader_base",

        "view_capture",
@@ -196,7 +186,7 @@ android_library { 
    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

    lint: {

        baseline_filename: "lint-baseline-res-lib.xml",

        baseline_filename: "lint-baseline2.xml",

    },

}
@@ -213,12 +203,14 @@ android_library { 
        "animationlib",

        "com_android_launcher3_flags_lib",

        "com_android_wm_shell_flags_lib",

        "android.appwidget.flags-aconfig-java",

        "com.android.window.flags.window-aconfig-java",

    ],

    sdk_version: "current",

    min_sdk_version: min_launcher3_sdk_version,

    manifest: "AndroidManifest-common.xml",

    lint: {

        baseline_filename: "lint-baseline-common-deps-lib.xml",

        baseline_filename: "lint-baseline2.xml",

    },

}
@@ -265,7 +257,7 @@ android_app { 
        "AndroidManifest-common.xml",

    ],

    lint: {

        baseline_filename: "lint-baseline-launcher3.xml",

        baseline_filename: "lint-baseline.xml",

    },

}
@@ -289,9 +281,6 @@ android_library { 
    ],

    manifest: "quickstep/AndroidManifest.xml",

    min_sdk_version: "current",

    lint: {

        baseline_filename: "lint-baseline.xml",

    },

}



// Library with all the dependencies for building Launcher Go
@@ -323,9 +312,8 @@ android_library { 
        "AndroidManifest-common.xml",

    ],

    min_sdk_version: "current",

    lint: {

        baseline_filename: "lint-baseline-go-res-lib.xml",

    },

    // TODO(b/319712088): re-enable use_resource_processor

    use_resource_processor: false,

}



// Build rule for Quickstep library
@@ -354,9 +342,8 @@ android_library { 
    manifest: "quickstep/AndroidManifest.xml",

    platform_apis: true,

    min_sdk_version: "current",

    lint: {

        baseline_filename: "lint-baseline-launcher3.xml",

    },

    // TODO(b/319712088): re-enable use_resource_processor

    use_resource_processor: false,

}



// Build rule for Launcher3 Go app for Android Go devices.
@@ -399,9 +386,6 @@ android_app { 
    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    },

    lint: {

        baseline_filename: "lint-baseline.xml",

    },



}
@@ -438,9 +422,6 @@ android_app { 
    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    },

    lint: {

        baseline_filename: "lint-baseline.xml",

    },



}
@@ -491,8 +472,5 @@ android_app { 
    jacoco: {

        include_filter: ["com.android.launcher3.*"],

    },

    lint: {

        baseline_filename: "lint-baseline.xml",

    },



}

AndroidManifest-common.xml

+4 −0
Original line number Diff line number Diff line
@@ -184,5 +184,9 @@ 
            android:name="androidx.startup.InitializationProvider"

            android:authorities="${applicationId}.androidx-startup"

            tools:node="remove" />



        <property

            android:name="android.window.PROPERTY_ACTIVITY_EMBEDDING_SPLITS_ENABLED"

            android:value="true" />

    </application>

</manifest>

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
<manifest

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

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="33" android:minSdkVersion="26"/>

    <uses-sdk android:targetSdkVersion="33" android:minSdkVersion="30"/>

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.

OWNERS

+15 −3
Original line number Diff line number Diff line
@@ -10,9 +10,6 @@ twickham@google.com 
vadimt@google.com

winsonc@google.com

jonmiranda@google.com

alexchau@google.com

patmanning@google.com

tsuharesu@google.com

awickham@google.com



# Launcher workspace eng team
@@ -26,5 +23,20 @@ pinyaoting@google.com 
andonian@google.com

sihua@google.com



# Multitasking eng team

tracyzhou@google.com

peanutbutter@google.com

jeremysim@google.com



# Overview eng team

alexchau@google.com

samcackett@google.com

silvajordan@google.com

uwaisashraf@google.com



# Physical Keyboard & Trackpad eng team

patmanning@google.com

helencheuk@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

aconfig/launcher.aconfig

+126 −11
Original line number Diff line number Diff line
@@ -15,6 +15,13 @@ flag { 
    bug: "270390937"

}



flag {

    name: "enable_twoline_toggle"

    namespace: "launcher"

    description: "Enables visibility in home settings to see the toggle to turn on/off two lines in all apps."

    bug: "316027081"

}



flag {

    name: "enable_grid_only_overview"

    namespace: "launcher"
@@ -43,6 +50,13 @@ flag { 
    bug: "257950105"

}



flag {

    name: "enable_focus_outline"

    namespace: "launcher"

    description: "Enables focus states outline for launcher."

    bug: "310953377"

}



flag {

    name: "enable_taskbar_no_recreate"

    namespace: "launcher"
@@ -61,33 +75,134 @@ flag { 
    name: "enable_taskbar_pinning"

    namespace: "launcher"

    description: "Enables taskbar pinning to allow user to switch between transient and persistent taskbar flavors."

    bug: "270396583"

    bug: "296231746"

}



flag {

    name: "enable_unfolded_two_pane_picker"

    namespace: "launcher"

    description: "Enables two pane widget picker for unfolded foldables"

    bug: "313922374"

}



flag {

    name: "enable_tablet_two_pane_picker_v2"

    namespace: "launcher"

    description: "Enables full width two pane widget picker for tablets in landscape and portrait"

    bug: "315055849"

}



flag {

    name: "enable_two_pane_launcher_settings"

    namespace: "launcher"

    description: "Enables two panel settings when on large enough displays"

    bug: "204463748"

}



flag {

    name: "enable_predictive_back_gesture"

    namespace: "launcher"

    description: "Enable predictive back gesture on Launcher (including all apps and widget picker)."

    bug: "238475505"

}



flag {

    name: "enable_shortcut_dont_suggest_app"

    namespace: "launcher"

    description: "Enables don't suggest app shortcut for suggested apps"

    bug: "319250810"

}



flag {

    name: "enable_support_for_archiving"

    namespace: "launcher"

    description: "Enables support for archived apps in Launcher3, such as empty progress bar etc."

    bug: "210590852"

}



flag {

    name: "enable_split_from_fullscreen_with_keyboard_shortcuts"

    name: "enable_private_space_install_shortcut"

    namespace: "launcher"

    description: "Enables initiating split from a fullscreen app using keyboard shortcuts"

    bug: "270394122"

    description: "Enables long-press shortcut to install a copy of an app to Private space"

    bug: "316118005"

}



flag {

    name: "enable_launcher_br_metrics"

    name: "enable_launcher_br_metrics_fixed"

    namespace: "launcher"

    description: "Enables logging of Launcher restore metrics to the Backup & Restore team"

    bug: "307527314"

    is_fixed_read_only: true

}



flag {

    name: "enable_unfolded_two_pane_picker"

    name: "enable_reboot_unlock_animation"

    namespace: "launcher"

    description: "Enables two pane widget picker for unfolded foldables"

    bug: "313922374"

    description: "Enables unlock animation after device reboot"

    bug: "298231234"

}



flag {

    name: "enable_tablet_two_pane_picker_v2"

    name: "enable_workspace_inflation"

    namespace: "launcher"

    description: "Enables full width two pane widget picker for tablets in landscape and portrait"

    bug: "315055849"

    description: "Enables asnc inflation of workspace icons"

    bug: "318539160"

}



flag {

    name: "enable_unfold_state_animation"

    namespace: "launcher"

    description: "Tie unfold animation with state animation"

    bug: "297057373"

}



flag {

    name: "enable_generated_previews"

    namespace: "launcher"

    description: "Enables support for RemoteViews previews in the widget picker."

    bug: "306546610"

}



flag {

  name: "enable_categorized_widget_suggestions"

  namespace: "launcher"

  description: "Enables widget suggestions in widget picker to be displayed in categories"

  bug: "318410881"

}



flag {

  name: "enable_add_app_widget_via_config_activity_v2"

  namespace: "launcher"

  description: "When adding app widget through config activity, directly add it to workspace to reduce flicker"

  bug: "284236964"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "use_activity_overlay"

    namespace: "launcher"

    description: "Use an activity for home screen overlay"

    bug: "273828110"

}



flag {

    name: "grid_migration_fix"

    namespace: "launcher"

    description: "Keep items in place when migrating to a bigger grid"

    bug: "325286145"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "narrow_grid_restore"

    namespace: "launcher"

    description: "Using only the most recent workspace when restoring to avoid confusion."

    bug: "325285743"

    metadata {

      purpose: PURPOSE_BUGFIX

    }

}