Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / apps / Settings / 25459a3872c164d1f3e3324c02e563a2fc2814aa
  1. 25459a3 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  2. d55de16 Merge "Following renaming of battery stats." by Dianne Hackborn · 11 years ago
  3. 8d42ac2 Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus" by Chong Zhang · 11 years ago
  4. 94417b4 wifi-display: use new getDisplays() method of WifiDisplayStatus by Chong Zhang · 11 years ago
  5. b05bc14 Following renaming of battery stats. by Dianne Hackborn · 11 years ago
  6. d4d98e3 Merge "Fix a bug where a user dict entry is too long" by Jean Chalard · 11 years ago
  7. 8385f1c Fix a bug where a user dict entry is too long by Jean Chalard · 11 years ago
  8. 8c2f42e Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  9. 93420ee am bb3a943d: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  10. bb3a943 Reconcile with jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  11. 8720f86 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  12. ff8fbf0 am a5520e76: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  13. a5520e7 Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  14. af44249 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  15. bdd91ea am b45bac74: (-s ours) am 0117cc7c: Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  16. b45bac7 am 0117cc7c: Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  17. c3269ec Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  18. 0117cc7 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  19. 7b5aa58 Merge "Don't show tether settings in shortcut picker" by Amith Yamasani · 11 years ago
  20. 394eaa2 Don't show tether settings in shortcut picker by Amith Yamasani · 11 years ago
  21. 343bc61 Merge "Fix an NPE in WifiP2pSettings UI" by Vinit Deshapnde · 11 years ago
  22. 6cc92af Merge "Remove Battery settings if battery is not present" by Amith Yamasani · 11 years ago
  23. 022b68b Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  24. 1a9819d Fix an NPE in WifiP2pSettings UI by Vinit Deshapnde · 11 years ago
  25. ee53d98 am 302bd5c7: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  26. 60a497d Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  27. 302bd5c Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  28. fb4f468 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  29. 310f94e Don't show ApnEditor as a dialog by Amith Yamasani · 11 years ago
  30. 8b5e2f4 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  31. e108d69 Allow hidden apps to opt-out by Amith Yamasani · 11 years ago
  32. 8059e00 resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 11 years ago
  33. 14e26fe Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  34. bc63004 Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  35. 03a9fb6 am 29294d84: am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev by Amith Yamasani · 11 years ago
  36. 29294d8 am f3e827e8: Merge "Don\'t show ApnEditor as a dialog" into jb-mr2-dev by Amith Yamasani · 11 years ago
  37. f3e827e Merge "Don't show ApnEditor as a dialog" into jb-mr2-dev by Amith Yamasani · 11 years ago
  38. 45d7fd8 am e84b20ba: (-s ours) am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev by Baligh Uddin · 11 years ago
  39. e84b20b am 2db8ca13: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev by Baligh Uddin · 11 years ago
  40. 0271744 Merge "wifi-display: change string to "In use" instead of "Busy"" by Chong Zhang · 11 years ago
  41. 2db8ca1 Merge "Import translations. DO NOT MERGE" into jb-mr2-dev by Baligh Uddin · 11 years ago
  42. 47d8a5f am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev by Amith Yamasani · 11 years ago
  43. 893bdcd am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev by Amith Yamasani · 11 years ago
  44. 1b79c5c Merge "Allow hidden apps to opt-out" into jb-mr2-dev by Amith Yamasani · 11 years ago
  45. 5e1367f wifi-display: change string to "In use" instead of "Busy" by Chong Zhang · 11 years ago
  46. 34bd7e6 Don't show ApnEditor as a dialog by Amith Yamasani · 11 years ago
  47. fbc3983 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  48. a3fe77b Remove Battery settings if battery is not present by Jaewan Kim · 11 years ago
  49. d390f6c Merge "wifi-display: grey out display if it's unavailable" by Chong Zhang · 11 years ago
  50. 48d6b27 am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 11 years ago
  51. 3c862fb am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 11 years ago
  52. 017d82a wifi-display: grey out display if it's unavailable by Chong Zhang · 11 years ago
  53. 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 · 11 years ago
  54. 681b21f resolved conflicts for merge of 5d21820a to jb-mr2-dev by Alex Klyubin · 11 years ago
  55. 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 · 11 years ago
  56. 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 · 11 years ago
  57. 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 · 11 years ago
  58. 5aa3f87 am 0c32da7e: am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  59. a65fa93 am 8bfb859e: am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 11 years ago
  60. 0c32da7 am 6f28e342: am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  61. 8bfb859 am 8d5aeffa: am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 11 years ago
  62. 6f28e34 am 9f6a1933: am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  63. 8d5aeff am 089d1615: am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 11 years ago
  64. 9f6a193 am 0ffbbad5: am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  65. 089d161 am 01dbfbf9: am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 11 years ago
  66. 0ffbbad am 60544e74: am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  67. 01dbfbf am efd88e2c: Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 11 years ago
  68. 60544e7 am 3dddd8cb: Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  69. efd88e2 Merge "Permit deactivation of malformed Device Admins." into jb-dev by Alex Klyubin · 11 years ago
  70. 29de9d5 Permit deactivation of malformed Device Admins. by Alex Klyubin · 11 years ago
  71. 48b8b8f Allow hidden apps to opt-out by Amith Yamasani · 11 years ago
  72. 133581e Follow network stats changes. by Jeff Sharkey · 11 years ago
  73. 3dddd8c Ensure all active Device Admins are listed. by Alex Klyubin · 11 years ago
  74. d517d74 am f750cdea: am adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  75. f750cde am adc3a282: am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  76. adc3a28 am 9cd1d5e2: (-s ours) am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  77. 9cd1d5e am a9a28d2f: am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  78. a9a28d2 am f96a86c9: am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  79. f96a86c am 6d80d477: am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  80. 6d80d47 am 0bccd7e7: am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  81. 0bccd7e am 5f28c77b: am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  82. 5f28c77 am d6086125: Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  83. 13958b3 am f71f25db: am d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev by Amith Yamasani · 11 years ago
  84. f71f25d am d63bd61e: Merge "Fix NullPointerException at RunningState" into jb-mr2-dev by Amith Yamasani · 11 years ago
  85. d63bd61 Merge "Fix NullPointerException at RunningState" into jb-mr2-dev by Amith Yamasani · 11 years ago
  86. ac96894 am 8548ddf2: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  87. 8548ddf Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge by The Android Open Source Project · 11 years ago
  88. 6fd5800 Fix NullPointerException at RunningState by Johan Redestig · 12 years ago
  89. eab49ca Always allow formatting of physical storage. by Jeff Sharkey · 11 years ago
  90. d608612 Fix issue #9074296: Device Admins can activate in a way... by Dianne Hackborn · 11 years ago
  91. 27d6f8d Add EventLog to report lock screen type by rich cannings · 11 years ago
  92. c5d3b36 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  93. f616ef4 Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  94. 8db2adb merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev by The Android Automerger · 11 years ago
  95. 9c14c8d Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  96. 747f726 am ac617824: (-s ours) am 804b8b60: Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  97. ac61782 am 804b8b60: Import translations. DO NOT MERGE by Baligh Uddin · 11 years ago
  98. e152e60 Merge "Import translations. DO NOT MERGE" by Baligh Uddin · 11 years ago
  99. 2a13174 am b30d81d1: (-s ours) Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago
  100. b30d81d Reconcile with jb-mr2-release - do not merge by The Android Open Source Project · 11 years ago