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

Commit 1a8bf51a authored by William Leshner's avatar William Leshner Committed by Android (Google) Code Review
Browse files

Merge "Move hub mode settings under display." into main

parents 04cfbe05 417b667b

res/values/arrays.xml

+14 −0
Original line number Diff line number Diff line
@@ -1059,6 +1059,20 @@ 
        <item>either_charging_or_docked</item>

    </string-array>



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

        <item>@string/when_to_show_hubmode_never</item>

        <item>@string/when_to_show_hubmode_charging</item>

        <item>@string/when_to_show_hubmode_charging_and_upright</item>

        <item>@string/when_to_show_hubmode_docked</item>

    </string-array>



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

        <item>never</item>

        <item>while_charging</item>

        <item>while_charging_and_upright</item>

        <item>while_docked</item>

    </string-array>



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

        <item>@string/zen_mode_from_anyone</item>

        <item>@string/zen_mode_from_contacts</item>

res/values/strings.xml

+15 −0
Original line number Diff line number Diff line
@@ -3655,6 +3655,21 @@ 
    <string name="communal_settings_title">Communal</string>

    <!-- Summary of the communal settings under Settings > Communal [CHAR LIMIT=50] -->

    <string name="communal_settings_summary">Communal settings</string>

    <!-- Title of Hub mode category [CHAR LIMIT=30] -->

    <string name="hub_mode_category_title">Hub mode</string>

    <!-- Title of the "widgets on lockscreen" settings page. [CHAR LIMIT=NONE] -->

    <string name="widgets_on_lockscreen_title">Widgets on lock screen</string>













    <!-- Title of a setting to control when to automatically show widgets on the lockscren. [CHAR LIMIT=NONE] -->













    <string name="when_to_auto_show_hubmode_title">When to automatically show</string>













    <!-- Summary for when to automatically show hub mode (widgets on lockscreen): never  [CHAR LIMIT=100] -->













    <string name="when_to_show_hubmode_never">Never</string>













    <!-- Summary for when to automatically show hub mode (widgets on lockscreen): charging  [CHAR LIMIT=100] -->













    <string name="when_to_show_hubmode_charging">While charging</string>













    <!-- Summary for when to automatically show hub mode (widgets on lockscreen): charging and upright  [CHAR LIMIT=100] -->













    <string name="when_to_show_hubmode_charging_and_upright">While charging and upright</string>













    <!-- Summary for when to automatically show hub mode (widgets on lockscreen): docked  [CHAR LIMIT=100] -->













    <string name="when_to_show_hubmode_docked">While docked</string>





























    <!-- _satellite_setting_preference_layout -->















    <!-- _satellite_setting_preference_layout screen title-->

























res/xml/display_settings.xml



+6
−0




























Original line number
Diff line number
Diff line








@@ -88,6 +88,12 @@













            android:persistent="false"















            android:title="@string/accessibility_text_reading_options_title"















            settings:controller="com.android.settings.accessibility.TextReadingFragmentForDisplaySettingsController"/>



























        <Preference













            android:key="widgets_on_lockscreen"













            android:title="@string/widgets_on_lockscreen_title"













            android:fragment="com.android.settings.communal.WidgetsOnLockscreenFragment"













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















    </PreferenceCategory>































    <PreferenceCategory

































res/xml/when_to_start_hubmode_settings.xml
0 → 100644



+19
−0




























Original line number
Diff line number
Diff line













<!--













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













  -->



























<PreferenceScreen













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













    android:title="@string/when_to_auto_show_hubmode_title" />
























res/xml/widgets_on_lockscreen_settings.xml
0 → 100644



+29
−0




























Original line number
Diff line number
Diff line













<!--













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













  -->



























<PreferenceScreen













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













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













    android:key="widgets_on_lockscreen"













    android:title="@string/widgets_on_lockscreen_title">



























    <Preference













        android:key="when_to_start"













        android:title="@string/when_to_auto_show_hubmode_title"













        android:fragment="com.android.settings.communal.WhenToStartHubPicker"













        settings:controller="com.android.settings.communal.WhenToStartHubPreferenceController" />



























</PreferenceScreen>