Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: CyanogenMod/android_packages_apps_Trebuchet
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: cm-10.1
Choose a base ref
...
head repository: mirror-androidarmv6/android_packages_apps_Trebuchet
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: cm-10.1
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Dec 24, 2012

  1. Remove wallpapers

    gntcs committed Dec 24, 2012
    Copy the full SHA
    37cdae0 View commit details
  2. Change defaults:

    - Turn off search bar
    - Turn on resize any widgets
    - Don't join with widgets while scrolling
    gntcs committed Dec 24, 2012
    Copy the full SHA
    d1296bc View commit details
  3. Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_app…

    …s_Trebuchet into cm-10.1
    gntcs committed Dec 24, 2012
    Copy the full SHA
    a0cc035 View commit details

Commits on Dec 26, 2012

  1. Merge branch 'cm-10.1' of github.com:CyanogenMod/android_packages_app…

    …s_Trebuchet into cm-10.1
    AndroidMeda committed Dec 26, 2012
    Copy the full SHA
    91f7ac0 View commit details

Commits on Dec 27, 2012

  1. Copy the full SHA
    6681b55 View commit details
  2. Copy the full SHA
    2f2af78 View commit details
  3. Copy the full SHA
    eba875f View commit details

Commits on Dec 28, 2012

  1. Copy the full SHA
    4917e3a View commit details
  2. Copy the full SHA
    289c4ab View commit details

Commits on Dec 29, 2012

  1. Copy the full SHA
    3f8e3d3 View commit details
  2. Copy the full SHA
    52bf3f1 View commit details
  3. Copy the full SHA
    8fa2c96 View commit details
  4. Copy the full SHA
    90717f8 View commit details

Commits on Dec 30, 2012

  1. Copy the full SHA
    a351f62 View commit details
  2. Copy the full SHA
    39386cd View commit details

Commits on Dec 31, 2012

  1. Copy the full SHA
    c980f1e View commit details
  2. Copy the full SHA
    81df4ec View commit details
  3. Copy the full SHA
    1f47970 View commit details

Commits on Jan 1, 2013

  1. Copy the full SHA
    dd3c877 View commit details
  2. Copy the full SHA
    fc9e265 View commit details

Commits on Jan 4, 2013

  1. Copy the full SHA
    d4493cc View commit details
  2. Copy the full SHA
    7c2a1f3 View commit details
  3. Copy the full SHA
    c052ef8 View commit details

Commits on Jan 5, 2013

  1. Copy the full SHA
    a2ed9ee View commit details
  2. Copy the full SHA
    2adc49b View commit details
  3. Copy the full SHA
    da0c4ce View commit details
  4. Copy the full SHA
    9077e8f View commit details

Commits on Jan 6, 2013

  1. Copy the full SHA
    0f75f0f View commit details
  2. Copy the full SHA
    b5a0462 View commit details
  3. Merge remote branch 'cm/cm-10.1' into cm-10.1

    Conflicts:
    	res/xml/preferences_homescreen.xml
    	src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
    androidarmv6-gerrit committed Jan 6, 2013
    Copy the full SHA
    852b43f View commit details
  4. Copy the full SHA
    35bb6c1 View commit details
  5. Copy the full SHA
    d125cfe View commit details

Commits on Jan 8, 2013

  1. Copy the full SHA
    0c00d54 View commit details

Commits on Jan 9, 2013

  1. Fix invalid merge

    Change-Id: Idcd5090005968ceb4f9fe1f6b200a781a04e63c7
    AndroidMeda committed Jan 9, 2013
    Copy the full SHA
    80beaa5 View commit details

Commits on Jan 11, 2013

  1. Copy the full SHA
    a42197c View commit details

Commits on Jan 12, 2013

  1. Copy the full SHA
    cb00f2b View commit details

Commits on Jan 14, 2013

  1. Copy the full SHA
    8584596 View commit details
  2. Copy the full SHA
    66b6599 View commit details

Commits on Jan 22, 2013

  1. Copy the full SHA
    13b1248 View commit details

Commits on Jan 23, 2013

  1. Copy the full SHA
    231fce0 View commit details

Commits on Jan 24, 2013

  1. Copy the full SHA
    b8d49b7 View commit details

Commits on Jan 26, 2013

  1. Copy the full SHA
    0c31aec View commit details
  2. Copy the full SHA
    3b1c07c View commit details

Commits on Jan 27, 2013

  1. Copy the full SHA
    e1bb500 View commit details
  2. Copy the full SHA
    52768d5 View commit details

Commits on Feb 3, 2013

  1. Copy the full SHA
    9f45f58 View commit details

Commits on Feb 4, 2013

  1. Copy the full SHA
    20160f5 View commit details

Commits on Feb 15, 2013

  1. Copy the full SHA
    dbc0012 View commit details

Commits on Feb 24, 2013

  1. Copy the full SHA
    2bf377f View commit details

Commits on Feb 27, 2013

  1. Copy the full SHA
    92167a2 View commit details
Showing with 5 additions and 26 deletions.
  1. BIN res/drawable-nodpi/wallpaper_02.jpg
  2. BIN res/drawable-nodpi/wallpaper_02_small.jpg
  3. BIN res/drawable-nodpi/wallpaper_03.jpg
  4. BIN res/drawable-nodpi/wallpaper_03_small.jpg
  5. BIN res/drawable-nodpi/wallpaper_04.jpg
  6. BIN res/drawable-nodpi/wallpaper_04_small.jpg
  7. BIN res/drawable-nodpi/wallpaper_05.jpg
  8. BIN res/drawable-nodpi/wallpaper_05_small.jpg
  9. BIN res/drawable-nodpi/wallpaper_08.jpg
  10. BIN res/drawable-nodpi/wallpaper_08_small.jpg
  11. BIN res/drawable-nodpi/wallpaper_09.jpg
  12. BIN res/drawable-nodpi/wallpaper_09_small.jpg
  13. BIN res/drawable-nodpi/wallpaper_10.jpg
  14. BIN res/drawable-nodpi/wallpaper_10_small.jpg
  15. BIN res/drawable-nodpi/wallpaper_11.jpg
  16. BIN res/drawable-nodpi/wallpaper_11_small.jpg
  17. BIN res/drawable-nodpi/wallpaper_12.jpg
  18. BIN res/drawable-nodpi/wallpaper_12_small.jpg
  19. BIN res/drawable-sw600dp-nodpi/wallpaper_02.jpg
  20. BIN res/drawable-sw600dp-nodpi/wallpaper_03.jpg
  21. BIN res/drawable-sw600dp-nodpi/wallpaper_04.jpg
  22. BIN res/drawable-sw600dp-nodpi/wallpaper_05.jpg
  23. BIN res/drawable-sw600dp-nodpi/wallpaper_08.jpg
  24. BIN res/drawable-sw600dp-nodpi/wallpaper_09.jpg
  25. BIN res/drawable-sw600dp-nodpi/wallpaper_10.jpg
  26. BIN res/drawable-sw600dp-nodpi/wallpaper_11.jpg
  27. BIN res/drawable-sw600dp-nodpi/wallpaper_12.jpg
  28. BIN res/drawable-sw720dp-nodpi/wallpaper_02.jpg
  29. BIN res/drawable-sw720dp-nodpi/wallpaper_02_small.jpg
  30. BIN res/drawable-sw720dp-nodpi/wallpaper_03.jpg
  31. BIN res/drawable-sw720dp-nodpi/wallpaper_03_small.jpg
  32. BIN res/drawable-sw720dp-nodpi/wallpaper_04.jpg
  33. BIN res/drawable-sw720dp-nodpi/wallpaper_04_small.jpg
  34. BIN res/drawable-sw720dp-nodpi/wallpaper_05.jpg
  35. BIN res/drawable-sw720dp-nodpi/wallpaper_05_small.jpg
  36. BIN res/drawable-sw720dp-nodpi/wallpaper_06.jpg
  37. BIN res/drawable-sw720dp-nodpi/wallpaper_06_small.jpg
  38. BIN res/drawable-sw720dp-nodpi/wallpaper_07.jpg
  39. BIN res/drawable-sw720dp-nodpi/wallpaper_07_small.jpg
  40. BIN res/drawable-sw720dp-nodpi/wallpaper_08.jpg
  41. BIN res/drawable-sw720dp-nodpi/wallpaper_08_small.jpg
  42. BIN res/drawable-sw720dp-nodpi/wallpaper_09.jpg
  43. BIN res/drawable-sw720dp-nodpi/wallpaper_09_small.jpg
  44. BIN res/drawable-sw720dp-nodpi/wallpaper_10.jpg
  45. BIN res/drawable-sw720dp-nodpi/wallpaper_10_small.jpg
  46. BIN res/drawable-xhdpi/wallpaper_02.jpg
  47. BIN res/drawable-xhdpi/wallpaper_03.jpg
  48. BIN res/drawable-xhdpi/wallpaper_04.jpg
  49. BIN res/drawable-xhdpi/wallpaper_05.jpg
  50. BIN res/drawable-xhdpi/wallpaper_08.jpg
  51. BIN res/drawable-xhdpi/wallpaper_09.jpg
  52. BIN res/drawable-xhdpi/wallpaper_10.jpg
  53. BIN res/drawable-xhdpi/wallpaper_11.jpg
  54. BIN res/drawable-xhdpi/wallpaper_12.jpg
  55. +0 −10 res/values-sw720dp/wallpapers.xml
  56. +0 −11 res/values/wallpapers.xml
  57. +2 −2 res/xml/preferences_drawer.xml
  58. +1 −1 res/xml/preferences_homescreen.xml
  59. +2 −2 src/com/cyanogenmod/trebuchet/preference/PreferencesProvider.java
Binary file removed res/drawable-nodpi/wallpaper_02.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_02_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_03.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_03_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_04.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_04_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_05.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_05_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_08.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_08_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_09.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_09_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_10.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_10_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_11.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_11_small.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_12.jpg
Binary file not shown.
Binary file removed res/drawable-nodpi/wallpaper_12_small.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_02.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_03.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_04.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_05.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_08.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_09.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_10.jpg
Binary file not shown.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_11.jpg
Diff not rendered.
Binary file removed res/drawable-sw600dp-nodpi/wallpaper_12.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_02.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_02_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_03.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_03_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_04.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_04_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_05.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_05_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_06.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_06_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_07.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_07_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_08.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_08_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_09.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_09_small.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_10.jpg
Diff not rendered.
Binary file removed res/drawable-sw720dp-nodpi/wallpaper_10_small.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_02.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_03.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_04.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_05.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_08.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_09.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_10.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_11.jpg
Diff not rendered.
Binary file removed res/drawable-xhdpi/wallpaper_12.jpg
Diff not rendered.
10 changes: 0 additions & 10 deletions res/values-sw720dp/wallpapers.xml
Original file line number Diff line number Diff line change
@@ -18,15 +18,5 @@
<resources>
<string-array name="wallpapers" translatable="false">
<item>wallpaper_00</item>
<item>wallpaper_01</item>
<item>wallpaper_02</item>
<item>wallpaper_03</item>
<item>wallpaper_04</item>
<item>wallpaper_05</item>
<item>wallpaper_06</item>
<item>wallpaper_07</item>
<item>wallpaper_08</item>
<item>wallpaper_09</item>
<item>wallpaper_10</item>
</string-array>
</resources>
11 changes: 0 additions & 11 deletions res/values/wallpapers.xml
Original file line number Diff line number Diff line change
@@ -18,16 +18,5 @@
<resources>
<string-array name="wallpapers" translatable="false">
<item>wallpaper_01</item>
<item>wallpaper_02</item>
<item>wallpaper_03</item>
<item>wallpaper_04</item>
<item>wallpaper_05</item>
<item>wallpaper_06</item>
<item>wallpaper_07</item>
<item>wallpaper_08</item>
<item>wallpaper_09</item>
<item>wallpaper_10</item>
<item>wallpaper_11</item>
<item>wallpaper_12</item>
</string-array>
</resources>
4 changes: 2 additions & 2 deletions res/xml/preferences_drawer.xml
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@
<CheckBoxPreference android:key="ui_drawer_widgets_join_apps"
android:title="@string/preferences_interface_drawer_widgets_join_apps_title"
android:summary="@string/preferences_interface_drawer_widgets_join_apps_summary"
android:defaultValue="true" />
android:defaultValue="false" />
</PreferenceCategory>
<PreferenceCategory android:title="@string/preferences_interface_drawer_scrolling_category">
<ListPreference android:key="ui_drawer_scrolling_transition_effect"
@@ -76,4 +76,4 @@
android:defaultValue="0"
android:dependency="ui_drawer_indicator_enable" />
</PreferenceCategory>
</PreferenceScreen>
</PreferenceScreen>
2 changes: 1 addition & 1 deletion res/xml/preferences_homescreen.xml
Original file line number Diff line number Diff line change
@@ -52,7 +52,7 @@
<CheckBoxPreference android:key="ui_homescreen_general_search"
android:title="@string/preferences_interface_homescreen_general_search_title"
android:summary="@string/preferences_interface_homescreen_general_search_summary"
android:defaultValue="true" />
android:defaultValue="false" /> <!-- DON'T CHANGE THIS LINE -->
<CheckBoxPreference android:key="ui_homescreen_general_hide_icon_labels"
android:title="@string/preferences_interface_homescreen_general_hide_icon_labels_title"
android:summary="@string/preferences_interface_homescreen_general_hide_icon_labels_summary" />
Original file line number Diff line number Diff line change
@@ -89,7 +89,7 @@ public static boolean getStretchScreens() {
return getBoolean("ui_homescreen_stretch_screens", true);
}
public static boolean getShowSearchBar() {
return getBoolean("ui_homescreen_general_search", true);
return getBoolean("ui_homescreen_general_search", false);
}
public static boolean getHideIconLabels() {
return getBoolean("ui_homescreen_general_hide_icon_labels", false);
@@ -154,7 +154,7 @@ public static boolean getRemoveWidgetsOfHiddenApps() {
return getBoolean("ui_drawer_remove_hidden_apps_widgets", true);
}
public static boolean getJoinWidgetsApps() {
return getBoolean("ui_drawer_widgets_join_apps", true);
return getBoolean("ui_drawer_widgets_join_apps", false);
}
public static class Scrolling {
public static AppsCustomizePagedView.TransitionEffect getTransitionEffect(String def) {