Commit Graph

3452 Commits

Author SHA1 Message Date
Sanket Padawe
52dce9d334 Merge "Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support." into mnc-dev 2015-06-28 02:45:48 +00:00
Sanket Padawe
94c0b0d436 Hide EAP SIM, AKA & AKA' choices in wifi Settings if device doesn't support.
Bug: 22014309
Change-Id: I606649cb4d2e13330afa89075ad074e7dc525f87
2015-06-26 15:57:43 -07:00
Selim Cinek
185c777b9d am fa368b88: am cf1e2a12: am f2f29ff5: Merge "Increased the error message font size" into mnc-dev
* commit 'fa368b8892bac1d92436c08f4067abbc76c33537':
  Increased the error message font size
2015-06-25 23:04:09 +00:00
Selim Cinek
f2f29ff557 Merge "Increased the error message font size" into mnc-dev 2015-06-25 22:25:31 +00:00
Selim Cinek
f0eebe7e9d Increased the error message font size
Bug: 21568693
Change-Id: I059b962950335f5780783953505ec1e1f0e5b591
2015-06-25 18:12:21 -04:00
Jason Monk
1342ec8505 am 4c1b0b7d: am bdb83ba4: am fb6e1186: Fix accessibility for account sync
* commit '4c1b0b7d25b32028b5401efb39a29dac1f550867':
  Fix accessibility for account sync
2015-06-25 20:16:28 +00:00
Jason Monk
fb6e1186ab Fix accessibility for account sync
Needed to get views recycling so that feedback could occur during
switch turning off.

Bug: 20020216
Change-Id: Ib7b1cdca78f5ac5064cdf521122ff7a5ee49f572
2015-06-25 15:06:00 -04:00
Akshay Kannan
84e14f296f am bc99d35e: am 2f7fea73: am 5006bf1d: Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev
* commit 'bc99d35e38b83c7f7a19fd2bf591c15618d6161a':
  Language Update for Wi-Fi/Bluetooth Scanning
2015-06-24 16:34:06 +00:00
Akshay Kannan
5006bf1de7 Merge "Language Update for Wi-Fi/Bluetooth Scanning" into mnc-dev 2015-06-24 15:55:32 +00:00
Lifu Tang
55601622d5 Language Update for Wi-Fi/Bluetooth Scanning
Bug: 22046234
Change-Id: Iea8fa2368d1e568a8e1fdd3edefa8f4fc6053e48
2015-06-23 18:54:27 -07:00
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
Alan Viverette
3a1e634a59 am be0c398c: am 270353f6: am 8a4e44ba: Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
* commit 'be0c398cdac1a4441e15e4cbc806dc23286de85d':
  Ensure "default" and "none" caption colors are consistent w/ framework
2015-06-22 21:57:00 +00:00
Alan Viverette
751625e9a2 Ensure "default" and "none" caption colors are consistent w/ framework
Also enables scroll indicators in color grid dialog.

Bug: 21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
2015-06-22 13:05:45 -07: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
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