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

Commit 4625595c authored by Xin Li's avatar Xin Li
Browse files

Merge Android 24Q1 Release (ab/11220357) 

Bug: 319669529
Merged-In: If7c143c2d2c887cd941aedbfdf874aeac7277638
Change-Id: Ibc916c718fe83a32303797bfc0a7482034e4fbb0
parents 4cda95d0 e6571e6d

Android.bp

+15 −2
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ filegroup { 
    ],

}



// Production-only files that should be excluded in tests.

filegroup {

    name: "ThemePicker_src_prod",

    visibility: [":__subpackages__"],

    srcs: ["src_override/com/android/customization/picker/CustomizationPickerApplication.java"],

}



filegroup {

    name: "ThemePicker_Manifest",

    srcs: [
@@ -66,8 +73,9 @@ genrule { 
        + "$(location soong_zip) -o $(out) -C $$RES_DIR -D $$RES_DIR"

}



// Common defaults that doesn't have ThemePicker specifics.

java_defaults {

    name: "ThemePicker_defaults",

    name: "ThemePicker_common_defaults",



    static_libs: [

        "guava",
@@ -92,7 +100,6 @@ java_defaults { 
    srcs: [

        ":WallpaperPicker2_srcs",

        ":ThemePicker_srcs",

        ":ThemePicker_src_overrides",

    ],



    required: ["android.software.theme_picker.xml"],
@@ -111,6 +118,12 @@ java_defaults { 
    system_ext_specific: true,

}



java_defaults {

    name: "ThemePicker_defaults",

    defaults: ["ThemePicker_common_defaults"],

    srcs: [":ThemePicker_src_overrides"],

}



prebuilt_etc {

    name: "android.software.theme_picker.xml",

    system_ext_specific: true,

PREUPLOAD.cfg

+2 −0
Original line number Diff line number Diff line
@@ -2,3 +2,5 @@ 
checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



ktfmt_hook = ${REPO_ROOT}/external/ktfmt/ktfmt.py --check -i ${REPO_ROOT}/packages/apps/ThemePicker/ktfmt_includes.txt ${PREUPLOAD_FILES}



flag_hook = ${REPO_ROOT}/frameworks/base/packages/SystemUI/flag_check.py --msg=${PREUPLOAD_COMMIT_MESSAGE} --files=${PREUPLOAD_FILES} --project=${REPO_PATH}

TEST_MAPPING

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  "presubmit": [

    {

      "name": "WallpaperPickerGoogleTests",

      "keywords": ["internal"],

      "options": [

        {

          "exclude-annotation": "org.junit.Ignore"

res/layout-land/activity_custom_theme.xml

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

<!--

     Copyright (C) 2019 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.

-->

<FrameLayout

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

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

    xmlns:tools="http://schemas.android.com/tools"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    tools:context="com.android.customization.picker.theme.CustomThemeActivity">



    <FrameLayout

        android:id="@+id/fragment_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"/>

    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:orientation="horizontal">

        <Space

            android:layout_width="0dp"

            android:layout_height="0dp"

            android:layout_weight="1"

            android:layout_gravity="bottom"/>



        <FrameLayout

            android:id="@+id/custom_theme_nav"

            android:layout_width="0dp"

            android:layout_height="@dimen/custom_theme_nav_height"

            android:layout_weight="1"

            android:paddingHorizontal="12dp">

            <Button

                android:id="@+id/previous_button"

                style="@style/ActionSecondaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="start|center_vertical"

                android:text="@string/custom_theme_previous"/>

            <Button

                android:id="@+id/next_button"

                style="@style/ActionPrimaryButton"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="end|center_vertical"

                android:text="@string/custom_theme_next"/>

        </FrameLayout>

    </LinearLayout>



</FrameLayout>

res/layout-land/fragment_custom_theme_component.xml

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

<!--

     Copyright (C) 2019 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.

-->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical"

    android:background="?android:colorPrimary">

    <include layout="@layout/section_header"/>



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal">



        <FrameLayout

            android:id="@+id/component_preview_container"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:background="?android:colorPrimary">

            <include

                android:id="@+id/component_preview_content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:layout_marginHorizontal="@dimen/preview_page_horizontal_margin"

                android:layout_marginTop="@dimen/preview_page_top_margin"

                android:layout_marginBottom="@dimen/component_preview_page_bottom_margin"

                layout="@layout/theme_component_preview"/>

        </FrameLayout>

        <View

            android:layout_width="1dp"

            android:layout_height="match_parent"

            android:background="?android:colorForeground"/>

        <LinearLayout

            android:id="@+id/options_section"

            android:layout_width="0dp"

            android:layout_height="match_parent"

            android:layout_weight="1"

            android:paddingTop="10dp"

            android:paddingBottom="@dimen/custom_theme_nav_height"

            android:orientation="vertical">



            <TextView

                android:id="@+id/component_options_title"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_gravity="center"

                android:layout_margin="10dp"

                android:textAlignment="center"

                android:textAppearance="@style/TitleTextAppearance"/>



            <androidx.recyclerview.widget.RecyclerView

                android:id="@+id/options_container"

                android:layout_width="match_parent"

                android:layout_height="0dp"

                android:layout_weight="1"/>



        </LinearLayout>

    </LinearLayout>

</LinearLayout>