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

Commit 52295541 authored by Roman Birg's avatar Roman Birg
Browse files

Settings: reorganization 



Reorganize settings categories to be more user friendly. In addition,
there is now an "Advanced mode". This mode is on by default for
userdebug and eng builds, and can be overlayed to be turned on by
default for user builds. Currently this toggle lives in About phone for
easy discoverability.

Change-Id: I18fa8c3e3ee7efc9fcaa7384d5b1cfb2495843f1
Signed-off-by: default avatarRoman Birg <roman@cyngn.com>
parent 95ecf204

AndroidManifest.xml

+24 −30
Original line number Original line Diff line number Diff line
@@ -635,7 +635,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.ZenModeSettings" />

                android:value="com.android.settings.notification.ZenModeSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/sound_settings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -671,7 +671,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.DisplaySettings" />

                android:value="com.android.settings.DisplaySettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/display_settings" />

                android:resource="@id/display_and_lights_settings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -684,7 +684,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.DisplaySettings" />

                android:value="com.android.settings.DisplaySettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/display_settings" />

                android:resource="@+id/display_and_lights_settings" />

        </activity-alias>

        </activity-alias>





        <activity android:name="Settings$DeviceInfoSettingsActivity"

        <activity android:name="Settings$DeviceInfoSettingsActivity"
@@ -1746,21 +1746,6 @@ 
        />

        />





        <!-- CyanogenMod activities Start -->

        <!-- CyanogenMod activities Start -->

        <activity android:name="Settings$VoiceWakeupSettingsActivity"

                android:label="@string/voice_wakeup_settings_title"

                android:taskAffinity=""

                android:excludeFromRecents="true">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.DEFAULT" />

                </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.voicewakeup.VoiceWakeupSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/voice_wakeup_settings" />

        </activity>



        <activity android:name="Settings$ProfilesSettingsActivity"

        <activity android:name="Settings$ProfilesSettingsActivity"

                android:label="@string/profile_settings"

                android:label="@string/profile_settings"

                android:taskAffinity=""

                android:taskAffinity=""
@@ -1884,7 +1869,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

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

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

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/display_settings" />

                android:resource="@id/display_and_lights_settings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -1916,7 +1901,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.nfc.PaymentSettings" />

                android:value="com.android.settings.nfc.PaymentSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/nfc_payment_settings" />

                android:resource="@+id/nfc_payment_settings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -1978,7 +1963,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.notification.ConditionProviderSettings" />

                       android:value="com.android.settings.notification.ConditionProviderSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                       android:resource="@id/notification_settings" />

                       android:resource="@id/sound_settings" />

        </activity>

        </activity>





        <activity android:name="Settings$NotificationSettingsActivity"

        <activity android:name="Settings$NotificationSettingsActivity"
@@ -1992,9 +1977,9 @@ 
                <category android:name="com.android.settings.SHORTCUT" />

                <category android:name="com.android.settings.SHORTCUT" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationSettings" />

                android:value="com.android.settings.sounds.SoundSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/sound_settings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity>

        </activity>
@@ -2012,9 +1997,9 @@ 
                <category android:name="android.intent.category.VOICE_LAUNCH" />

                <category android:name="android.intent.category.VOICE_LAUNCH" />

            </intent-filter>

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationSettings" />

                android:value="com.android.settings.sounds.SoundSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/sound_settings" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

                android:value="true" />

        </activity-alias>

        </activity-alias>
@@ -2025,9 +2010,9 @@ 
                android:exported="true"

                android:exported="true"

                android:targetActivity="Settings$NotificationSettingsActivity">

                android:targetActivity="Settings$NotificationSettingsActivity">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationSettings" />

                android:value="com.android.settings.sound.SoundSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/sound_settings" />

        </activity-alias>

        </activity-alias>





        <activity android:name="Settings$OtherSoundSettingsActivity"

        <activity android:name="Settings$OtherSoundSettingsActivity"
@@ -2042,7 +2027,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.OtherSoundSettings" />

                android:value="com.android.settings.notification.OtherSoundSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/sound_settings" />

        </activity>

        </activity>





        <!-- Show apps for which application-level notification settings are applicable -->

        <!-- Show apps for which application-level notification settings are applicable -->
@@ -2053,7 +2038,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.NotificationAppList" />

                android:value="com.android.settings.notification.NotificationAppList" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/notification_manager" />

        </activity>

        </activity>





        <!-- Show application-level notification settings (app passed in as extras) -->

        <!-- Show application-level notification settings (app passed in as extras) -->
@@ -2068,7 +2053,7 @@ 
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.notification.AppNotificationSettings" />

                android:value="com.android.settings.notification.AppNotificationSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                android:resource="@id/notification_settings" />

                android:resource="@id/notification_manager" />

        </activity>

        </activity>





        <!-- Show regulatory info (from settings item or dialing "*#07#") -->

        <!-- Show regulatory info (from settings item or dialing "*#07#") -->
@@ -2166,6 +2151,15 @@ 
                android:resource="@id/sim_settings" />

                android:resource="@id/sim_settings" />

        </activity>

        </activity>





        <activity android:name=".Settings$LockScreenSettingsActivity"

                  android:label="@string/lockscreen_settings"

                  android:taskAffinity="">

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.lockscreen.LockScreenSettings" />

            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"

                       android:resource="@id/lockscreen_settings" />

        </activity>



        <provider

        <provider

            android:name=".search.SettingsSearchIndexablesProvider"

            android:name=".search.SettingsSearchIndexablesProvider"

            android:authorities="com.android.settings"

            android:authorities="com.android.settings"

res/drawable/ic_settings_cellular.xml

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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

            android:fillColor="#029487"

            android:pathData="M1,20.449v0.698c0,0.155,0.116,0.282,0.256,0.282h21.486c0.142,0,0.257-0.126,0.257-0.282V2.571

L1,20.449z M21.429,19.857h-2.78L18.646,8.135l2.783-2.261V19.857z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_settings_oclick.xml

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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">



        <path

                android:fillColor="#029487"

                android:pathData="M13.776,22.844c0.142-0.023,0.287-0.037,0.427-0.065c0.273-0.056,0.538-0.13,0.803-0.205

c0.08-0.023,0.163-0.038,0.243-0.062c0.316-0.097,0.624-0.212,0.927-0.337c0.024-0.01,0.05-0.017,0.075-0.027

C20.215,20.484,23,16.568,23,12c0-3.062-1.253-5.83-3.272-7.824l0,0c-0.003-0.003-0.006-0.005-0.008-0.007

c-0.743-0.733-1.588-1.361-2.515-1.86c-0.008-0.004-0.016-0.007-0.024-0.011c-0.302-0.162-0.611-0.311-0.929-0.444

c-0.043-0.018-0.088-0.03-0.13-0.048c-0.286-0.116-0.574-0.225-0.871-0.317c-0.097-0.03-0.199-0.049-0.298-0.077

c-0.247-0.069-0.494-0.139-0.748-0.191c-0.178-0.036-0.362-0.055-0.543-0.083c-0.181-0.027-0.359-0.064-0.542-0.082

C12.751,1.019,12.378,1,12,1s-0.751,0.019-1.119,0.056c-0.184,0.019-0.362,0.055-0.542,0.082c-0.181,0.028-0.365,0.047-0.543,0.083

C9.541,1.273,9.295,1.344,9.047,1.413C8.949,1.44,8.847,1.459,8.75,1.489c-0.309,0.096-0.61,0.208-0.906,0.33

C7.813,1.831,7.78,1.84,7.749,1.853c-0.325,0.136-0.642,0.288-0.95,0.454C6.798,2.308,6.797,2.308,6.796,2.309

C5.869,2.808,5.022,3.437,4.279,4.17C4.277,4.172,4.274,4.174,4.272,4.176l0,0C2.253,6.17,1,8.938,1,12

c0,4.568,2.785,8.485,6.75,10.147c0.02,0.009,0.042,0.014,0.063,0.023c0.307,0.126,0.619,0.242,0.939,0.341

c0.066,0.02,0.135,0.033,0.201,0.052c0.279,0.08,0.558,0.158,0.846,0.216c0.124,0.025,0.252,0.037,0.377,0.057

c0.235,0.039,0.468,0.083,0.708,0.107c0.292,0.029,0.59,0.039,0.888,0.045C11.847,22.99,11.922,23,12,23s0.153-0.01,0.23-0.012

c0.298-0.006,0.596-0.015,0.888-0.045C13.341,22.921,13.557,22.879,13.776,22.844z

M12,4.732c0.334,0,0.606,0.271,0.606,0.606

S12.334,5.943,12,5.943s-0.606-0.271-0.606-0.606S11.666,4.732,12,4.732z

M11.394,3.517c0-0.334,0.271-0.606,0.606-0.606

s0.606,0.271,0.606,0.606S12.334,4.122,12,4.122S11.394,3.851,11.394,3.517z

M12,6.553c0.334,0,0.606,0.271,0.606,0.606

S12.334,7.764,12,7.764s-0.606-0.271-0.606-0.606S11.666,6.553,12,6.553z

M12,8.373c0.334,0,0.606,0.271,0.606,0.606

c0,0.334-0.271,0.606-0.606,0.606s-0.606-0.271-0.606-0.606S11.666,8.373,12,8.373z

M12,10.789c0.669,0,1.211,0.542,1.211,1.211

c0,0.669-0.542,1.211-1.211,1.211c-0.669,0-1.211-0.542-1.211-1.211C10.789,11.331,11.331,10.789,12,10.789z

M21.789,12

c0,2.256-0.774,4.329-2.061,5.987V6.013C21.015,7.671,21.789,9.744,21.789,12z

M2.211,12c0-2.256,0.774-4.329,2.061-5.987v11.973

C2.985,16.329,2.211,14.256,2.211,12z" />

</vector>
 
 No newline at end of file

res/menu/privacy_guard_manager.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
          android:title="@string/privacy_guard_manager_show_system_apps"

          android:title="@string/privacy_guard_manager_show_system_apps"

          android:checkable="true" />

          android:checkable="true" />

    <item android:id="@+id/advanced"

    <item android:id="@+id/advanced"

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

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

    <item android:id="@+id/help"

    <item android:id="@+id/help"

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

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

</menu>
 
</menu>

res/values/attrs.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -102,6 +102,7 @@ 
    <!-- For Search -->

    <!-- For Search -->

    <declare-styleable name="Preference">

    <declare-styleable name="Preference">

        <attr name="keywords" format="string" />

        <attr name="keywords" format="string" />

        <attr name="advanced" format="boolean" />

    </declare-styleable>

    </declare-styleable>





    <attr name="switchBarTheme" format="reference" />

    <attr name="switchBarTheme" format="reference" />