Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,446 Commits 1 Branch 0 Tags
163fbd25be7b07a3a0af2cea4b651a1448de67de
Commit Graph

8832 Commits

Author SHA1 Message Date
Jason Monk
163fbd25be am e707ea37: am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit 'e707ea3720188599385be2abaa9efbdf14f0560c':
  Remove battery history graph from details screen
 2015-06-18 16:12:00 +00:00
Junda Liu
9eeb63f501 am 5410a176: am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev 
* commit '5410a1769821c016f869493c638f18a8f2a79bf0':
  Don't show SIM lock Setting if carrier config hides it.
 2015-06-18 16:11:58 +00:00
Jason Monk
e707ea3720 am a0336eb4: am 1a129e0f: Merge "Remove battery history graph from details screen" into mnc-dev 
* commit 'a0336eb47f6256af21fb4b8e3597e04281839d1d':
  Remove battery history graph from details screen
 2015-06-18 15:49:19 +00:00
Junda Liu
5410a17698 am 3d9ccb0f: am 2c55f738: Merge "Don\'t show SIM lock Setting if carrier config hides it." into mnc-dev 
* commit '3d9ccb0ff45a981a784a8807410c8a8bc1842cf2':
  Don't show SIM lock Setting if carrier config hides it.
 2015-06-18 15:49:13 +00:00
Jason Monk
04ac693da7 Remove battery history graph from details screen 
Bug: 21854416
Change-Id: I3172106c8b1adbe19179adddcec2848d14d04588
 2015-06-18 11:07:31 -04:00
Junda Liu
2c55f738c4 Merge "Don't show SIM lock Setting if carrier config hides it." into mnc-dev 2015-06-17 22:51:00 +00:00
Junda Liu
80753bc275 Don't show SIM lock Setting if carrier config hides it. 
Bug: b/19623656
Change-Id: Ic7420fe3579815a8c2c884a78b13112affb00787
 2015-06-17 14:10:13 -07:00
Jason Monk
0095930e12 am 1c8a483c: am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev 
* commit '1c8a483cb662da6b6aa685558e0058bebdc13251':
  Support disabled until used apps
 2015-06-17 20:59:55 +00:00
Jason Monk
0036894557 am f5269f3b: am c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev 
* commit 'f5269f3bdedc9bb3087732e589a4f4c0ad18e63d':
  Fix accessibility for empty list on notification access
 2015-06-17 20:59:54 +00:00
Jason Monk
1c8a483cb6 am a82961f1: am f8577c68: Merge "Support disabled until used apps" into mnc-dev 
* commit 'a82961f108e18eaefb836f83fe1508c706a563b1':
  Support disabled until used apps
 2015-06-17 20:53:32 +00:00
Jason Monk
f5269f3bde am c3570166: am 2ab42701: Merge "Fix accessibility for empty list on notification access" into mnc-dev 
* commit 'c3570166c2484f76e73e76eecdf8cd2870d1a0ac':
  Fix accessibility for empty list on notification access
 2015-06-17 20:53:31 +00:00
Jason Monk
f8577c68af Merge "Support disabled until used apps" into mnc-dev 2015-06-17 20:31:27 +00:00
Jason Monk
2ab427010a Merge "Fix accessibility for empty list on notification access" into mnc-dev 2015-06-17 20:31:17 +00:00
Jason Monk
6baf98eb46 Fix accessibility for empty list on notification access 
Bug: 21797352
Change-Id: I6c68c9abb43c6dfcc8b0a4d07cfe0d4cede6e817
 2015-06-17 15:42:45 -04:00
Makoto Onuki
35d43fbe98 am 1cc4bd33: am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev 
* commit '1cc4bd33265302cfdca55553a5fa746a8265aea7':
  Don't crash on NameNotFoundException
 2015-06-17 18:23:21 +00:00
Makoto Onuki
1cc4bd3326 am a42d94d8: am 9f2b5a74: Merge "Don\'t crash on NameNotFoundException" into mnc-dev 
* commit 'a42d94d82e72c5ef0e99cb9f755673c82e3f8955':
  Don't crash on NameNotFoundException
 2015-06-17 18:15:09 +00:00
Makoto Onuki
9f2b5a7442 Merge "Don't crash on NameNotFoundException" into mnc-dev 2015-06-17 17:46:50 +00:00
Makoto Onuki
302b77f425 Don't crash on NameNotFoundException 
Just finish().

Bug 20672468

Change-Id: Ic600e060990b7e3bc3e98bda63d0f4c9e530fb94
 2015-06-17 10:22:28 -07:00
Jason Monk
bce8496aef am 840164a2: am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev 
* commit '840164a21ce2fa6638e4e2175bb1e36d4335f4a1':
  Guard against callbacks when no list view created
 2015-06-17 13:32:58 +00:00
Jason Monk
840164a21c am 2abd5be3: am 7a5cb3b9: Merge "Guard against callbacks when no list view created" into mnc-dev 
* commit '2abd5be388fe29e0a70a4e69f95d6dcc56004a58':
  Guard against callbacks when no list view created
 2015-06-17 13:23:09 +00:00
Jason Monk
7a5cb3b9c3 Merge "Guard against callbacks when no list view created" into mnc-dev 2015-06-17 13:01:28 +00:00
Jeff Sharkey
c162b354c2 am a39077c9: am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev 
* commit 'a39077c95bb51102e77e55a2d4e352f8027d5c24':
  Actually gracefully finish this time around.
 2015-06-17 03:54:31 +00:00
Jeff Sharkey
a39077c95b am 67832cc3: am 74c7f1fc: Merge "Actually gracefully finish this time around." into mnc-dev 
* commit '67832cc3984665cf55ac3d4afc5fdbb76326f1a0':
  Actually gracefully finish this time around.
 2015-06-17 03:45:06 +00:00
Jeff Sharkey
74c7f1fcd3 Merge "Actually gracefully finish this time around." into mnc-dev 2015-06-17 03:23:59 +00:00
Jeff Sharkey
665094c9d2 Actually gracefully finish this time around. 
Also fix tinting on front-door icon.

Bug: 21403958
Change-Id: I74f0372a41b92235abe10391f36d9f6a1e6a40c5
 2015-06-16 20:21:12 -07:00
Jim Miller
de1d7db439 am 8b5943c2: am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev 
* commit '8b5943c2fb4d069797df0c1a4b43f2d604eb6385':
  Fix issue with german translation of lock times
 2015-06-17 00:33:52 +00:00
Jim Miller
8b5943c2fb am dd0d9854: am 4b60af78: Merge "Fix issue with german translation of lock times" into mnc-dev 
* commit 'dd0d9854a5e4e946e8cb55a91148f17e4424836f':
  Fix issue with german translation of lock times
 2015-06-17 00:20:35 +00:00
Jeff Sharkey
f322f66362 am 122b4d73: am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev 
* commit '122b4d735f2f83ead436f4d6067ad1718c701004':
  Gracefully finish when missing volume.
 2015-06-17 00:20:02 +00:00
Jeff Sharkey
122b4d735f am 2ef947be: am 4e42cbdb: Merge "Gracefully finish when missing volume." into mnc-dev 
* commit '2ef947be79e6ecf5d5e8acfb054247a8902d7993':
  Gracefully finish when missing volume.
 2015-06-17 00:09:43 +00:00
Jim Miller
4b60af78fa Merge "Fix issue with german translation of lock times" into mnc-dev 2015-06-16 23:59:43 +00:00
Jeff Sharkey
4e42cbdba3 Merge "Gracefully finish when missing volume." into mnc-dev 2015-06-16 23:48:07 +00:00
Jeff Sharkey
e79ff145f3 Gracefully finish when missing volume. 
Bug: 21403958
Change-Id: Icb78bb633842571c4df696c9db72a5b97ece0655
 2015-06-16 16:46:03 -07:00
Brian Carlstrom
8453e36188 am 99c1009a: am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 
* commit '99c1009a897834e8282a59c0dda8f29dd33234e4':
  dex2oat should show something friendlier in Settings -> Battery
 2015-06-16 23:25:53 +00:00
Jim Miller
50d7d19a73 Fix issue with german translation of lock times 
The word "immediately" would go into a different place in the sentence
than a number so we have to break this into two strings.

Fixes bug 21602326

Change-Id: Ie07f1bc84d68bdea8d6f1264dfd18326c2e48df4
 2015-06-16 16:21:27 -07:00
Brian Carlstrom
99c1009a89 am 49d73c03: am 94f4cb4e: Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 
* commit '49d73c03aa5b8b21c5e8a926b6a894245ffdf906':
  dex2oat should show something friendlier in Settings -> Battery
 2015-06-16 23:18:33 +00:00
Jeff Sharkey
1a1a109936 am aa1e5f2f: am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev 
* commit 'aa1e5f2f001aa7cc39ce4b0c5974bfc47a8d96fa':
  Finish storage wizard theming.
 2015-06-16 23:00:45 +00:00
Makoto Onuki
bb2fdb5e92 am 3f507b2f: am abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev 
* commit '3f507b2fbdbb8d1daac4703d365a740dbc4623f4':
  Allow formatting when a partition is corrupt.
 2015-06-16 23:00:44 +00:00
Brian Carlstrom
94f4cb4e46 Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 2015-06-16 22:59:04 +00:00
Jeff Sharkey
aa1e5f2f00 am 5fafa130: am 95b891af: Merge "Finish storage wizard theming." into mnc-dev 
* commit '5fafa130ec8f031310e5372a89034057053fa634':
  Finish storage wizard theming.
 2015-06-16 22:49:20 +00:00
Makoto Onuki
3f507b2fbd am abf80cb1: am d91ddfeb: Merge "Allow formatting when a partition is corrupt." into mnc-dev 
* commit 'abf80cb1d058aa96abd29a329a6f79b6e62acad9':
  Allow formatting when a partition is corrupt.
 2015-06-16 22:49:19 +00:00
Jeff Sharkey
95b891af7c Merge "Finish storage wizard theming." into mnc-dev 2015-06-16 22:31:29 +00:00
Jeff Sharkey
8e987d9bfb Finish storage wizard theming. 
Storage wizard screens now have updated assets from UX, and various
assets are tinted consistently.  We're using our own navigation bar
and wholesale replacing the layout from upstream.

Fix text colors in night mode.  Tell SystemUI when we're finished
with the wizard flow.

Bug: 21830731
Change-Id: Ic8d09cc152bfb4dcc6089b5c61d28cbdd4be3ee9
 2015-06-16 15:28:49 -07:00
Makoto Onuki
d91ddfeb16 Merge "Allow formatting when a partition is corrupt." into mnc-dev 2015-06-16 22:27:09 +00:00
Jason Monk
01e5945aca am 23d6ab34: am fbebf8cf: am 254e8aea: Merge "Update for shortcuts" into mnc-dev 
* commit '23d6ab342affc30fb101d2481aeb6d497b857d49':
  Update for shortcuts
 2015-06-16 21:42:56 +00:00
Yorke Lee
cec33e9fec am c47e89a4: am 0d736b59: am 610413d3: Merge "Send broadcast when default dialer changes" into mnc-dev 
* commit 'c47e89a44c388fa7cb650592878730e3e814a4ed':
  Send broadcast when default dialer changes
 2015-06-16 21:42:54 +00:00
Jason Monk
d072a80de5 am 9afed461: am 20d32181: am d0eab40a: Merge "Don\'t show work apps in ignore optimizations list" into mnc-dev 
* commit '9afed461061b7e07e0285df68ab587a0455cfe8f':
  Don't show work apps in ignore optimizations list
 2015-06-16 21:42:52 +00:00
Jason Monk
00e9562589 am 18c5d20b: am 0af2586a: am 455cea62: Merge "Add warning for disabling usage access on prof owners" into mnc-dev 
* commit '18c5d20bd3acc0048b08aba6ab0d03f882118a53':
  Add warning for disabling usage access on prof owners
 2015-06-16 21:42:50 +00:00
Sanket Padawe
bb9e422c6c am 3c2f469b: am fc4e9cbd: am 7171d686: Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev 
* commit '3c2f469bf9d804bdb60bd0fea618cbc883db5ab6':
  Add PBAP checkbox for BT pairing consent dialog.
 2015-06-16 21:42:47 +00:00
Jason Monk
29a099193e am 464ad14d: am 808f7826: am 6e613472: Start all help intents as startActivityForResult 
* commit '464ad14d376358a8162854591f44071919c87a75':
  Start all help intents as startActivityForResult
 2015-06-16 21:42:44 +00:00
Jason Monk
5baa77ae5d am 27fe38eb: am 4c1f455c: am 744f2adb: Merge "Layout refinement for app lists" into mnc-dev 
* commit '27fe38eb2c3b10d28c570ae60221c7ae5c54dcbd':
  Layout refinement for app lists
 2015-06-16 21:42:43 +00:00