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

Commit 227affaf authored by Evan Laird's avatar Evan Laird
Browse files

Cleanup to screensaver settings for O 

Reworked the way screensaver settings are laid out for O. Instead of
using the options menu and dialogs to navigate screensaver options,
there are now two rows: one row for the screensaver choice and
optionally its own settings, and one row for the "when to show" setting.
And now there's a nice obvious button you can press to preview your
choices.

Test: 'export ROBOTEST_FILTER="RadioButtonListFragmentTest";\
mmm -j20 packages/apps/Settings/tests/robotests'

Bug: 35031991
Change-Id: Ie7d2055fb45f6dfe72e34cb9598d9a25f7bee75a
parent e6c87c46

res/layout/dream_info_row.xml

deleted100644 → 0
+0 −94
Original line number Diff line number Diff line 
<!--

     Copyright (C) 2012 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="wrap_content"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:clickable="true"

    android:focusable="true"

    android:orientation="horizontal"

    android:background="?android:attr/selectableItemBackground" >



    <!-- Dream icon -->



    <ImageView

        android:id="@android:id/icon"

        android:layout_width="@android:dimen/app_icon_size"

        android:layout_height="@android:dimen/app_icon_size"

        android:layout_centerVertical="true"

        android:layout_marginBottom="10dp"

        android:layout_marginStart="0dp"

        android:layout_marginEnd="6dp"

        android:layout_marginTop="10dp"

        android:contentDescription="@null"

        android:maxHeight="@android:dimen/app_icon_size"

        android:maxWidth="@android:dimen/app_icon_size"

        android:scaleType="fitCenter" />



    <!-- Dream caption -->



    <TextView

        android:id="@android:id/title"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_weight="1"

        android:layout_centerVertical="true"

        android:ellipsize="end"

        android:singleLine="true"

        android:gravity="center_vertical"

        android:textAppearance="?android:attr/textAppearanceMedium"

        android:textAlignment="viewStart"

        android:labelFor="@android:id/button2" />



    <!-- Dream radio button -->



    <RadioButton

        android:id="@android:id/button1"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_alignParentEnd="true"

        android:layout_centerVertical="true"

        android:duplicateParentState="true"

        android:clickable="false"

        android:focusable="false" />



    <!-- Divider -->



    <ImageView

        android:id="@+id/divider"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_centerVertical="true"

        android:contentDescription="@null"

        android:src="@drawable/nav_divider" />



    <!-- Settings icon -->



    <ImageView

        android:id="@android:id/button2"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_centerVertical="true"

        android:layout_margin="0dip"

        android:background="?android:attr/selectableItemBackground"

        android:contentDescription="@string/screensaver_settings_button"

        android:padding="8dip"

        android:clickable="true"

        android:focusable="true"

        android:src="@drawable/ic_settings" />



</LinearLayout>

res/layout/dream_start_button.xml

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

<!--

  Copyright (C) 2017 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:orientation="horizontal"

    android:gravity="bottom"

    android:paddingTop="4dp"

    android:paddingStart="72dp"

    android:paddingEnd="72dp"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



    <Button

        android:id="@+id/dream_start_now_button"

        style="@style/DreamStartButton"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

        android:text="@string/screensaver_settings_dream_start"

        android:paddingEnd="8dp" />



</LinearLayout>
 
 No newline at end of file

res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -1056,4 +1056,18 @@ 
        <item>90</item>

    </string-array>



    <string-array name="when_to_start_screensaver_entries" translatable="false">

        <item>@string/screensaver_settings_summary_sleep</item>

        <item>@string/screensaver_settings_summary_dock</item>

        <item>@string/screensaver_settings_summary_either_long</item>

        <item>@string/screensaver_settings_summary_never</item>

    </string-array>



    <string-array name="when_to_start_screensaver_values" translatable="false">

        <item>while_charging_only</item>

        <item>while_docked_only</item>

        <item>either_charging_or_docked</item>

        <item>never</item>

    </string-array>



</resources>

res/values/styles.xml

+2 −0
Original line number Diff line number Diff line
@@ -421,6 +421,8 @@ 


    <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>



    <style name="DreamStartButton" parent="android:Widget.Material.Button" />



    <style name="LockPatternStyle">

        <item name="*android:regularColor">@color/lock_pattern_view_regular_color</item>

        <item name="*android:successColor">@color/lock_pattern_view_success_color</item>

res/xml/display_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ 
    <Preference

        android:key="screensaver"

        android:title="@string/screensaver_settings_title"

        android:fragment="com.android.settings.DreamSettings" />

        android:fragment="com.android.settings.dream.DreamSettings" />



    <!-- Hide night mode for now

    <ListPreference