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

2387 Commits

Author SHA1 Message Date
Selim Cinek
f3834ed1b5 am c9d3f895: am ae3693d4: am 1726b2c9: Merge "Added contentDescription for fingerprint on the confirmCredential screen" into mnc-dev 
* commit 'c9d3f895295c578652f13b331bec1fe02394224b':
  Added contentDescription for fingerprint on the confirmCredential screen
 2015-06-23 23:17:37 +00:00
Selim Cinek
cf8347b33f Added contentDescription for fingerprint on the confirmCredential screen 
Bug: 21850269
Change-Id: Ia3720451a74e69e119b60121d7906274c522f70a
 2015-06-23 17:48:48 -04:00
Jason Monk
e09535541d am 591aa6ae: am d8c811d8: am b4b590d1: Merge "Update disable dialog" into mnc-dev 
* commit '591aa6ae9ed7bd254df849fd154ce2de70eb60c1':
  Update disable dialog
 2015-06-22 16:07:16 +00:00
Jason Monk
b4b590d13f Merge "Update disable dialog" into mnc-dev 2015-06-22 14:55:14 +00:00
Jason Monk
0591282f2a am 9c4c45b3: am 6a7c7562: am d63e6969: Merge "Add content description to owner info status text" into mnc-dev 
* commit '9c4c45b34013514b4f8a734b3f8d146dc613e46b':
  Add content description to owner info status text
 2015-06-19 16:26:37 +00:00
Jason Monk
2e78f53af1 Add content description to owner info status text 
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
 2015-06-19 11:17:03 -04:00
Brian Carlstrom
be12161f9e am 34e39e7c: am 9dca3951: am 2567514a: Merge "Clarify process_dex2oat_label description" into mnc-dev 
* commit '34e39e7cff699c9fb38c3d92276099ef99e97de8':
  Clarify process_dex2oat_label description
 2015-06-19 14:18:37 +00:00
Sanket Padawe
aac6357744 am 4ad7f625: am aa10a9ec: am 5ba90c14: Increase char limit of the data usage Settings string to 33. 
* commit '4ad7f6254d195bd53369aa7fc5154f70d6fb42c3':
  Increase char limit of the data usage Settings string to 33.
 2015-06-19 14:18:35 +00:00
Brian Carlstrom
2567514abc Merge "Clarify process_dex2oat_label description" into mnc-dev 2015-06-19 04:23:08 +00:00
Sanket Padawe
5ba90c148d Increase char limit of the data usage Settings string to 33. 
Bug: 21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
 2015-06-18 18:39:25 -07:00
Brian Carlstrom
972ed7750f Clarify process_dex2oat_label description 
Bug: 21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
 2015-06-18 10:11:18 -07:00
Jason Monk
1b23ef2e59 am beab783c: am 6afa2a51: am ed672cfc: Merge "Revert "Accounts -> Account sync"" into mnc-dev 
* commit 'beab783cfddd8b31e3406cfbaa9b180d553f4a33':
  Revert "Accounts -> Account sync"
 2015-06-18 16:32:55 +00:00
Jason Monk
ed672cfc8c Merge "Revert "Accounts -> Account sync"" into mnc-dev 2015-06-18 15:54:56 +00:00
Jason Monk
06fc34e25a Revert "Accounts -> Account sync" 
This reverts commit 43db745ea0.

Bug: 21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
 2015-06-18 15:44:46 +00:00
Jason Monk
53a5d7ff2c Update disable dialog 
Bug: 20826933
Change-Id: Ib84d3ba50ead2b71f62a3b163a5f5ba32a576c00
 2015-06-18 10:46:55 -04: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
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
Brian Carlstrom
94f4cb4e46 Merge "dex2oat should show something friendlier in Settings -> Battery" into mnc-dev 2015-06-16 22:59:04 +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
Sanket Padawe
7171d6864f Merge "Add PBAP checkbox for BT pairing consent dialog." into mnc-dev 2015-06-16 15:24:05 +00: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
Sanket Padawe
2ef44c5e5d Add PBAP checkbox for BT pairing consent dialog. 
Bug: 20488109
Change-Id: Ib6c98c27e6d2b8e59fa4b640df15214a6b197853
 2015-06-12 18:09:45 -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
Sanket Padawe
e27e3bcf9e Merge "String changes for Cellular data toggle summary." into mnc-dev 2015-06-11 21:31:35 +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
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
Lorenzo Colitti
1fdbbffced Merge "Add a string for switching to cell when Wi-Fi loses backhaul." into mnc-dev 2015-06-11 03:06:48 +00:00
Jason Monk
19291d5a89 am efb955f3: am ef77eb2e: am f8d131e1: Add string for profile owner usage access warning 
* commit 'efb955f3f5689062da6e326c6277e1a3758d5436':
  Add string for profile owner usage access warning
 2015-06-11 01:34:06 +00:00
Selim Cinek
ff702a29ab Merge "Added setting strings for new fingerprint introduction screen" into mnc-dev 2015-06-11 01:10:50 +00:00
Selim Cinek
1a2c1ca4e9 Added setting strings for new fingerprint introduction screen 
Bug: 21468315
Change-Id: I206d5eef7194b75e242e4b33d4d0be17ce03572d
 2015-06-10 18:08:16 -07:00