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

Commit d90b41b4 authored by Fan Zhang's avatar Fan Zhang
Browse files

Use translucentStatus for settings/city selection activity. 

Deskclock already uses translucent status/nav. This change is to match
the same style on settings/city selection activity.

Change-Id: I2a317cec8405710fb2a46cacf6ba6b0663bbe026
parent 61688c1c

res/layout/cities_activity.xml

+3 −3
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
<ListView

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

    android:id="@+id/cities_list"

    android:theme="@style/ControlAccentThemeOverlay"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="match_parent"

    android:divider="@null"

    android:clipToPadding="false" />
 
    android:fitsSystemWindows="true"

    android:theme="@style/ControlAccentThemeOverlay" />

res/layout/settings.xml

+11 −5
Original line number Diff line number Diff line
@@ -14,9 +14,15 @@ 
     limitations under the License.

-->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <fragment

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

        android:id="@+id/main"

        android:name="com.android.deskclock.settings.SettingsActivity$PrefsFragment"

        android:layout_width="match_parent"

        android:layout_height="match_parent" />



</FrameLayout>

res/values-v21/styles.xml

+6 −4
Original line number Diff line number Diff line
@@ -16,14 +16,14 @@ 


<resources>



    <style name="SettingsTheme" parent="BaseActivityTheme">

    <style name="SettingsTheme" parent="TranslucentDecorActivityTheme">

        <item name="android:alertDialogTheme">@style/SettingsAlertDialogTheme</item>

        <item name="android:detailsElementBackground">@null</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>



        <!-- Attributes from support.v7.appcompat -->

        <item name="actionBarStyle">@style/SettingsActionBarStyle</item>

        <item name="windowActionBar">true</item>

        <item name="windowNoTitle">false</item>

    </style>



    <!-- Theme that will be used by PreferenceFragment (i.e. *not* AppCompat). -->
@@ -67,10 +67,12 @@ 
        <item name="android:fontFamily">sans-serif-medium</item>

    </style>



    <style name="CitiesTheme" parent="BaseActivityTheme">

    <style name="CitiesTheme" parent="TranslucentDecorActivityTheme">

        <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>

        <item name="android:fastScrollTrackDrawable">@drawable/fastscroll_track</item>

        <item name="actionBarStyle">@style/CitiesActionBarStyle</item>

        <item name="windowActionBar">true</item>

        <item name="windowNoTitle">false</item>

    </style>



</resources>

res/values/styles.xml

+6 −5
Original line number Diff line number Diff line
@@ -69,13 +69,12 @@ 
        <item name="android:gravity">center</item>

    </style>



    <style name="SettingsTheme" parent="BaseActivityTheme">

    <style name="SettingsTheme" parent="TranslucentDecorActivityTheme">

        <item name="android:detailsElementBackground">@null</item>

        <item name="android:windowActionBar">false</item>

        <item name="android:windowNoTitle">true</item>



        <!-- Attributes from support.v7.appcompat -->

        <item name="actionBarStyle">@style/SettingsActionBarStyle</item>

        <item name="windowActionBar">true</item>

        <item name="windowNoTitle">false</item>

    </style>



    <style name="SettingsActionBarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -85,13 +84,15 @@ 
        <item name="displayOptions">showTitle|homeAsUp</item>

    </style>



    <style name="CitiesTheme" parent="BaseActivityTheme">

    <style name="CitiesTheme" parent="TranslucentDecorActivityTheme">

        <item name="android:fastScrollPreviewBackgroundLeft">@drawable/fastscroll_preview</item>

        <item name="android:fastScrollPreviewBackgroundRight">@drawable/fastscroll_preview</item>

        <item name="android:fastScrollTextColor">@color/white</item>

        <item name="android:fastScrollThumbDrawable">@drawable/fastscroll_thumb</item>

        <item name="android:fastScrollTrackDrawable">@drawable/fastscroll_track</item>

        <!-- Attributes from support.v7.appcompat -->

        <item name="windowActionBar">true</item>

        <item name="windowNoTitle">false</item>

        <item name="actionBarStyle">@style/CitiesActionBarStyle</item>

    </style>