diff options
| author | nebkat <nebkat@teamhacksung.org> | 2012-02-26 21:53:56 +0000 |
|---|---|---|
| committer | nebkat <nebkat@teamhacksung.org> | 2012-12-24 10:09:02 +0000 |
| commit | c6f8c8c92e73efb0aa675a89ca4eded9ebd77615 (patch) | |
| tree | 0c43ecb0d6d61a200404de1d541b03b81e607d0d /res/xml | |
| parent | 8ef4f37b141f5e48bb5a63fc401d6ea9fbd9a8b1 (diff) | |
| download | android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.gz android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.tar.bz2 android_packages_apps_Trebuchet-c6f8c8c92e73efb0aa675a89ca4eded9ebd77615.zip | |
Hotseat: Multiple Pages
Conflicts:
res/layout-land/hotseat.xml
res/layout-port/hotseat.xml
res/values/strings.xml
res/xml/default_workspace.xml
res/xml/preferences.xml
src/com/beansoft/launcher/preference/PreferencesProvider.java
src/com/cyanogenmod/trebuchet/Hotseat.java
src/com/cyanogenmod/trebuchet/PagedView.java
src/com/cyanogenmod/trebuchet/Workspace.java
Change-Id: I958b105451160841d5d7d345164dcb2dec4f9404
Diffstat (limited to 'res/xml')
| -rw-r--r-- | res/xml/default_workspace.xml | 8 | ||||
| -rw-r--r-- | res/xml/preferences_dock.xml | 8 | ||||
| -rw-r--r-- | res/xml/update_workspace.xml | 30 |
3 files changed, 40 insertions, 6 deletions
diff --git a/res/xml/default_workspace.xml b/res/xml/default_workspace.xml index 2feb09fca..7975e65a4 100644 --- a/res/xml/default_workspace.xml +++ b/res/xml/default_workspace.xml @@ -71,12 +71,12 @@ launcher:packageName="com.android.contacts" launcher:className="com.android.contacts.activities.PeopleActivity" launcher:container="-101" - launcher:screen="1" + launcher:screen="0" launcher:x="1" launcher:y="0" /> <shortcut launcher:container="-101" - launcher:screen="2" + launcher:screen="0" launcher:x="2" launcher:y="0" launcher:icon="@drawable/ic_allapps" @@ -86,14 +86,14 @@ launcher:packageName="com.android.mms" launcher:className="com.android.mms.ui.ConversationList" launcher:container="-101" - launcher:screen="3" + launcher:screen="0" launcher:x="3" launcher:y="0" /> <favorite launcher:packageName="com.android.browser" launcher:className="com.android.browser.BrowserActivity" launcher:container="-101" - launcher:screen="4" + launcher:screen="0" launcher:x="4" launcher:y="0" /> </favorites> diff --git a/res/xml/preferences_dock.xml b/res/xml/preferences_dock.xml index 10fabe262..08a2c19fb 100644 --- a/res/xml/preferences_dock.xml +++ b/res/xml/preferences_dock.xml @@ -18,8 +18,14 @@ xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet" android:key="ui_dock" android:title="@string/preferences_interface_dock_title"> + <com.cyanogenmod.trebuchet.preference.NumberPickerPreference android:key="ui_dock_pages" + android:title="@string/preferences_interface_dock_pages_title" + android:summary="@string/preferences_interface_dock_pages_summary" + android:defaultValue="1" + launcher:max="3" + launcher:min="1" /> <CheckBoxPreference android:key="ui_dock_divider" android:title="@string/preferences_interface_dock_divider_title" android:summary="@string/preferences_interface_dock_divider_summary" android:defaultValue="true" /> -</PreferenceScreen>
\ No newline at end of file +</PreferenceScreen> diff --git a/res/xml/update_workspace.xml b/res/xml/update_workspace.xml index 768d3ba6b..320d765e7 100644 --- a/res/xml/update_workspace.xml +++ b/res/xml/update_workspace.xml @@ -17,12 +17,40 @@ <favorites xmlns:launcher="http://schemas.android.com/apk/res/com.cyanogenmod.trebuchet"> <!-- Update the db with new hotseat all apps button. --> <!-- Hotseat (We use the screen as the position of the item in the hotseat) --> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.DialtactsActivity" + launcher:container="-101" + launcher:screen="0" + launcher:x="0" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.contacts" + launcher:className="com.android.contacts.activities.PeopleActivity" + launcher:container="-101" + launcher:screen="0" + launcher:x="1" + launcher:y="0" /> <shortcut launcher:container="-101" - launcher:screen="2" + launcher:screen="0" launcher:x="2" launcher:y="0" launcher:icon="@drawable/ic_allapps" launcher:title="@string/all_apps_button_label" launcher:uri="#Intent;action=com.cyanogenmod.trebuchet.LAUNCHER_ACTION;category=android.intent.category.HOME;launchFlags=0x10200000;component=com.cyanogenmod.trebuchet/com.cyanogenmod.trebuchet.Launcher;S.android.intent.extra.TEXT=AllApps;end" /> + <favorite + launcher:packageName="com.android.mms" + launcher:className="com.android.mms.ui.ConversationList" + launcher:container="-101" + launcher:screen="0" + launcher:x="3" + launcher:y="0" /> + <favorite + launcher:packageName="com.android.browser" + launcher:className="com.android.browser.BrowserActivity" + launcher:container="-101" + launcher:screen="0" + launcher:x="4" + launcher:y="0" /> </favorites> |