API tools faq
paste
Advertisement
techmik

Untitled

techmik
Sep 2nd, 2011
98
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 8.92 KB | None | 0 0
raw download clone embed print report
  1. techmik@techmik-acer ~/android/system/packages/apps/CMParts $ git diff gingerbread
  2. diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
  3. index cef3dc2..307698c 100755
  4. --- a/res/values-pt/arrays.xml
  5. +++ b/res/values-pt/arrays.xml
  6. @@ -16,6 +16,8 @@
  7. -->
  8.  
  9. <resources>
  10. +^M
  11. +^M
  12. <string-array name="entries_install_location">
  13. <item>Automático</item>
  14. <item>Memória interna</item>
  15. @@ -28,8 +30,9 @@
  16. <item>Nenhum (Padrão)</item>
  17. </string-array>
  18.  
  19. +^M
  20. +^M
  21. <string-array name="pref_trackball_blink_rate_entries">
  22. - <item>Usar configuração da aplicação</item>
  23. <item>2 (Rápido)</item>
  24. <item>3</item>
  25. <item>4 (Médio)</item>
  26. @@ -37,13 +40,6 @@
  27. <item>6 (Lento)</item>
  28. </string-array>
  29.  
  30. - <string-array name="pref_trackball_force_mode_entries">
  31. - <item>Usar configurações da aplicação</item>
  32. - <item>Forçar LED a ficar desligado</item>
  33. - <item>Forçar LED a acender em eventos</item>
  34. - <item>Forçar LED a acender</item>
  35. - </string-array>
  36. -
  37. <string-array name="pref_lockscreen_delay_entries">
  38. <item>Imediatamente</item>
  39. <item>1 s</item>
  40. diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
  41. index 045bf7b..6eaadeb 100755
  42. --- a/res/values-pt/strings.xml
  43. +++ b/res/values-pt/strings.xml
  44. @@ -690,27 +690,4 @@
  45. <string name="pref_switch_storage_summary_on">Usando armazenamento interno
  46. <string name="pref_switch_storage_summary_off">Usando cartão removível para
  47. <string name="pref_storage_switch_unavailable">Este dispositivo não possui
  48. - <string name="group_settings">Configurações</string>
  49. - <string name="trackball_category_unconfigured">Desconfigurado</string>
  50. - <string name="trackball_category_misc">Diversos</string>
  51. - <string name="trackball_app_save_title">Salvar</string>
  52. - <string name="trackball_app_save_summary">Salvar configurações para esta ap
  53. - <string name="trackball_app_reset_title">Redefinir</string>
  54. - <string name="trackball_app_reset_summary">Remover configurações personaliz
  55. - <string name="trackball_force_mode_title">Modo do LED</string>
  56. - <string name="trackball_force_mode_dialog">Por favor selecione um modo</str
  57. - <string name="trackball_force_mode_summary">Configure como o LED deve-se co
  58. - <string name="trackball_app_email">Email</string>
  59. - <string name="trackball_app_mms">Mensagens</string>
  60. - <string name="trackball_app_gvoice">Google Voice</string>
  61. - <string name="trackball_app_gmail">Gmail</string>
  62. - <string name="trackball_app_gtalk">GTalk</string>
  63. - <string name="trackball_app_twitter">Twitter</string>
  64. - <string name="trackball_app_twicca">Twicca</string>
  65. - <string name="trackball_app_dialer">Ligação Perdida</string>
  66. - <string name="trackball_color_entry_use_app">Usar configuração da aplicação
  67. - <string name="pref_backtrack_title">BackTrack Minipad</string>
  68. - <string name="pref_backtrack_summary">Habilitar/desabilitar BackTrack Minip
  69. - <string name="user_defined_envelope_key">Tecla de Envelope</string>
  70. - <string name="user_defined_explorer_key">Tecla de Navegação</string>
  71. -</resources>
  72. +</resources>
  73. \ No newline at end of file
  74. diff --git a/res/values/arrays.xml b/res/values/arrays.xml
  75. index 1417cf5..3e82f43 100644
  76. --- a/res/values/arrays.xml
  77. +++ b/res/values/arrays.xml
  78. @@ -175,20 +175,6 @@
  79. <item>red</item>
  80. </string-array>
  81.  
  82. - <string-array name="entries_mixable_dual_led_colors" translatable="false">
  83. - <item>@string/trackball_color_entry_use_app</item>
  84. - <item>@string/trackball_color_entry_green</item>
  85. - <item>@string/trackball_color_entry_red</item>
  86. - <item>@string/trackball_color_entry_amber</item>
  87. - </string-array>
  88. -
  89. - <string-array name="values_mixable_dual_led_colors" translatable="false">
  90. - <item>default</item>
  91. - <item>green</item>
  92. - <item>red</item>
  93. - <item>yellow</item>
  94. - </string-array>
  95. -
  96. <string-array name="pref_trackball_blink_rate_entries">
  97. <item>Use application setting</item>
  98. <item>2 (Fast)</item>
  99. diff --git a/res/values/config.xml b/res/values/config.xml
  100. index 1f12638..686aa25 100644
  101. --- a/res/values/config.xml
  102. +++ b/res/values/config.xml
  103. @@ -9,12 +9,15 @@
  104. <!-- Notification LED can show any color -->
  105. <bool name="has_rgb_notification_led">false</bool>
  106.  
  107. + <!-- Notification LED has single color only -->
  108. + <bool name="has_single_notification_led">false</bool>
  109. +
  110. + <!-- Notification LED can pulse -->
  111. + <bool name="led_notification_can_pulse">true</bool>
  112. +
  113. <!-- Notification LED can show green and amber only -->
  114. <bool name="has_dual_notification_led">false</bool>
  115.  
  116. - <!-- Notification LED mixes up amber with green and red -->
  117. - <bool name="has_mixable_dual_notification_led">false</bool>
  118. -
  119. <!-- LED Flashlight -->
  120. <bool name="has_led_flash">false</bool>
  121.  
  122. diff --git a/src/com/cyanogenmod/cmparts/activities/UIActivity.java b/src/com/cy
  123. index 5b6e7f0..afde0b5 100644
  124. --- a/src/com/cyanogenmod/cmparts/activities/UIActivity.java
  125. +++ b/src/com/cyanogenmod/cmparts/activities/UIActivity.java
  126. @@ -86,9 +86,11 @@ public class UIActivity extends PreferenceActivity implements
  127. mTrackballScreen = (PreferenceScreen) prefSet.findPreference(NOTIFICATI
  128. mExtrasScreen = (PreferenceScreen) prefSet.findPreference(EXTRAS_SCREEN
  129.  
  130. - boolean hasDualLed = (getResources().getBoolean(R.bool.has_dual_notific
  131. - || getResources().getBoolean(R.bool.has_mixable_dual_notificati
  132. - if (!getResources().getBoolean(R.bool.has_rgb_notification_led) && !has
  133. + boolean hasLed = getResources().getBoolean(R.bool.has_rgb_notification_
  134. + || getResources().getBoolean(R.bool.has_dual_notification_led)
  135. + || getResources().getBoolean(R.bool.has_single_notification_led
  136. +
  137. + if (!hasLed) {
  138. ((PreferenceCategory) prefSet.findPreference(GENERAL_CATEGORY))
  139. .removePreference(mTrackballScreen);
  140. }
  141. diff --git a/src/com/cyanogenmod/cmparts/activities/led/AdvancedActivity.java b/
  142. index 6e0af4d..35ecfee 100644
  143. --- a/src/com/cyanogenmod/cmparts/activities/led/AdvancedActivity.java
  144. +++ b/src/com/cyanogenmod/cmparts/activities/led/AdvancedActivity.java
  145. @@ -57,11 +57,8 @@ public class AdvancedActivity extends PreferenceActivity impl
  146. mPulseInOrderPref = (CheckBoxPreference) findPreference("pulse_in_order
  147. mResetPref = findPreference("reset");
  148.  
  149. - boolean hasDualLed = getResources().getBoolean(R.bool.has_dual_notifica
  150. - getResources().getBoolean(R.bool.has_mixable_dual_
  151. -
  152. /* Hide options only relevant to RGB lights if no RGB LED is present */
  153. - if (hasDualLed) {
  154. + if (!getResources().getBoolean(R.bool.has_rgb_notification_led)) {
  155. PreferenceScreen screen = getPreferenceScreen();
  156. screen.removePreference(mBlendColorsPref);
  157. screen.removePreference(mPulseSuccessionPref);
  158. @@ -74,6 +71,11 @@ public class AdvancedActivity extends PreferenceActivity impl
  159. mPulseInOrderPref.setOnPreferenceChangeListener(this);
  160. }
  161.  
  162. + /* Hide Always pulse checkbox if not supported */
  163. + if (getResources().getBoolean(R.bool.led_doesnt_pulse)) {
  164. + PreferenceScreen screen = getPreferenceScreen();
  165. + screen.removePreference(mPulseAlwaysPref);
  166. + }
  167. initSettings();
  168. }
  169.  
  170. diff --git a/src/com/cyanogenmod/cmparts/activities/led/PackageSettingsActivity.
  171. index 38510f4..dbd5bc0 100644
  172. --- a/src/com/cyanogenmod/cmparts/activities/led/PackageSettingsActivity.java
  173. +++ b/src/com/cyanogenmod/cmparts/activities/led/PackageSettingsActivity.java
  174. @@ -102,6 +102,9 @@ public class PackageSettingsActivity extends PreferenceActiv
  175.  
  176. mColorPref = (ListPreference) findPreference("color");
  177. mColorPref.setOnPreferenceChangeListener(this);
  178. + if (getResources().getBoolean(R.bool.has_single_notification_led)) {
  179. + getPreferenceScreen().removePreference(mColorPref);
  180. + }
  181. populateColors();
  182.  
  183. mBlinkPref = (ListPreference) findPreference("blink");
  184. @@ -174,10 +177,7 @@ public class PackageSettingsActivity extends PreferenceActi
  185. }
  186.  
  187. private void populateColors() {
  188. - if (getResources().getBoolean(R.bool.has_mixable_dual_notification_led)
  189. - mColorPref.setEntries(R.array.entries_mixable_dual_led_colors);
  190. - mColorPref.setEntryValues(R.array.values_mixable_dual_led_colors);
  191. - } else if (getResources().getBoolean(R.bool.has_dual_notification_led))
  192. + if (getResources().getBoolean(R.bool.has_dual_notification_led)) {
  193. mColorPref.setEntries(R.array.entries_dual_led_colors);
  194. mColorPref.setEntryValues(R.array.values_dual_led_colors);
  195. } else {
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!