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

Commit 80c7ac94 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5348557 from 4006b3f2 to qt-release 

Change-Id: Id9e1e3c3582ea89cfc5d5a2fdc38b0e151cfd8f8
parents 09f7ea35 4006b3f2

AndroidManifest.xml

+12 −7
Original line number Diff line number Diff line
@@ -12,19 +12,24 @@ 
        android:hardwareAccelerated="true"

        android:icon="@mipmap/product_logo_wallpapers_launcher_color_48"

        android:label="@string/app_name"

        android:theme="@style/CustomizationTheme"

        android:requiredForAllUsers="true"

        android:restoreAnyVersion="true"

        android:supportsRtl="true">



        <activity android:name="com.android.customization.picker.CustomizationPickerActivity"

        android:supportsRtl="true"

        android:theme="@style/CustomizationTheme">

        <activity

            android:name="com.android.customization.picker.CustomizationPickerActivity"

            android:label="@string/app_name"

            android:theme="@style/CustomizationTheme.NoActionBar"

            android:resizeableActivity="true">

            android:resizeableActivity="true"

            android:theme="@style/CustomizationTheme.NoActionBar">

            <intent-filter>

                <action android:name="android.intent.action.SET_WALLPAPER"/>



                <category android:name="android.intent.category.DEFAULT"/>

            </intent-filter>

        </activity>

        <activity android:name="com.android.customization.picker.theme.CustomThemeActivity"

                  android:resizeableActivity="true"

                  android:theme="@style/CustomizationTheme.NoActionBar"/>

    </application>



</manifest>

res/layout/activity_custom_theme.xml

0 → 100644
+44 −0
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"

    android:orientation="vertical"

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



    <FrameLayout

        android:id="@+id/fragment_container"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_marginBottom="@dimen/custom_theme_nav_height"/>



    <FrameLayout

        android:id="@+id/custom_theme_nav"

        android:layout_width="match_parent"

        android:layout_height="@dimen/custom_theme_nav_height">

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

</FrameLayout>

res/layout/custom_theme_option.xml

0 → 100644
+46 −0
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="wrap_content"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <TextView

        android:id="@+id/option_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:layout_marginBottom="@dimen/theme_option_label_margin"

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

    <FrameLayout

        android:id="@+id/option_tile"

        android:layout_width="@dimen/option_tile_width"

        android:layout_height="@dimen/option_tile_width"

        android:layout_gravity="center_horizontal"

        android:paddingHorizontal="@dimen/option_tile_padding_horizontal"

        android:paddingVertical="@dimen/option_tile_padding_vertical"

        android:background="@drawable/option_border">

        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:textSize="@dimen/theme_option_add_size"

            android:textAlignment="center"

            android:textColor="?android:colorAccent"

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

    </FrameLayout>

</LinearLayout>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ 
    <dimen name="theme_option_sample_height">23dp</dimen>

    <dimen name="theme_option_sample_width">23dp</dimen>

    <dimen name="theme_option_sample_padding">2dp</dimen>

    <!-- Note, using dp instead of sp as this is just the "+" symbol, not text -->

    <dimen name="theme_option_add_size">32dp</dimen>

    <dimen name="option_tile_padding_vertical">12dp</dimen>

    <dimen name="option_tile_padding_horizontal">10dp</dimen>

    <!-- Note, using dp instead of sp as this text is more like a "snapshot" of the font -->
@@ -56,4 +58,6 @@ 


    <dimen name="shape_preview_image_width">236dp</dimen>

    <dimen name="shape_preview_image_height">153dp</dimen>



    <dimen name="custom_theme_nav_height">56dp</dimen>

</resources>

res/values/strings.xml

+11 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ 
    <!-- Sample text used to show a preview of a selected font [CHAR LIMIT=3] -->

    <string name="theme_font_example">ABC</string>



    <!-- Plus sign used to indicate that the user can add a custom theme -->

    <string name="add_custom_theme" translatable="false">+</string>



    <!-- Name for the Android Theme that comes preset with the device [CHAR LIMIT=10]-->

    <string name="default_theme_title">Default</string>
@@ -89,4 +92,12 @@ 
    <!-- Message shown when a theme couldn't be applied in the system because of an error

        [CHAR LIMIT=NONE] -->

    <string name="apply_theme_error_msg">There was a problem applying the style</string>



    <!-- Label for a button that takes the user to the next step when configuring a custom theme.

        [CHAR LIMIT=20] -->

    <string name="custom_theme_next">Next</string>



    <!-- Title for a system Style/Theme (combination of fonts/colors/icons) that is defined and

        customized by the user [CHAR LIMIT=15] -->

    <string name="custom_theme_title">Custom</string>

</resources>