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

Commit 1cebfaf2 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "Reorganization of CM settings screens" into gingerbread

parents a9ea0120 1258fb37

AndroidManifest.xml

+83 −51
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

    package="com.cyanogenmod.cmparts"

    android:sharedUserId="android.uid.system">

    package="com.cyanogenmod.cmparts" android:sharedUserId="android.uid.system">



    <uses-sdk android:minSdkVersion="8" />

    <uses-permission android:name="android.permission.WRITE_SETTINGS" />
@@ -10,59 +9,91 @@ 
    <uses-permission android:name="android.permission.HARDWARE_TEST" />

    <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />



    <application android:label="@string/app_name" android:icon="@drawable/cm_icon">

        <activity android:name=".activities.MainActivity" android:label="@string/app_name">

    <application android:label="@string/app_name"

        android:icon="@drawable/cm_icon">

        <activity android:name=".activities.MainActivity"

            android:label="@string/app_name">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.CreateShortcut" android:label="@string/app_name">

        <activity android:name=".activities.CreateShortcut"

            android:label="@string/app_name">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.InputActivity" android:label="@string/input_settings_title">

        <activity android:name=".activities.InputActivity"

            android:label="@string/input_settings_title">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.UIActivity" android:label="@string/ui_title">

        <activity android:name=".activities.UIActivity"

            android:label="@string/ui_title">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.TrackballNotificationActivity" android:label="@string/trackball_title">

        <activity android:name=".activities.TrackballNotificationActivity"

            android:label="@string/trackball_title">

            <intent-filter>

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.ApplicationActivity" android:label="@string/application_settings_title">

        <activity android:name=".activities.ApplicationActivity"

            android:label="@string/application_settings_title">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.LongPressHomeActivity" android:label="@string/long_press_home_title">

        <activity android:name=".activities.DisplayActivity"

            android:label="@string/display_settings_title_head">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.LockscreenActivity"

            android:label="@string/lockscreen_settings_title_head">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.SystemActivity"

            android:label="@string/system_settings_title_head">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.LongPressHomeActivity"

            android:label="@string/long_press_home_title">

            <intent-filter>

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.NotificationsActivity" android:label="@string/title_notifications_color_tweaks">

        <activity android:name=".activities.NotificationsActivity"

            android:label="@string/title_notifications_color_tweaks">

            <intent-filter>

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.PerformanceSettingsActivity" android:label="@string/performance_settings_title">

        <activity android:name=".activities.PerformanceSettingsActivity"

            android:label="@string/performance_settings_title">

            <intent-filter>

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

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

            </intent-filter>

        </activity>

        <activity android:name=".activities.HapticTweaksActivity" android:label="@string/haptic_title">

        <activity android:name=".activities.HapticTweaksActivity"

            android:label="@string/haptic_title">

            <intent-filter>

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

            </intent-filter>
@@ -128,18 +159,19 @@ 
            </intent-filter>

        </activity>



        <activity android:name=".activities.ChangeLog" android:label="@string/changelog_title">

        <activity android:name=".activities.ChangeLog"

            android:label="@string/changelog_title">

            <intent-filter>

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

            </intent-filter>

        </activity>



        <receiver android:name=".provider.RenderFXWidgetProvider" android:label="@string/widget_name">

        <receiver android:name=".provider.RenderFXWidgetProvider"

            android:label="@string/widget_name">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>

            <meta-data

            android:name="android.appwidget.provider"

            <meta-data android:name="android.appwidget.provider"

                android:resource="@xml/appwidget_info" />

        </receiver>

res/values/strings.xml

+27 −0
Original line number Diff line number Diff line
@@ -3,6 +3,32 @@ 
    <!-- Generic -->

    <string name="app_name">CyanogenMod settings</string>



    <!--  Primary Screen Settings -->

    <string name="application_settings_title_head">Application</string>

    <string name="application_settings_title_subhead">Application settings</string>

    <string name="application_settings_summary_head">Application moving, install location</string>

    <string name="display_settings_title_head">Display</string>

    <string name="display_settings_title_subhead">Display settings</string>

    <string name="display_settings_summary_head">Display animations, rotation, timeouts</string>

    <string name="input_settings_title_head">Input</string>

    <string name="input_settings_title_subhead">Input settings</string>

    <string name="input_settings_summary_head">Input behavior, buttons, haptic feedback</string>

    <string name="interface_settings_title_head">Interface</string>

    <string name="interface_settings_title_subhead">Interface settings</string>

    <string name="interface_settings_summary_head">Interface tweaks, overscrolling, render effect</string>

    <string name="lockscreen_settings_title_head">Lockscreen</string>

    <string name="lockscreen_settings_title_subhead">Lockscreen settings</string>

    <string name="lockscreen_settings_summary_head">Lockscreen gestures, style, unlock options</string>

    <string name="performance_settings_title_head">Performance</string>

    <string name="performance_settings_title_subhead">Performance settings</string>

    <string name="performance_settings_summary_head">Performance tweaks, JIT, VM heap size</string>

    <string name="sound_settings_title_head">Sound</string>

    <string name="sound_settings_title_subhead">Sound settings</string>

    <string name="sound_settings_summary_head">Sound volumes, audio focus, quiet hours</string>

    <string name="system_settings_title_head">System</string>

    <string name="system_settings_title_subhead">System settings</string>

    <string name="system_settings_summary_head">System changelog, stats, update notifications</string>



    <!--  Update Notifications -->

    <string name="updatenotify_title">Update notifications</string>

    <string name="updatenotify_summary">Get push notifications of updates.</string>
@@ -221,6 +247,7 @@ 
    <string name="haptic_default_toast">Loading hard-coded defaults</string>



    <string name="general_title">General</string>

    <string name="buttons_title">Buttons</string>



    <!-- UI Settings : Power off prompt -->

    <string name="pref_power_prompt_title">Power prompt</string>

res/xml/application_settings.xml

+14 −5
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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



    <!-- General settings -->

    <PreferenceCategory android:key="general_category"

        android:title="@string/general_title">



        <CheckBoxPreference android:key="pref_move_all_apps"

        android:title="@string/pref_move_all_apps_title" android:summary="@string/pref_move_all_apps_summary" />

            android:title="@string/pref_move_all_apps_title"

            android:summary="@string/pref_move_all_apps_summary" />



    <ListPreference android:key="pref_install_location" android:dialogTitle="@string/pref_install_location_title"

        android:title="@string/pref_install_location_title" android:summary="@string/pref_install_location_summary"

        android:entries="@array/entries_install_location" android:entryValues="@array/values_install_location" />

        <ListPreference android:key="pref_install_location"

            android:dialogTitle="@string/pref_install_location_title"

            android:title="@string/pref_install_location_title"

            android:summary="@string/pref_install_location_summary"

            android:entries="@array/entries_install_location"

            android:entryValues="@array/values_install_location" />



    </PreferenceCategory>

</PreferenceScreen>

res/xml/cmparts.xml

+45 −44
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

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

    <!-- Update Notifications -->

    <PreferenceScreen android:key="updatenotify_settings"

        android:title="@string/updatenotify_title" android:summary="@string/updatenotify_summary">

        <intent

            android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.updatenotify"

            android:targetClass="com.cyanogenmod.updatenotify.MainActivity" />

    </PreferenceScreen>



    <!-- Application Settings -->

    <PreferenceScreen android:key="application_settings"

        android:title="@string/application_settings_title" android:summary="@string/application_settings_summary">

        android:title="@string/application_settings_title_head"

        android:summary="@string/application_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.ApplicationActivity" />

    </PreferenceScreen>



    <!-- Display Settings -->

    <PreferenceScreen android:key="display_settings"

        android:title="@string/display_settings_title_head"

        android:summary="@string/display_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.DisplayActivity" />

    </PreferenceScreen>



    <!-- Input Settings -->

    <PreferenceScreen android:key="input_settings"

        android:title="@string/input_settings_title" android:summary="@string/input_settings_summary">

        android:title="@string/input_settings_title_head" android:summary="@string/input_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.InputActivity" />

    </PreferenceScreen>



    <!-- Interface Settings -->

    <PreferenceScreen android:key="ui_settings"

        android:title="@string/interface_settings_title_head" android:summary="@string/interface_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.UIActivity" />

    </PreferenceScreen>



    <!-- Lockscreen Settings -->

    <PreferenceScreen android:key="lockscreen_settings"

        android:title="@string/lockscreen_settings_title_head"

        android:summary="@string/lockscreen_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.LockscreenActivity" />

    </PreferenceScreen>



    <!-- Performance settings -->

    <PreferenceScreen android:key="performance_settings"

        android:title="@string/performance_settings_title" android:summary="@string/performance_settings_summary">

        android:title="@string/performance_settings_title_head"

        android:summary="@string/performance_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.PerformanceSettingsActivity" />
@@ -35,44 +55,25 @@ 


    <!-- Sound settings -->

    <PreferenceScreen android:key="sound_settings"

            android:title="@string/sound_title" android:summary="@string/sound_summary">

        android:title="@string/sound_settings_title_head" android:summary="@string/sound_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.SoundActivity" />

    </PreferenceScreen>



    <!-- UI Settings -->

    <PreferenceScreen android:key="ui_settings"

        android:title="@string/ui_title" android:summary="@string/ui_summary">

    <!-- System Settings -->

    <PreferenceScreen android:key="system_settings"

        android:title="@string/system_settings_title_head"

        android:summary="@string/system_settings_summary_head">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.UIActivity" />

            android:targetClass="com.cyanogenmod.cmparts.activities.SystemActivity" />

    </PreferenceScreen>



<!-- Possible future Use: Pedlar

    <PreferenceScreen android:key="battery_tester"

        android:title="Test Battery" android:summary="Battery Drain Tester">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

    <!-- Possible future Use: Pedlar <PreferenceScreen android:key="battery_tester" 

        android:title="Test Battery" android:summary="Battery Drain Tester"> <intent 

        android:action="android.intent.action.MAIN" android:targetPackage="com.cyanogenmod.cmparts" 

        android:targetClass="com.cyanogenmod.cmparts.activities.BatteryTester" /> 

    </PreferenceScreen>

-->



    <!-- CMStats -->

    <PreferenceScreen android:key="cmstats_settings"

	    android:title="@string/cmstats_title" android:summary="@string/cmstats_summary">

        <intent

            android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.stats"

            android:targetClass="com.cyanogenmod.stats.MainActivity" />

    </PreferenceScreen>

        </PreferenceScreen> -->



    <!-- Change Log -->

    <PreferenceScreen

        android:key="changelog"

            android:title="@string/changelog_title">

        <intent android:action="android.intent.action.MAIN"

            android:targetPackage="com.cyanogenmod.cmparts"

            android:targetClass="com.cyanogenmod.cmparts.activities.ChangeLog" />

    </PreferenceScreen>

</PreferenceScreen>

res/xml/display_settings.xml

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

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



    <!-- General settings -->

    <PreferenceCategory android:key="general_category"

        android:title="@string/general_title">



        <!-- Backlight -->

        <PreferenceScreen android:key="backlight_settings"

            android:title="@string/backlight_title" android:summary="@string/backlight_summary">

            <intent android:action="android.intent.action.MAIN"

                android:targetPackage="com.cyanogenmod.cmparts"

                android:targetClass="com.cyanogenmod.cmparts.activities.BacklightActivity" />

        </PreferenceScreen>



        <!-- 180 degree rotation toggle -->

        <CheckBoxPreference android:key="pref_rotate_180"

            android:title="@string/pref_rotate_180_title"

            android:summary="@string/pref_rotate_180_summary" />



        <!-- Electron beam animations -->

        <CheckBoxPreference android:key="electron_beam_animation_on"

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

        <CheckBoxPreference android:key="electron_beam_animation_off"

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



    </PreferenceCategory>



</PreferenceScreen>