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

Commit e7225879 authored by Darrell Shi's avatar Darrell Shi Committed by Android (Google) Code Review
Browse files

Merge changes from topic "hub-mode-settings" into tm-qpr-dev 

* changes:
  Add top-level Communal settings.
  Change screensaver ctrlr to base pref ctrlr.
parents 0ce477d1 65836b1e

res/drawable/ia_settings_communal.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!-- 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.

-->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="48"

        android:viewportHeight="48"

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

    <path android:fillColor="@android:color/white"

          android:pathData="M24,38Q19,38 15.5,37.325Q12,36.65 12,35.7V34H7.25Q5.95,34 5.05,33.025Q4.15,32.05 4.25,30.75L5.8,12.75Q5.9,11.6 6.75,10.8Q7.6,10 8.75,10H39.25Q40.4,10 41.25,10.8Q42.1,11.6 42.2,12.75L43.75,30.75Q43.85,32.05 42.95,33.025Q42.05,34 40.75,34H36V35.7Q36,36.65 32.5,37.325Q29,38 24,38ZM7.25,31H40.75Q40.75,31 40.75,31Q40.75,31 40.75,31L39.25,13Q39.25,13 39.25,13Q39.25,13 39.25,13H8.75Q8.75,13 8.75,13Q8.75,13 8.75,13L7.25,31Q7.25,31 7.25,31Q7.25,31 7.25,31Z"/>

</vector>

res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -622,6 +622,9 @@ 
    <!-- Whether the dream setup activity should be enabled as part of setupwizard -->

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



    <!-- Whether to show communal settings at the top level. -->

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



    <!-- Whether to put the apps with system UID into system component bucket or not -->

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

res/values/menu_keys.xml

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">



    <string name="menu_key_network" translatable="false">top_level_network</string>

    <string name="menu_key_communal" translatable="false">top_level_communal</string>

    <string name="menu_key_connected_devices" translatable="false">top_level_connected_devices</string>

    <string name="menu_key_apps" translatable="false">top_level_apps</string>

    <string name="menu_key_notifications" translatable="false">top_level_notifications</string>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -4019,6 +4019,12 @@ 
    <!-- Phone info screen, section titles: -->

    <string name="battery_level_title">Battery level</string>













    <!-- Communal Settings -->













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













    <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>



























    <!-- APN Settings -->















    <!-- APN settings screen title -->















    <string name="apn_settings">APNs</string>

























res/xml/communal_settings.xml
0 → 100644



+20
−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.













-->



























<PreferenceScreen













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













    android:key="communal_preference_screen"













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