Gitiles
Code Review Sign In
review.shift-gmbh.com / SHIFTPHONES / android / packages / apps / Settings / 877a4db12428496ec66d876e07483bcb197ce435
  1. 877a4db Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  2. d4c7b49 Print - Settings by Svetoslav Ganov · 12 years ago
  3. fb0c7c7 am 11f5f984: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  4. 11f5f98 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  5. 623bb0c merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  6. ef2cfa7 am 7f74dea7: am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev by Dianne Hackborn · 12 years ago
  7. 7f74dea am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev by Dianne Hackborn · 12 years ago
  8. 6757108 am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev by Dianne Hackborn · 12 years ago
  9. 5da4c90 Merge "Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps" into jb-mr2-dev by Dianne Hackborn · 12 years ago
  10. 02cc36b am 793ed6e0: (-s ours) am 178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev by Baligh Uddin · 12 years ago
  11. 793ed6e am 178baecf: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev by Baligh Uddin · 12 years ago
  12. 7ae4ec5 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 12 years ago
  13. 178baec Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev by Baligh Uddin · 12 years ago
  14. dfa983e am 86d2f720: (-s ours) am e0878e35: am 80a0d9a3: Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  15. 86d2f72 am e0878e35: am 80a0d9a3: Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  16. e0878e3 am 80a0d9a3: Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  17. 0e63525 am 9b78ee91: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  18. 9b78ee9 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  19. 71c915b Show subtype locales in the personal dictionary by Satoshi Kataoka · 12 years ago
  20. f5f0862 Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps by Dianne Hackborn · 12 years ago
  21. db1fd82 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  22. ac7a282 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  23. 80a0d9a Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  24. 9b70a21 Fix NullPointerException at RunningState by Johan Redestig · 12 years ago
  25. 1d6dde8 Merge "The Settings app needs privileged permissions" by Christopher Tate · 12 years ago
  26. b87fb43 am 94496184: (-s ours) am 7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev by Baligh Uddin · 12 years ago
  27. 9449618 am 7a42c809: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev by Baligh Uddin · 12 years ago
  28. 5ba48c1 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 12 years ago
  29. 7a42c80 Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev by Baligh Uddin · 12 years ago
  30. 992b4fc The Settings app needs privileged permissions by Christopher Tate · 12 years ago
  31. c0d2ffb am 44789f92: (-s ours) am f7c2889c: am 7f37c30b: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  32. 44789f9 am f7c2889c: am 7f37c30b: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  33. f7c2889 am 7f37c30b: (-s ours) Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  34. 25459a3 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  35. e8d4b1a Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  36. 7f37c30 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  37. d55de16 Merge "Following renaming of battery stats." by Dianne Hackborn · 12 years ago
  38. 8d42ac2 Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus" by Chong Zhang · 12 years ago
  39. 94417b4 wifi-display: use new getDisplays() method of WifiDisplayStatus by Chong Zhang · 12 years ago
  40. b05bc14 Following renaming of battery stats. by Dianne Hackborn · 12 years ago
  41. d4d98e3 Merge "Fix a bug where a user dict entry is too long" by Jean Chalard · 12 years ago
  42. 8385f1c Fix a bug where a user dict entry is too long by Jean Chalard · 12 years ago
  43. 8c2f42e Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 12 years ago
  44. 93420ee am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  45. bb3a943 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  46. 8720f86 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  47. ff8fbf0 am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  48. a5520e7 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 12 years ago
  49. af44249 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  50. bdd91ea am b45bac74: (-s ours) am 0117cc7c: Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  51. b45bac7 am 0117cc7c: Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  52. c3269ec Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  53. 0117cc7 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  54. 7b5aa58 Merge "Don't show tether settings in shortcut picker" by Amith Yamasani · 12 years ago
  55. 394eaa2 Don't show tether settings in shortcut picker by Amith Yamasani · 12 years ago
  56. 343bc61 Merge "Fix an NPE in WifiP2pSettings UI" by Vinit Deshapnde · 12 years ago
  57. 6cc92af Merge "Remove Battery settings if battery is not present" by Amith Yamasani · 12 years ago
  58. 022b68b Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 12 years ago
  59. 1a9819d Fix an NPE in WifiP2pSettings UI by Vinit Deshapnde · 12 years ago
  60. ee53d98 am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  61. 60a497d Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  62. 302bd5c Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 12 years ago
  63. fb4f468 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 12 years ago
  64. 310f94e Don't show ApnEditor as a dialog by Amith Yamasani · 12 years ago
  65. 8b5e2f4 Import translations. DO NOT MERGE by Baligh Uddin · 12 years ago
  66. e108d69 Allow hidden apps to opt-out by Amith Yamasani · 12 years ago
  67. 8059e00 resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 12 years ago
  68. 14e26fe Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 12 years ago
  69. bc63004 Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  70. 03a9fb6 am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev by Amith Yamasani · 12 years ago
  71. 29294d8 am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev by Amith Yamasani · 12 years ago
  72. f3e827e Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev by Amith Yamasani · 12 years ago
  73. 45d7fd8 am e84b20ba: (-s ours) am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev by Baligh Uddin · 12 years ago
  74. e84b20b am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev by Baligh Uddin · 12 years ago
  75. 0271744 Merge "wifi-display: change string to "In use" instead of "Busy"" by Chong Zhang · 12 years ago
  76. 2db8ca1 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev by Baligh Uddin · 12 years ago
  77. 47d8a5f am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev by Amith Yamasani · 12 years ago
  78. 893bdcd am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev by Amith Yamasani · 12 years ago
  79. 1b79c5c Merge "Allow hidden apps to opt-out" into jb-mr2-dev by Amith Yamasani · 12 years ago
  80. 5e1367f wifi-display: change string to "In use" instead of "Busy" by Chong Zhang · 12 years ago
  81. 34bd7e6 Don't show ApnEditor as a dialog by Amith Yamasani · 12 years ago
  82. fbc3983 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 12 years ago
  83. a3fe77b Remove Battery settings if battery is not present by Jaewan Kim · 12 years ago
  84. d390f6c Merge "wifi-display: grey out display if it's unavailable" by Chong Zhang · 12 years ago
  85. 48d6b27 am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 12 years ago
  86. 3c862fb am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 12 years ago
  87. 017d82a wifi-display: grey out display if it's unavailable by Chong Zhang · 12 years ago
  88. d28c849 am 4fb1f873: am 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  89. 681b21f resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 12 years ago
  90. 4fb1f87 am 56604046: am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  91. 5660404 am 5aa3f878: (-s ours) am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  92. 5d21820 am a65fa934: am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 12 years ago
  93. 5aa3f87 am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  94. a65fa93 am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 12 years ago
  95. 0c32da7 am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  96. 8bfb859 am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 12 years ago
  97. 6f28e34 am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  98. 8d5aeff am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 12 years ago
  99. 9f6a193 am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 12 years ago
  100. 089d161 am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 12 years ago