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

Commit 41ee5663 authored by Jay Aliomer's avatar Jay Aliomer
Browse files

Twilight Location off text 

When location is disabled, dark theme and night light
will show text and button to take the user to location page

Fixes: 153115261
Fixes: 153115618
Test: manually turn off location and observe view
Change-Id: I24be2f26a4c9e1b3f2a17e83e6f91cb7685f2e28
parent dcc79e99

res/layout/twilight_mode_location_off.xml

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

<!-- Copyright (C) 2020 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:id="@+id/request_background_location_permission"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">



    <LinearLayout

        android:layout_width="match_parent"

        android:paddingStart="8dp"

        android:paddingEnd="10dp"

        android:paddingTop="18dp"

        android:paddingBottom="0dp"

        android:layout_height="wrap_content"

        android:orientation="horizontal">



        <ImageView

            android:layout_width="40dp"

            android:layout_height="wrap_content"

            android:src="@drawable/ic_settings_location"

            android:tint="?android:attr/colorAccent"/>



        <TextView

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginStart="24dp"

            android:paddingRight="2dp"

            android:gravity="center_vertical"

            android:text="@string/twilight_mode_location_off_dialog_message"

            android:textAppearance="?attr/textAppearanceSubtitle1"

            android:textSize="16sp"

            android:textColor="?android:attr/textColorPrimary"/>



    </LinearLayout>



    <Button

        android:id="@+id/go_to_location_setting"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:text="@string/twilight_mode_launch_location"

        style="@style/Widget.AppCompat.Button.Borderless.Colored"

        android:layout_gravity="end"/>



</LinearLayout>
 
 No newline at end of file

res/values/ids.xml

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ 
    <item type="id" name="action_drag_move_bottom" />

    <item type="id" name="action_drag_remove" />



    <!-- Go to location settings button id -->

    <item type="id" name="go_to_location_setting" />



    <!-- For a menu item allowing users to edit a SIM display name -->

    <item type="id" name="edit_sim_name" />

</resources>

res/values/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -2810,10 +2810,10 @@ 
    <string name="night_display_not_currently_on">Night Light not currently on</string>









    <!-- Twilight Mode -->









    <!-- When location mode is off, twilight scheduling does not function. [CHAR LIMIT=120] -->









    <string name="twilight_mode_location_off_dialog_message">Device location needed to determine your sunset and sunrise times.</string>









    <!-- When location mode is off, twilight scheduling does not function. [CHAR LIMIT=40] -->









    <string name="twilight_mode_location_off_dialog_message">Device location needed to determine you sunset to sunrise</string>









    <!-- When location mode is off, twilight scheduling does not function. [CHAR LIMIT=40] -->









    <string name="twilight_mode_launch_location">Turn on location</string>









    <string name="twilight_mode_launch_location">Location settings</string>

















    <!--    Dark ui screen-->









    <!-- Display settings screen, activation button action for manual mode. [CHAR LIMIT=40] -->
































res/xml/dark_mode_settings.xml



+8
−0






























Original line number
Diff line number
Diff line







@@ -20,12 +20,20 @@







    android:title="@string/dark_ui_mode"









    settings:keywords="@string/keywords_dark_ui_mode">



















    <com.android.settingslib.widget.LayoutPreference









        android:key="dark_ui_location_off"









        android:selectable="false"









        android:layout="@layout/twilight_mode_location_off"









        settings:allowDividerBelow="true"









        settings:controller="com.android.settings.display.TwilightLocationPreferenceController"/>



















    <DropDownPreference









        android:key="dark_ui_auto_mode"









        android:title="@string/dark_ui_auto_mode_title"









        android:summary="%s"









        android:entries="@array/dark_ui_scheduler_preference_titles"









        android:entryValues="@array/dark_ui_scheduler_preference_titles"









        settings:allowDividerAbove="true"









        settings:controller="com.android.settings.display.darkmode.DarkModeScheduleSelectorController"









        settings:keywords="@string/keywords_dark_ui_mode"/>










































res/xml/night_display_settings.xml



+7
−0






























Original line number
Diff line number
Diff line







@@ -20,6 +20,13 @@







    android:title="@string/night_display_title"









    settings:keywords="@string/keywords_display_night_display">



















    <com.android.settingslib.widget.LayoutPreference









        android:key="dark_ui_location_off"









        android:selectable="false"









        android:layout="@layout/twilight_mode_location_off"









        settings:controller="com.android.settings.display.TwilightLocationPreferenceController"









        settings:allowDividerBelow="true"/>



















    <DropDownPreference









        android:key="night_display_auto_mode"









        android:title="@string/night_display_auto_mode_title"