Skip to content

Commit

Permalink
Add ActionBar, modify ViewPager to work off of lits, added Readme
Browse files Browse the repository at this point in the history
  • Loading branch information
Pedlar committed Dec 12, 2011
1 parent 8ed48ad commit e0d231e
Show file tree
Hide file tree
Showing 18 changed files with 269 additions and 602 deletions.
34 changes: 5 additions & 29 deletions AndroidManifest.xml
Expand Up @@ -29,7 +29,7 @@
<category android:name="android.intent.category.LAUNCHER" /> <category android:name="android.intent.category.LAUNCHER" />
</intent-filter> </intent-filter>
</activity> </activity>

<!--
<activity <activity
android:name=".Settings" android:name=".Settings"
android:taskAffinity="com.cyanogenmod.settings" android:taskAffinity="com.cyanogenmod.settings"
Expand All @@ -44,7 +44,7 @@
<activity android:name=".SubSettings" <activity android:name=".SubSettings"
android:taskAffinity="com.cyanogenmod.settings"> android:taskAffinity="com.cyanogenmod.settings">
</activity> </activity>

-->
<!-- Notification Widget --> <!-- Notification Widget -->
<activity android:name=".activities.PowerWidget" <activity android:name=".activities.PowerWidget"
android:label="@string/title_widget_buttons" android:label="@string/title_widget_buttons"
Expand All @@ -55,50 +55,30 @@
<action android:name="android.cyanogenmod.WIDGET_SETTINGS" /> <action android:name="android.cyanogenmod.WIDGET_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.cyanogenmod.settings.FRAGMENT_CLASS"
android:value="com.cyanogenmod.settings.activities.PowerWidget" />
<meta-data android:name="com.cyanogenmod.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/power_widget_settings" />
</activity> </activity>


<activity android:name="Settings$PowerWidgetChooserActivity" <activity android:name=".activities.PowerWidget$PowerWidgetChooser"
android:label="@string/title_widget_picker" android:label="@string/title_widget_picker"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.cyanogenmod.settings.FRAGMENT_CLASS"
android:value="com.cyanogenmod.settings.activities.PowerWidget$PowerWidgetChooser" />
<meta-data android:name="com.cyanogenmod.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/power_widget_settings" />
<meta-data android:name="com.cyanogenmod.settings.PARENT_FRAGMENT_TITLE"
android:value="@string/title_widget_buttons" />
<meta-data android:name="com.cyanogenmod.settings.PARENT_FRAGMENT_CLASS"
android:value="com.cyanogenmod.settings.Settings$PowerWidgetActivity" />
</activity> </activity>


<activity android:name="Settings$PowerWidgetOrderActivity" <activity android:name=".activities.PowerWidget$PowerWidgetOrder"
android:label="@string/title_widget_order" android:label="@string/title_widget_order"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.cyanogenmod.settings.FRAGMENT_CLASS"
android:value="com.cyanogenmod.settings.activities.PowerWidget$PowerWidgetOrder" />
<meta-data android:name="com.cyanogenmod.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/power_widget_settings" />
<meta-data android:name="com.cyanogenmod.settings.PARENT_FRAGMENT_TITLE"
android:value="@string/title_widget_buttons" />
<meta-data android:name="com.cyanogenmod.settings.PARENT_FRAGMENT_CLASS"
android:value="com.cyanogenmod.settings.Settings$PowerWidgetActivity" />
</activity> </activity>
<!--- End Notification Widget --> <!--- End Notification Widget -->
<!--- Backlight --> <!--- Backlight -->
<activity android:name="Settings$BackLightActivity" <activity android:name=".activities.Backlight"
android:label="@string/backlight_title" android:label="@string/backlight_title"
android:configChanges="orientation|keyboardHidden|screenSize" android:configChanges="orientation|keyboardHidden|screenSize"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
Expand All @@ -107,10 +87,6 @@
<action android:name="android.cyanogenmod.BACKLIGHT_SETTINGS" /> <action android:name="android.cyanogenmod.BACKLIGHT_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />
</intent-filter> </intent-filter>
<meta-data android:name="com.cyanogenmod.settings.FRAGMENT_CLASS"
android:value="com.cyanogenmod.settings.activities.Backlight" />
<meta-data android:name="com.cyanogenmod.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/backlight_settings" />
</activity> </activity>


<activity android:name=".activities.LightLevelsActivity" <activity android:name=".activities.LightLevelsActivity"
Expand Down
20 changes: 20 additions & 0 deletions README.mkdn
@@ -0,0 +1,20 @@
CMSettings is a central location for CyanogenMod specific settings, instead of cluttering the AOSP Settings app.

To add a item to a category you need to modify the src/com/cyanogenmod/settings/lists/<category>.java file.
This file contains a list of items that should be in the list, along with the Activity it launches.
Formart shoud look like:

{ "[title string name]", "[summary string name]", "com.cyanogenmod.settings.activities.<CLASS>", "", "[0,1,2]" }

For Title, and Summary you want to use the Resource Identifier name, as it is replaced in the Adapter with the correct localized string.

0 = Header
1 = Normal
2 = Switch

If you choose switch you will need to make a switch class inside of the "switches" folder, and then modify SlideSettings.java
to add the class in the appropriate places, please look at "mWidgetSwitch" and "PowerWidgetSwitch" for examples of how to create this.

For your Preference activities this should be made the same way as normal, preferbally use fragments where preferencescreens use to be used.
You can see PowerWidget.java for a good way to keep everything contained in a single file for cleanliness.

4 changes: 2 additions & 2 deletions res/layout/preference_header_switch_item.xml
Expand Up @@ -35,8 +35,8 @@
<TextView android:id="@+id/summary" <TextView android:id="@+id/summary"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@android:id/title" android:layout_below="@id/title"
android:layout_alignLeft="@android:id/title" android:layout_alignLeft="@id/title"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="2" /> android:maxLines="2" />
Expand Down

0 comments on commit e0d231e

Please sign in to comment.