Gitiles
Code Review Sign In
gerrit-public.fairphone.software / platform / packages / apps / Settings / 89b8babe6a7af2afbfebed80f57c1d7f39886f3d
  1. 89b8bab resolve merge conflicts of b34cf86 to nyc-dev-plus-aosp by Robert Greenwalt · 8 years ago
  2. b34cf86 Merge \"Fix the memory leak in TetherSettings\" am: 03393c4109 by 宋凯伦 · 8 years ago
  3. 03393c4 Merge "Fix the memory leak in TetherSettings" by Robert Greenwalt · 8 years ago
  4. 8532049 Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev by Michal Karpinski · 8 years ago
  5. 86c9894 Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev by TreeHugger Robot · 8 years ago
  6. c7f0f23 Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev by Robin Lee · 8 years ago
  7. cab4f9d Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev by Robin Lee · 8 years ago
  8. 5666e55 Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog by Michal Karpinski · 8 years ago
  9. 49be1c1 Respect DISALLOW_CONFIG_VPN for disconnect dialog by Robin Lee · 8 years ago
  10. 341b21d Merge \"Fix rendering of policy transparency activity.\" into nyc-dev by Nicolas Prevot · 8 years ago
  11. 98704bc Merge "Fix rendering of policy transparency activity." into nyc-dev by Nicolas Prévot · 8 years ago
  12. f8c135a resolve merge conflicts of 9e28f9a to nyc-dev-plus-aosp by Ruchi Kandoi · 8 years ago
  13. 099609a Import translations. DO NOT MERGE am: c66bffa31f -s ours by Bill Yi · 8 years ago
  14. 9e28f9a Merge \"Settings: add logpersist selection (actions)\" am: 3c398ea710 by Mark Salyzyn · 8 years ago
  15. 3c398ea Merge "Settings: add logpersist selection (actions)" by Treehugger Robot · 8 years ago
  16. 03af228 Settings: add logpersist selection (actions) by Mark Salyzyn · 8 years ago
  17. c66bffa Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  18. 3078e76 Merge \"Fix crash in finish from onCreate.\" into nyc-dev am: 1a1f6b0b1b by Jason Monk · 8 years ago
  19. 1a1f6b0 Merge "Fix crash in finish from onCreate." into nyc-dev by TreeHugger Robot · 8 years ago
  20. 656bc60 Fix crash in finish from onCreate. by Jason Monk · 8 years ago
  21. 7435861 Merge \"Fix sentence capitalization of locale names.\" into nyc-dev by Yohei Yukawa · 8 years ago
  22. 294b158 Merge "Fix sentence capitalization of locale names." into nyc-dev by Yohei Yukawa · 8 years ago
  23. 241f8e6 Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev by Roozbeh Pournader · 8 years ago
  24. 5eddc4b Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev by Roozbeh Pournader · 8 years ago
  25. 0984141 Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev by Svet Ganov · 8 years ago
  26. 3e53184 Merge "Don't send user to permissions screen if none requested" into nyc-dev by Svetoslav Ganov · 8 years ago
  27. 91c23ca Fix sentence capitalization of locale names. by Yohei Yukawa · 8 years ago
  28. 3697dbe Use existing localizations for formatting data usage [DO NOT MERGE] by Roozbeh Pournader · 8 years ago
  29. 1f9e0cc Merge \\"Settings: add logpersist selection (strings)\\" am: 99afd4a87d by Mark Salyzyn · 8 years ago
  30. 637d24c Fix rendering of policy transparency activity. by Nicolas Prevot · 8 years ago
  31. 540ebc3 Merge \"Settings: add logpersist selection (strings)\" am: 99afd4a87d by Mark Salyzyn · 8 years ago
  32. 99afd4a Merge "Settings: add logpersist selection (strings)" by Mark Salyzyn · 8 years ago
  33. 954ed57 Settings: add logpersist selection (strings) by Mark Salyzyn · 8 years ago
  34. 30ee6ab Don't send user to permissions screen if none requested by Svet Ganov · 8 years ago
  35. 9190e13 Import translations. DO NOT MERGE am: b43b49c643 -s ours by Bill Yi · 8 years ago
  36. b43b49c Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  37. feee247 Fix build by Jason Monk · 8 years ago
  38. 167f6cc Merge \"Remove PreferenceActivity\" into nyc-dev am: 7f7092c705 by Jason Monk · 8 years ago
  39. 2c7e1d8 Merge \"Fix data usage format strings\" into nyc-dev am: cb1972b908 by Jason Monk · 8 years ago
  40. 4db5484 Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev by Jason Monk · 8 years ago
  41. 7f7092c Merge "Remove PreferenceActivity" into nyc-dev by Jason Monk · 8 years ago
  42. cb1972b Merge "Fix data usage format strings" into nyc-dev by Jason Monk · 8 years ago
  43. 9c5d316 Merge "Fix disabling of tiles that are not relevant" into nyc-dev by Jason Monk · 8 years ago
  44. 263b210 Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev by Ricky Wai · 8 years ago
  45. 68c263c Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev by Ricky Wai · 8 years ago
  46. b7e4380 Remove PreferenceActivity by Jason Monk · 8 years ago
  47. edb4c9c Merge \"Import translations. DO NOT MERGE\" into nyc-dev am: 09cedc44b4 -s ours by Baligh Uddin · 8 years ago
  48. 7250016 Make work challenge settings work even work profile is not enabled yet by Ricky Wai · 8 years ago
  49. 09cedc4 Merge "Import translations. DO NOT MERGE" into nyc-dev by Baligh Uddin · 8 years ago
  50. 013581c Import translations. DO NOT MERGE by Baligh Uddin · 8 years ago
  51. 6233c1d Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev by Jim Miller · 8 years ago
  52. f8c6408 Merge "Move legacy full disk encryption code to Settings." into nyc-dev by TreeHugger Robot · 8 years ago
  53. 358ff29 Move legacy full disk encryption code to Settings. by Jim Miller · 8 years ago
  54. 5862c1e Fix disabling of tiles that are not relevant by Jason Monk · 8 years ago
  55. f12e2ee Merge "Import translations. DO NOT MERGE" into nyc-dev am: 48229d7781 -s ours by Bill Yi · 8 years ago
  56. 48229d77 Merge "Import translations. DO NOT MERGE" into nyc-dev by TreeHugger Robot · 8 years ago
  57. d4bd56b Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  58. cff703e Merge "Restrict Settings always-on to NYC+" into nyc-dev am: 8f2c17e12c by Robin Lee · 8 years ago
  59. 8f2c17e Merge "Restrict Settings always-on to NYC+" into nyc-dev by Robin Lee · 8 years ago
  60. aa5a8a6 Fix data usage format strings by Jason Monk · 8 years ago
  61. cfc0fb0 Restrict Settings always-on to NYC+ by Robin Lee · 8 years ago
  62. e2b9a2b Merge "Import translations. DO NOT MERGE" into nyc-dev am: edafefc1ed -s ours by Bill Yi · 8 years ago
  63. 2cd2074 Merge "Fix accidental non-translatable string" into nyc-dev am: 8c5dccc6bf by Jason Monk · 8 years ago
  64. edafefc Merge "Import translations. DO NOT MERGE" into nyc-dev by TreeHugger Robot · 8 years ago
  65. 8c5dccc Merge "Fix accidental non-translatable string" into nyc-dev by Jason Monk · 8 years ago
  66. 18b603f Fix accidental non-translatable string by Jason Monk · 8 years ago
  67. 083ba3c Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92 by Sanket Agarwal · 8 years ago
  68. e1fa67c Merge "Handle return value when Bluetooth is enabled" am: cc889f6b92 by Sanket Agarwal · 8 years ago
  69. cc889f6 Merge "Handle return value when Bluetooth is enabled" by Treehugger Robot · 8 years ago
  70. 7469d79 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev by Sudheer Shanka · 8 years ago
  71. 73642fd Import translations. DO NOT MERGE by Bill Yi · 8 years ago
  72. a433fd2 Merge "Avoid triggering device admin settings in non-current user." into nyc-dev by TreeHugger Robot · 8 years ago
  73. a8a8167 Fix RTL layout am: 3a87050921 by Makoto Onuki · 8 years ago
  74. 3d06893 Handle return value when Bluetooth is enabled by Sanket Agarwal · 8 years ago
  75. 3a87050 Fix RTL layout by Makoto Onuki · 8 years ago
  76. 06a9c98 Merge "Make prefs without an action unselectable" into nyc-dev am: 9121169dca by Fyodor Kupolov · 8 years ago
  77. 9121169 Merge "Make prefs without an action unselectable" into nyc-dev by Fyodor Kupolov · 8 years ago
  78. 8b72e56 Avoid triggering device admin settings in non-current user. by Sudheer Shanka · 8 years ago
  79. 77865ec Make prefs without an action unselectable by Fyodor Kupolov · 8 years ago
  80. 704476a Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev by Wei Wang · 8 years ago
  81. d0d3ca3 Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev by Wei Wang · 8 years ago
  82. a0b2814 Revert "Add an entry in developer options for location tools." by Wei Wang · 8 years ago
  83. 2cf7ecc Merge "onResume -> onStart, onPause -> onStop" into nyc-dev am: 67e87fa4e9 by Jason Monk · 8 years ago
  84. 67e87fa Merge "onResume -> onStart, onPause -> onStop" into nyc-dev by Jason Monk · 8 years ago
  85. 6161794 Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev by Sudheer Shanka · 8 years ago
  86. df66d4a Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev by TreeHugger Robot · 8 years ago
  87. 350a930 onResume -> onStart, onPause -> onStop by Jason Monk · 8 years ago
  88. 4f63855b Merge "Fix some top-level settings not updating with language" into nyc-dev by Jason Monk · 8 years ago
  89. 4436467 Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev by Jason Monk · 8 years ago
  90. dc8738f Merge "Fix apps spinner jank." into nyc-dev am: ad302548ea by Jason Monk · 8 years ago
  91. ed70356 Merge "Fix some top-level settings not updating with language" into nyc-dev by Jason Monk · 8 years ago
  92. 9791704 Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev by Jason Monk · 8 years ago
  93. cd66b4a Cache account prefs so we don't lose a11y focus by Jason Monk · 8 years ago
  94. ad30254 Merge "Fix apps spinner jank." into nyc-dev by Jason Monk · 8 years ago
  95. 8a5d4bf Fix apps spinner jank. by Jason Monk · 8 years ago
  96. 65cabcd Start DeviceAdminSettings in a new task from support dialog. by Sudheer Shanka · 8 years ago
  97. 11c16c1 Merge "Import translations. DO NOT MERGE" into nyc-dev am: fb9e8e3188 -s ours by Bill Yi · 8 years ago
  98. fb9e8e3 Merge "Import translations. DO NOT MERGE" into nyc-dev by TreeHugger Robot · 8 years ago
  99. 8a8f3f2 Disable restricted VPN actions onResume am: 52541536d0 by Robin Lee · 8 years ago
  100. 824b1f0 Import translations. DO NOT MERGE by Bill Yi · 8 years ago