diff options
| author | Hashcode <hashcode0f@gmail.com> | 2013-11-10 22:45:45 -0800 |
|---|---|---|
| committer | Hashcode <hashcode0f@gmail.com> | 2013-11-10 22:45:45 -0800 |
| commit | c9d95d33192d01343941a3f303c749ba69357944 (patch) | |
| tree | 774a7ba058d1522eea5f666af6096706c73aeaf2 /overlay | |
| parent | 55a689064baa556f777a8e110d1322bf6d758c64 (diff) | |
| parent | 620cd3b82cb9c47572152da75ab795155a22ebf1 (diff) | |
Merge branch 'cm-10.2' into cm-11.0
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/cm/packages/apps/Settings/res/xml/tablet_power_widget.xml | 56 | ||||
| -rw-r--r-- | overlay/cm/packages/apps/Trebuchet/res/xml-sw600dp/default_workspace_no_telephony.xml | 12 |
2 files changed, 6 insertions, 62 deletions
diff --git a/overlay/cm/packages/apps/Settings/res/xml/tablet_power_widget.xml b/overlay/cm/packages/apps/Settings/res/xml/tablet_power_widget.xml deleted file mode 100644 index 5de860f..0000000 --- a/overlay/cm/packages/apps/Settings/res/xml/tablet_power_widget.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PreferenceScreen - xmlns:android="http://schemas.android.com/apk/res/android"> - - <CheckBoxPreference - android:key="pref_airplane_toggle" - android:title="@string/title_toggle_airplane" - android:defaultValue="false"/> - - <CheckBoxPreference - android:key="pref_rotate_toggle" - android:title="@string/title_toggle_autorotate" - android:defaultValue="true"/> - - <CheckBoxPreference - android:key="pref_bluetooth_toggle" - android:title="@string/title_toggle_bluetooth" - android:defaultValue="false"/> - - <CheckBoxPreference - android:key="pref_gps_toggle" - android:title="@string/title_toggle_gps" - android:defaultValue="false"/> - - <CheckBoxPreference - android:key="pref_wifi_toggle" - android:title="@string/title_toggle_wifi" - android:defaultValue="true"/> - - <CheckBoxPreference - android:key="pref_flashlight_toggle" - android:title="@string/title_toggle_flashlight" - android:defaultValue="false"/> - - <CheckBoxPreference - android:key="pref_mobile_data_toggle" - android:title="@string/title_toggle_mobiledata" - android:defaultValue="false"/> - - <CheckBoxPreference - android:key="pref_network_mode_toggle" - android:title="@string/title_toggle_networkmode" - android:defaultValue="false"/> - - <CheckBoxPreference - android:key="pref_sound_toggle" - android:title="@string/title_toggle_sound" - android:defaultValue="false"/> - - <PreferenceScreen - android:key="widget_order" - android:title="@string/title_widget_order" - android:summary="@string/summary_widget_order" - android:fragment="com.android.settings.cyanogenmod.TabletPowerWidget$PowerWidgetOrder" /> - -</PreferenceScreen> diff --git a/overlay/cm/packages/apps/Trebuchet/res/xml-sw600dp/default_workspace_no_telephony.xml b/overlay/cm/packages/apps/Trebuchet/res/xml-sw600dp/default_workspace_no_telephony.xml index e532d32..187cbfa 100644 --- a/overlay/cm/packages/apps/Trebuchet/res/xml-sw600dp/default_workspace_no_telephony.xml +++ b/overlay/cm/packages/apps/Trebuchet/res/xml-sw600dp/default_workspace_no_telephony.xml @@ -7,9 +7,9 @@ launcher:packageName="com.andrew.apollo" launcher:className="com.andrew.apollo.appwidgets.AppWidgetLarge" launcher:screen="1" - launcher:x="1" + launcher:x="0" launcher:y="0" - launcher:spanX="4" + launcher:spanX="6" launcher:spanY="2" /> <!-- Middle screen [2] --> @@ -33,14 +33,14 @@ launcher:packageName="com.android.gallery3d" launcher:className="com.android.gallery3d.app.Gallery" launcher:screen="3" - launcher:x="1" - launcher:y="3" /> + launcher:x="2" + launcher:y="5" /> <favorite launcher:packageName="com.android.settings" launcher:className="com.android.settings.Settings" launcher:screen="3" - launcher:x="2" - launcher:y="3" /> + launcher:x="3" + launcher:y="5" /> <!-- Far-right screen [4] --> |