Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,417 Commits 1 Branch 0 Tags
2bbbafdd88bb545af2ade3fcdbd064dcc3d45ae7
Commit Graph

2925 Commits

Author SHA1 Message Date
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
4b60af78fa Merge "Fix issue with german translation of lock times" into mnc-dev 2015-06-16 23:59:43 +00: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
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
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
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
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
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
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
Jason Monk
254e8aea22 Merge "Update for shortcuts" into mnc-dev 2015-06-16 20:36:46 +00:00
Jason Monk
78b1715bcb Update for shortcuts 
Change-Id: If28d540fd9e300b9c26d5cb6869be3d475124e9e
 2015-06-16 16:31:01 -04:00
Sanket Padawe
7171d6864f Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev 2015-06-16 15:24:05 +00:00
Jason Monk
744f2adb56 Merge "Layout refinement for app lists" into mnc-dev 2015-06-16 13:17:02 +00:00
Jason Monk
2cdafc6be3 Layout refinement for app lists 
Make all app lists (or at least all current app lists) use the same
base layout for icon, label, and sizing/padding.  This way they
should look the same.

Bug: 21727125
Bug: 21726922
Bug: 21853632
Change-Id: I3cffadb9e7b5184d4209deacd4ea70ec1d4f71b4
 2015-06-16 09:15:39 -04:00
Jeff Sharkey
eb446accf3 am 96b09cf5: am 3538eb24: am 71c89a17: Merge "More storage UI updates." into mnc-dev 
* commit '96b09cf59f7554b05004fa7f8ad6da1c73e8f545':
  More storage UI updates.
 2015-06-16 05:16:43 +00:00
Jeff Sharkey
71c89a171a Merge "More storage UI updates." into mnc-dev 2015-06-16 04:47:19 +00:00
Jeff Sharkey
2597625fd9 More storage UI updates. 
Storage volumes now have headers with larger fonts and progress bars
to show used versus free space.  Updated Memory to use new formatting
template, and Data Usage to use consistent display logic.

Allocate a unique color for each private volume, and yell when a
volume is running low on space.  Update private volume details to
launch into MediaStore-backed storage backends in a management mode,
and only show detailed items when hosting emulated storage.  Show
details dialog about "Other" and user storage items.

Shortcut into single private volume when it's the only device.  Add
real eject icon.

Bug: 21756698, 20275574, 21326612
Change-Id: If3ecd1d912d3e709c09d3e4da24f368e04dd3f9d
 2015-06-15 21:44:21 -07:00
Jim Miller
3a5c865292 am 861a64e8: am 6364e0a2: am a4f8aae4: Merge "Limit number of fingerprint templates that can be enrolled per device user" into mnc-dev 
* commit '861a64e8bfb3b77709a50f2223c355f43bfb867a':
  Limit number of fingerprint templates that can be enrolled per device user
 2015-06-16 04:22:00 +00:00
Jim Miller
5adada6083 Limit number of fingerprint templates that can be enrolled per device user 
This change places an upper limit on the number of fingerprint templates that
can be enrolled per account.  This is done primarily for performance reasons, but
may also be imposed by hardware and Trusted Execution Environment (TEE) reasons.

Fixes bug 20731847

Change-Id: I3975290fa8eb2106467493aab6102015697e012c

 On branch max_fingerprint
 2015-06-15 20:44:45 -07:00
John Spurlock
7daab48484 am f2903eda: am 3fdfabcd: am dddd589d: Merge "Settings: Remove unreachable "Battery Info" screen." into mnc-dev 
* commit 'f2903edadcc785135fb07a26655bf80476da35ab':
  Settings: Remove unreachable "Battery Info" screen.
 2015-06-15 20:14:24 +00:00
John Spurlock
dae8c154f0 Settings: Remove unreachable "Battery Info" screen. 
Bug: 21576824
Change-Id: Ia2bb3b22b7512cd05ceca5798e85e5479e064213
 2015-06-15 15:24:16 -04:00
Brian Carlstrom
6588a82823 dex2oat should show something friendlier in Settings -> Battery 
Bug: 13161823
Change-Id: If68d91900c88f33f5656a9e336633d53a5e900ce
 2015-06-12 20:54:16 -07:00
Nick Kralevich
3cb9434ca1 am a864e46b: am 20a0da89: am 64a8032f: Merge "Fix bad USB configuration under Developer Options" into mnc-dev 
* commit 'a864e46b47ea20694ce9366295d997a1debffa02':
  Fix bad USB configuration under Developer Options
 2015-06-13 03:43:22 +00:00
Nick Kralevich
64a8032f44 Merge "Fix bad USB configuration under Developer Options" into mnc-dev 2015-06-13 03:12:08 +00:00
Sanket Padawe
2ef44c5e5d Add PBAP checkbox for BT pairing consent dialog. 
Bug: 20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
 2015-06-12 18:09:45 -07:00
Nick Kralevich
9cff8cdfe0 Fix bad USB configuration under Developer Options 
The USB configuration screen under Developer Options hasn't been
updated for the new USB access control changes. Update it.

1) Ensure that the default in Development Settings is "Charger Only".
2) Changing USB mode in developer settings only changes the USB function.
It doesn't unlock any USB data.

Bug: 21258972
Change-Id: I9cbd5099cb55f31f1258e512e5ee7f6f4e303fc9
 2015-06-12 16:30:45 -07:00
Selim Cinek
e0c9e0f4ce am 827c5419: am 0abc4fb6: am ee5db351: Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 
* commit '827c5419fa8e68bd0d7807e1799344e7760f1363':
  Added an introduction to the fingerprint enrollment
 2015-06-12 22:29:20 +00:00
Selim Cinek
ee5db351ac Merge "Added an introduction to the fingerprint enrollment" into mnc-dev 2015-06-12 21:57:45 +00:00
Selim Cinek
ec8500438c Added an introduction to the fingerprint enrollment 
Bug: 21468315
Change-Id: Ieb691b0e321f44b9bae2f4f8dfd458c24b98a8d9
 2015-06-11 19:02:26 -07:00
Jorim Jaggi
79b49eb347 am e750927c: am 258e709a: am fb535a8e: Merge "Refine fingerprint enrollment experience" into mnc-dev 
* commit 'e750927c70a45b163b612d21ecdb546d46324fed':
  Refine fingerprint enrollment experience
  Fix crash in battery screen
 2015-06-11 23:14:46 +00:00
Jorim Jaggi
fb535a8e49 Merge "Refine fingerprint enrollment experience" into mnc-dev 2015-06-11 22:34:53 +00:00
Sanket Padawe
d97e804892 am 229708a3: am 1bcef2d1: am e27e3bcf: Merge "String changes for Cellular data toggle summary." into mnc-dev 
* commit '229708a3949595d900ebdb201bf5daae104dd7f6':
  String changes for Cellular data toggle summary.
 2015-06-11 22:28:48 +00:00
Sanket Padawe
42c0a174fe am 4acd0048: am c0d30052: am 9d7971a9: Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev 
* commit '4acd0048e7a10340347be11aa62d77abb7e53145':
  String changes for PBAP chekcbox in BT pairing dialog.
 2015-06-11 22:28:46 +00:00
Jorim Jaggi
436e02c3d5 Refine fingerprint enrollment experience 
- Flash fingerprint graphic when enrollment progresses
- Show hint message when not progressing for a few seconds
- Make sure animation is always working

Bug: 21617091
Bug: 21644138
Change-Id: Ic54c10a655e6da914f960cee20f0066b46d87325
 2015-06-11 15:13:56 -07:00
Jason Monk
bdef599b1d am 1c4dcb03: am 02424dea: am 0011604f: Merge "Clean up settings shortcuts" into mnc-dev 
* commit '1c4dcb0315f8a6b5031327af668a6284304d6e88':
  Clean up settings shortcuts
 2015-06-11 21:34:04 +00:00
Sanket Padawe
e27e3bcf9e Merge "String changes for Cellular data toggle summary." into mnc-dev 2015-06-11 21:31:35 +00:00
Sanket Padawe
9d7971a9e2 Merge "String changes for PBAP chekcbox in BT pairing dialog." into mnc-dev 2015-06-11 21:29:31 +00:00
Sanket Padawe
0d9e167b07 String changes for PBAP chekcbox in BT pairing dialog. 
Bug: 20488109
Change-Id: I922477c94cbf9c4042d8a895eb10a41da2783f14
 2015-06-11 13:37:55 -07:00
Sanket Padawe
77e9570b2b String changes for Cellular data toggle summary. 
Bug: 17073752
Change-Id: I61974ab3b2b2136aa5eb5027fc826d635a705ed1
 2015-06-11 13:31:39 -07:00
Jason Monk
0011604fd1 Merge "Clean up settings shortcuts" into mnc-dev 2015-06-11 19:56:50 +00:00
Jason Monk
2acff556c2 Clean up settings shortcuts 
- Remove some bad entries
 - Fix icons to be top-level item specific
 - Add memory

Bug: 20632230
Change-Id: I067b467b9ee354b52ef61b312dc5a89fd7eae2ac
 2015-06-11 15:47:29 -04:00
Jeff Sharkey
42ef2461b9 am b06835d1: am fae37744: am 0f6b243d: Merge "Slow dialog string has no limit." into mnc-dev 
* commit 'b06835d19eb5d2e416cf85604746388a754c42e9':
  Slow dialog string has no limit.
 2015-06-11 17:09:30 +00:00
Lorenzo Colitti
fbc3f62e7e am 25566a38: am aab0a778: am 1fdbbffc: Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 
* commit '25566a38ce9c6f2fb32745c9ece82528b5c30478':
  Add a string for switching to cell when Wi-Fi loses backhaul.
 2015-06-11 17:07:47 +00:00
Jeff Sharkey
0f6b243d4b Merge "Slow dialog string has no limit." into mnc-dev 2015-06-11 16:20:23 +00:00
Jeff Sharkey
9b0d09914b Slow dialog string has no limit. 
Bug: 21342398
Change-Id: Id8318e3341223e084b5af4719af504f5247a5195
 2015-06-11 09:18:00 -07:00
Selim Cinek
38b48086bc am a9f19dea: am 01dc50f5: am ff702a29: Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 
* commit 'a9f19dea4472a76d7c6ec280ff1a0da6a7e64c0e':
  Added setting strings for new fingerprint introduction screen
 2015-06-11 05:56:19 +00:00
Jeff Sharkey
59adbd9027 am 72723306: am d10261eb: am 3803d91a: New strings! 
* commit '72723306a18b4148240e98bff8cb0f78004d76e7':
  New strings!
 2015-06-11 05:56:16 +00:00
Lajos Molnar
8f45270634 am 204f4068: am f7192038: am 63504d83: Merge "developer settings: remove "Use deprecated AwesomePlayer" settings" into mnc-dev 
* commit '204f4068f78af61f3de289e0efa458dde6a0d6b7':
  developer settings: remove "Use deprecated AwesomePlayer" settings
 2015-06-11 05:56:14 +00:00
Jorim Jaggi
7cc5b911fc am 6dd8e039: am a66b907b: am ed76e59e: Merge "Animations/success state for external confirm device credentials (2/2)" into mnc-dev 
* commit '6dd8e039da5a207052173e13a199153e8fb6dea9':
  Animations/success state for external confirm device credentials (2/2)
 2015-06-11 05:56:12 +00:00