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

Commit 3b8ad48c authored by Lucas Silva's avatar Lucas Silva Committed by Android (Google) Code Review
Browse files

Merge "Add oobe dream settings activity"

parents 851b4923 06e373dc

AndroidManifest.xml

+22 −5
Original line number Diff line number Diff line 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

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

          package="com.android.settings"

          coreApp="true"

          android:sharedUserId="android.uid.system">
@@ -2921,6 +2920,24 @@ 
                android:value="true" />

        </activity>



        <activity android:name=".dream.DreamSetupActivity"

                  android:exported="true"

                  android:immersive="true"

                  android:theme="@style/SudThemeGlif.DayNight"

                  android:icon="@drawable/ic_settings_display">

            <intent-filter>

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

                <category android:name="com.android.settings.suggested.category.SCREEN_SAVER"/>

            </intent-filter>

            <meta-data android:name="com.android.settings.is_supported"

                       android:resource="@bool/dream_setup_supported"/>

            <meta-data android:name="com.android.settings.title"

                       android:resource="@string/dream_setup_title"/>

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/dream_setup_description"/>

            <meta-data android:name="com.android.settings.icon_tintable" android:value="true"/>

        </activity>



        <activity

            android:name="Settings$UserSettingsActivity"

            android:label="@string/user_settings_title"

res/color/dream_card_color_state_list.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

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

    <item android:state_activated="true" android:color="?androidprv:attr/colorSurfaceVariant"/>

    <item android:state_selected="true" android:color="?androidprv:attr/colorSurfaceVariant"/>

    <item android:color="?androidprv:attr/colorSurfaceHighlight"/>

</selector>
 
 No newline at end of file

res/layout/dream_setup_layout.xml

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

<!--

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

  -->



<com.google.android.setupdesign.GlifLayout

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

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

    android:id="@+id/setup_wizard_layout"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_settings_display"

    app:sucHeaderText="@string/dream_setup_title"

    app:sudDescriptionText="@string/dream_setup_description">



    <RelativeLayout

        android:id="@+id/dream_container"

        style="@style/SudContentFrame"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        <androidx.recyclerview.widget.RecyclerView

            android:id="@+id/dream_setup_list"

            android:layout_width="match_parent"

            android:layout_height="match_parent"/>

    </RelativeLayout>



</com.google.android.setupdesign.GlifLayout>
 
 No newline at end of file

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -590,4 +590,7 @@ 
         Take the "Unrestricted data" page as the example, the visible app icons could be 15

         on 6.4 inches screen size whether the font size and display size are both small. -->

    <integer name="config_num_visible_app_icons">20</integer>



    <!-- Whether the dream setup activity should be enabled as part of setupwizard -->

    <bool name="dream_setup_supported">false</bool>

</resources>

res/values/strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -13850,6 +13850,10 @@ 
    <string name="dream_complications_picker_category">Choose more options</string>

    <!-- The title of the category to show for the screensaver miscellaneous settings [CHAR LIMIT=none] -->

    <string name="dream_more_settings_category">More settings</string>

    <!-- The title of the screen saver setup page [CHAR LIMIT=none] -->

    <string name="dream_setup_title">Customize your screen saver</string>

    <!-- The description of the screen saver setup page [CHAR LIMIT=none] -->

    <string name="dream_setup_description">Choose what you’ll see on your screen when your device is not in use.</string>









    <!-- Button to customize the screensaver [CHAR LIMIT=20] -->









    <string name="customize_button_title">Customize</string>