Advertisement
infected_

Untitled

Apr 6th, 2014
120
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.29 KB | None | 0 0
  1. infected_@mint-petra ~/cyan_11 $ cd frameworks/base/
  2. infected_@mint-petra ~/cyan_11/frameworks/base $ git status
  3. # HEAD detached from 4e52b18
  4. # You are currently cherry-picking.
  5. # (fix conflicts and run "git commit")
  6. #
  7. # Changes to be committed:
  8. #
  9. # modified: core/res/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png
  10. # modified: core/res/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png
  11. # modified: core/res/res/drawable-hdpi/btn_check_off_focused_holo_dark.png
  12. # modified: core/res/res/drawable-hdpi/btn_check_off_focused_holo_light.png
  13. # modified: core/res/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png
  14. # modified: core/res/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png
  15. # modified: core/res/res/drawable-hdpi/btn_check_on_focused_holo_dark.png
  16. # modified: core/res/res/drawable-hdpi/btn_check_on_focused_holo_light.png
  17. # modified: core/res/res/drawable-hdpi/btn_check_on_holo_dark.png
  18. # modified: core/res/res/drawable-hdpi/btn_check_on_holo_light.png
  19. # modified: core/res/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png
  20. # modified: core/res/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_light.png
  21. # modified: core/res/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png
  22. # modified: core/res/res/drawable-hdpi/btn_radio_off_focused_holo_light.png
  23. # modified: core/res/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png
  24. # modified: core/res/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_light.png
  25. # modified: core/res/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png
  26. # modified: core/res/res/drawable-hdpi/btn_radio_on_focused_holo_light.png
  27. # modified: core/res/res/drawable-hdpi/btn_radio_on_holo_dark.png
  28. # modified: core/res/res/drawable-hdpi/btn_radio_on_holo_light.png
  29. # modified: core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png
  30. # modified: core/res/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png
  31. # modified: core/res/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png
  32. # modified: core/res/res/drawable-mdpi/btn_check_off_focused_holo_dark.png
  33. # modified: core/res/res/drawable-mdpi/btn_check_off_focused_holo_light.png
  34. # modified: core/res/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png
  35. # modified: core/res/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png
  36. # modified: core/res/res/drawable-mdpi/btn_check_on_focused_holo_dark.png
  37. # modified: core/res/res/drawable-mdpi/btn_check_on_focused_holo_light.png
  38. # modified: core/res/res/drawable-mdpi/btn_check_on_holo_dark.png
  39. # modified: core/res/res/drawable-mdpi/btn_check_on_holo_light.png
  40. # modified: core/res/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png
  41. # modified: core/res/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_light.png
  42. # modified: core/res/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png
  43. # modified: core/res/res/drawable-mdpi/btn_radio_off_focused_holo_light.png
  44. # modified: core/res/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png
  45. # modified: core/res/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_light.png
  46. # modified: core/res/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png
  47. # modified: core/res/res/drawable-mdpi/btn_radio_on_focused_holo_light.png
  48. # modified: core/res/res/drawable-mdpi/btn_radio_on_holo_dark.png
  49. # modified: core/res/res/drawable-mdpi/btn_radio_on_holo_light.png
  50. # modified: core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png
  51. # modified: core/res/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png
  52. # modified: core/res/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_light.png
  53. # modified: core/res/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png
  54. # modified: core/res/res/drawable-xhdpi/btn_check_off_focused_holo_light.png
  55. # modified: core/res/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png
  56. # modified: core/res/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_light.png
  57. # modified: core/res/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png
  58. # modified: core/res/res/drawable-xhdpi/btn_check_on_focused_holo_light.png
  59. # modified: core/res/res/drawable-xhdpi/btn_check_on_holo_dark.png
  60. # modified: core/res/res/drawable-xhdpi/btn_check_on_holo_light.png
  61. # modified: core/res/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png
  62. # modified: core/res/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_light.png
  63. # modified: core/res/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png
  64. # modified: core/res/res/drawable-xhdpi/btn_radio_off_focused_holo_light.png
  65. # modified: core/res/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png
  66. # modified: core/res/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_light.png
  67. # modified: core/res/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png
  68. # modified: core/res/res/drawable-xhdpi/btn_radio_on_focused_holo_light.png
  69. # modified: core/res/res/drawable-xhdpi/btn_radio_on_holo_dark.png
  70. # modified: core/res/res/drawable-xhdpi/btn_radio_on_holo_light.png
  71. # modified: core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png
  72. # modified: core/res/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_dark.png
  73. # modified: core/res/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_light.png
  74. # modified: core/res/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png
  75. # modified: core/res/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png
  76. # modified: core/res/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_dark.png
  77. # modified: core/res/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_light.png
  78. # modified: core/res/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png
  79. # modified: core/res/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png
  80. # modified: core/res/res/drawable-xxhdpi/btn_check_on_holo_dark.png
  81. # modified: core/res/res/drawable-xxhdpi/btn_check_on_holo_light.png
  82. # modified: core/res/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_dark.png
  83. # modified: core/res/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_light.png
  84. # modified: core/res/res/drawable-xxhdpi/btn_radio_off_focused_holo_dark.png
  85. # modified: core/res/res/drawable-xxhdpi/btn_radio_off_focused_holo_light.png
  86. # modified: core/res/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_dark.png
  87. # modified: core/res/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_light.png
  88. # modified: core/res/res/drawable-xxhdpi/btn_radio_on_focused_holo_dark.png
  89. # modified: core/res/res/drawable-xxhdpi/btn_radio_on_focused_holo_light.png
  90. # modified: core/res/res/drawable-xxhdpi/btn_radio_on_holo_dark.png
  91. # modified: core/res/res/drawable-xxhdpi/btn_radio_on_holo_light.png
  92. # modified: core/res/res/drawable-xxhdpi/switch_thumb_activated_holo_light.9.png
  93. #
  94. # Unmerged paths:
  95. # (use "git add <file>..." to mark resolution)
  96. #
  97. # both modified: core/res/res/drawable-hdpi/switch_thumb_activated_holo_dark.9.png
  98. # both modified: core/res/res/drawable-mdpi/switch_thumb_activated_holo_dark.9.png
  99. # both modified: core/res/res/drawable-xhdpi/switch_thumb_activated_holo_dark.9.png
  100. # both modified: core/res/res/drawable-xxhdpi/switch_thumb_activated_holo_dark.9.png
  101. #
  102. infected_@mint-petra ~/cyan_11/frameworks/base $ git commit -a
  103. [detached HEAD 76c542d] fb: update missing google UI changes for 4.4
  104. Author: Lars Greiss <kufikugel@googlemail.com>
  105. 84 files changed, 0 insertions(+), 0 deletions(-)
  106. rewrite core/res/res/drawable-hdpi/btn_check_off_disabled_focused_holo_dark.png (98%)
  107. rewrite core/res/res/drawable-hdpi/btn_check_off_disabled_focused_holo_light.png (98%)
  108. rewrite core/res/res/drawable-hdpi/btn_check_off_focused_holo_dark.png (98%)
  109. rewrite core/res/res/drawable-hdpi/btn_check_off_focused_holo_light.png (98%)
  110. rewrite core/res/res/drawable-hdpi/btn_check_on_disabled_focused_holo_dark.png (99%)
  111. rewrite core/res/res/drawable-hdpi/btn_check_on_disabled_focused_holo_light.png (98%)
  112. rewrite core/res/res/drawable-hdpi/btn_check_on_focused_holo_dark.png (99%)
  113. rewrite core/res/res/drawable-hdpi/btn_check_on_focused_holo_light.png (99%)
  114. rewrite core/res/res/drawable-hdpi/btn_check_on_holo_dark.png (99%)
  115. rewrite core/res/res/drawable-hdpi/btn_check_on_holo_light.png (99%)
  116. rewrite core/res/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_dark.png (99%)
  117. rewrite core/res/res/drawable-hdpi/btn_radio_off_disabled_focused_holo_light.png (99%)
  118. rewrite core/res/res/drawable-hdpi/btn_radio_off_focused_holo_dark.png (99%)
  119. rewrite core/res/res/drawable-hdpi/btn_radio_off_focused_holo_light.png (99%)
  120. rewrite core/res/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_dark.png (99%)
  121. rewrite core/res/res/drawable-hdpi/btn_radio_on_disabled_focused_holo_light.png (99%)
  122. rewrite core/res/res/drawable-hdpi/btn_radio_on_focused_holo_dark.png (99%)
  123. rewrite core/res/res/drawable-hdpi/btn_radio_on_focused_holo_light.png (99%)
  124. rewrite core/res/res/drawable-hdpi/btn_radio_on_holo_dark.png (99%)
  125. rewrite core/res/res/drawable-hdpi/btn_radio_on_holo_light.png (99%)
  126. rewrite core/res/res/drawable-hdpi/switch_thumb_activated_holo_light.9.png (98%)
  127. rewrite core/res/res/drawable-mdpi/btn_check_off_disabled_focused_holo_dark.png (97%)
  128. rewrite core/res/res/drawable-mdpi/btn_check_off_disabled_focused_holo_light.png (97%)
  129. rewrite core/res/res/drawable-mdpi/btn_check_off_focused_holo_dark.png (97%)
  130. rewrite core/res/res/drawable-mdpi/btn_check_off_focused_holo_light.png (98%)
  131. rewrite core/res/res/drawable-mdpi/btn_check_on_disabled_focused_holo_dark.png (98%)
  132. rewrite core/res/res/drawable-mdpi/btn_check_on_disabled_focused_holo_light.png (98%)
  133. rewrite core/res/res/drawable-mdpi/btn_check_on_focused_holo_dark.png (99%)
  134. rewrite core/res/res/drawable-mdpi/btn_check_on_focused_holo_light.png (99%)
  135. rewrite core/res/res/drawable-mdpi/btn_check_on_holo_dark.png (99%)
  136. rewrite core/res/res/drawable-mdpi/btn_check_on_holo_light.png (99%)
  137. rewrite core/res/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_dark.png (99%)
  138. rewrite core/res/res/drawable-mdpi/btn_radio_off_disabled_focused_holo_light.png (99%)
  139. rewrite core/res/res/drawable-mdpi/btn_radio_off_focused_holo_dark.png (92%)
  140. rewrite core/res/res/drawable-mdpi/btn_radio_off_focused_holo_light.png (99%)
  141. rewrite core/res/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_dark.png (99%)
  142. rewrite core/res/res/drawable-mdpi/btn_radio_on_disabled_focused_holo_light.png (99%)
  143. rewrite core/res/res/drawable-mdpi/btn_radio_on_focused_holo_dark.png (99%)
  144. rewrite core/res/res/drawable-mdpi/btn_radio_on_focused_holo_light.png (99%)
  145. rewrite core/res/res/drawable-mdpi/btn_radio_on_holo_dark.png (99%)
  146. rewrite core/res/res/drawable-mdpi/btn_radio_on_holo_light.png (99%)
  147. rewrite core/res/res/drawable-mdpi/switch_thumb_activated_holo_light.9.png (97%)
  148. rewrite core/res/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_dark.png (98%)
  149. rewrite core/res/res/drawable-xhdpi/btn_check_off_disabled_focused_holo_light.png (98%)
  150. rewrite core/res/res/drawable-xhdpi/btn_check_off_focused_holo_dark.png (98%)
  151. rewrite core/res/res/drawable-xhdpi/btn_check_off_focused_holo_light.png (98%)
  152. rewrite core/res/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_dark.png (99%)
  153. rewrite core/res/res/drawable-xhdpi/btn_check_on_disabled_focused_holo_light.png (99%)
  154. rewrite core/res/res/drawable-xhdpi/btn_check_on_focused_holo_dark.png (99%)
  155. rewrite core/res/res/drawable-xhdpi/btn_check_on_focused_holo_light.png (99%)
  156. rewrite core/res/res/drawable-xhdpi/btn_check_on_holo_dark.png (99%)
  157. rewrite core/res/res/drawable-xhdpi/btn_check_on_holo_light.png (99%)
  158. rewrite core/res/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_dark.png (99%)
  159. rewrite core/res/res/drawable-xhdpi/btn_radio_off_disabled_focused_holo_light.png (99%)
  160. rewrite core/res/res/drawable-xhdpi/btn_radio_off_focused_holo_dark.png (99%)
  161. rewrite core/res/res/drawable-xhdpi/btn_radio_off_focused_holo_light.png (99%)
  162. rewrite core/res/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_dark.png (99%)
  163. rewrite core/res/res/drawable-xhdpi/btn_radio_on_disabled_focused_holo_light.png (99%)
  164. rewrite core/res/res/drawable-xhdpi/btn_radio_on_focused_holo_dark.png (99%)
  165. rewrite core/res/res/drawable-xhdpi/btn_radio_on_focused_holo_light.png (99%)
  166. rewrite core/res/res/drawable-xhdpi/btn_radio_on_holo_dark.png (99%)
  167. rewrite core/res/res/drawable-xhdpi/btn_radio_on_holo_light.png (99%)
  168. rewrite core/res/res/drawable-xhdpi/switch_thumb_activated_holo_light.9.png (98%)
  169. rewrite core/res/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_dark.png (99%)
  170. rewrite core/res/res/drawable-xxhdpi/btn_check_off_disabled_focused_holo_light.png (99%)
  171. rewrite core/res/res/drawable-xxhdpi/btn_check_off_focused_holo_dark.png (99%)
  172. rewrite core/res/res/drawable-xxhdpi/btn_check_off_focused_holo_light.png (99%)
  173. rewrite core/res/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_dark.png (99%)
  174. rewrite core/res/res/drawable-xxhdpi/btn_check_on_disabled_focused_holo_light.png (99%)
  175. rewrite core/res/res/drawable-xxhdpi/btn_check_on_focused_holo_dark.png (99%)
  176. rewrite core/res/res/drawable-xxhdpi/btn_check_on_focused_holo_light.png (99%)
  177. rewrite core/res/res/drawable-xxhdpi/btn_check_on_holo_dark.png (99%)
  178. rewrite core/res/res/drawable-xxhdpi/btn_check_on_holo_light.png (99%)
  179. rewrite core/res/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_dark.png (99%)
  180. rewrite core/res/res/drawable-xxhdpi/btn_radio_off_disabled_focused_holo_light.png (99%)
  181. rewrite core/res/res/drawable-xxhdpi/btn_radio_off_focused_holo_dark.png (99%)
  182. rewrite core/res/res/drawable-xxhdpi/btn_radio_off_focused_holo_light.png (99%)
  183. rewrite core/res/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_dark.png (99%)
  184. rewrite core/res/res/drawable-xxhdpi/btn_radio_on_disabled_focused_holo_light.png (99%)
  185. rewrite core/res/res/drawable-xxhdpi/btn_radio_on_focused_holo_dark.png (98%)
  186. rewrite core/res/res/drawable-xxhdpi/btn_radio_on_focused_holo_light.png (99%)
  187. rewrite core/res/res/drawable-xxhdpi/btn_radio_on_holo_dark.png (99%)
  188. rewrite core/res/res/drawable-xxhdpi/btn_radio_on_holo_light.png (99%)
  189. rewrite core/res/res/drawable-xxhdpi/switch_thumb_activated_holo_light.9.png (99%)
  190. infected_@mint-petra ~/cyan_11/frameworks/base $
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement