Commit Graph

11338 Commits

Author SHA1 Message Date
shwetachahar
c37ce205d2 Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev
am: 1ec5f09

* commit '1ec5f0965a169ca9b0f005a6107d97dbd6f5841c':
  Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine.

Change-Id: I8632218c26140d16bcc23dc46bab47ef2bd28f43
2016-04-13 11:20:01 +00:00
Shweta Chahar
1ec5f0965a Merge "Modify the pitch seekbar range to 25 to 400 in accordance with the pitch range accepted by the Google Text-to-Speech engine." into nyc-dev 2016-04-13 11:09:14 +00:00
Victor Chang
676250e35b Merge ""CA cert installed" notification should take PO into account" into nyc-dev
am: 60c7635

* commit '60c76357a0477062e96a4061425523f71b00ec00':
  "CA cert installed" notification should take PO into account

Change-Id: I1fb21e592c57990935505ec470ecd34ada17cb33
2016-04-13 10:25:03 +00:00
Victor Chang
d4ff940bc2 Merge changes from topic \'TrustCert\' into nyc-dev
am: c7ad054

* commit 'c7ad054bfa390c3dcc91b7abb13580c4a40e6999':
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs

Change-Id: Idcb598bf78837c3589aa1a0f11a67d9e60f174ec
2016-04-13 10:18:39 +00:00
Victor Chang
60c76357a0 Merge ""CA cert installed" notification should take PO into account" into nyc-dev 2016-04-13 10:15:28 +00:00
Victor Chang
17ead044e1 "CA cert installed" notification should take PO into account
- PO shows same dialog as DO, as shown in UI mock
- Keep consumer message the same
- Add cancel button
- string change
- remove TYPE_SYSTEM_ALERT due to the bug that the dialog is shown in primary user and bypass work challenge
  (Step: unlock work user -> launch dialog -> lock work user -> unlock personal user -> the dialog is still shown)
- Remove dismissKeyguard, because I believe the dialog should still be protected by the keyguard

Bug: 25772443
Bug: 18224038
Change-Id: I4f2580d1f6d2f88cfeadebcf6e8b0406e5c4b413
2016-04-13 11:13:58 +01:00
Victor Chang
c7ad054bfa Merge changes from topic 'TrustCert' into nyc-dev
* changes:
  Show trust option for multiple unapproved cert in chain
  CertDialog supports multiple certs
2016-04-13 10:12:13 +00:00
Ricky Wai
a71beeb7fd Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev
am: 4a314fc

* commit '4a314fc3caa3db8220f2192dd9f3f54144aaa0b0':
  Show "work mode off" dialog when work security option is clicked

Change-Id: I1418b2112f91cc6f02a00e7091520aab3006b067
2016-04-13 10:08:37 +00:00
Ricky Wai
0710a4c96d Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev
am: 4f19945

* commit '4f1994598ba27907614d381d2792508367a05131':
  Unified work lock checkbox should roll back when user cancels confirm dialog

Change-Id: Ie83daa2b232ddd6a7f733ddb8b9f0f733d62bccb
2016-04-13 10:08:37 +00:00
Ricky Wai
4a314fc3ca Merge "Show "work mode off" dialog when work security option is clicked" into nyc-dev 2016-04-13 10:04:52 +00:00
Ricky Wai
4f1994598b Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev 2016-04-13 10:04:23 +00:00
Ricky Wai
616342bb94 Show "work mode off" dialog when work security option is clicked
Bug: 28158297
Change-Id: I31bc3197d2ff9c95419ea87d009fe7d677181d69
2016-04-13 10:03:31 +00:00
Nicolas Prevot
51ecf5c8b2 Merge "Show the right icon and label for work profile in data usage." into nyc-dev
am: a3d18c0

* commit 'a3d18c03e88cf9dda086a843a2dbf1bf4dc0b146':
  Show the right icon and label for work profile in data usage.

Change-Id: I2c82cf2ce6878f0127afba07ee9a73078b07b030
2016-04-13 08:31:40 +00:00
Nicolas Prévot
a3d18c03e8 Merge "Show the right icon and label for work profile in data usage." into nyc-dev 2016-04-13 08:22:10 +00:00
Nathan Harold
69f68debd5 Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev
am: 0887ace

* commit '0887ace34472469003299d782b90c8fd9324bb7e':
  Minor Fixes for RadioInfo Test Menu

Change-Id: Ia7d06a94f81e5f27500bf63a16d95dad6f8d8829
2016-04-13 07:43:23 +00:00
Nathan Harold
0887ace344 Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev 2016-04-13 07:37:38 +00:00
Nathan Harold
ed38afafd8 Minor Fixes for RadioInfo Test Menu
-Fix a race condition in re-creating activity
-Ensure cell info is disabled when Menu is paused
-Fix issue with focus on creating view

Change-Id: Icfb7667fe6e47ab6dc950918447bbe892e0681ad
2016-04-13 00:29:38 -07:00
Suprabh Shukla
b8b8fc2fe5 Merge "Clearing cache for managed profile apps" into nyc-dev
am: 490e40e

* commit '490e40ecc842c2d333657951fd45bea358c816a5':
  Clearing cache for managed profile apps

Change-Id: Id74948c6b55f9b27f8bdcf0ee3cf0fdee323ca0d
2016-04-13 03:22:27 +00:00
TreeHugger Robot
490e40ecc8 Merge "Clearing cache for managed profile apps" into nyc-dev 2016-04-13 03:13:48 +00:00
Suprabh Shukla
3f4ac54c77 Clearing cache for managed profile apps
Added code to loop over all the child profiles and delete application
cache files for them, when clearing cache from Settings->Storage

Bug: b/25338468
Change-Id: I87dba56218402be44b71a009e93b2e93f48a574c
2016-04-12 16:47:08 -07:00
Chris Wren
7b4a9dc9cc Merge "update station to show ranking and autobundles" into nyc-dev
am: 106d8e5

* commit '106d8e57cee93afbd25587b75455ec78f1853271':
  update station to show ranking and autobundles

Change-Id: I7eb816701684c9d48e450d3f01046eece3c3d5b2
2016-04-12 22:44:49 +00:00
Jason Monk
de27b15329 Merge "Guard against empty extraInfo" into nyc-dev
am: b63a4f8

* commit 'b63a4f87416bcf3170411fc336529ca8f5d14626':
  Guard against empty extraInfo

Change-Id: Iea0c1172f484554a16d8c718b24f02e9e315ac0e
2016-04-12 22:44:49 +00:00
Jason Monk
3d4b96a46f Merge "Work on settings startup speed" into nyc-dev
am: 1fd25b9

* commit '1fd25b982a5d80a13b4e34e2c3130dd2d7f856a6':
  Work on settings startup speed

Change-Id: Ib1ba9c56085a3a18e691bdda63a62528e0a829e3
2016-04-12 22:44:49 +00:00
Jason Monk
b1a1722228 Merge "Disable animations for bluetooth." into nyc-dev
am: 90886f6

* commit '90886f66f6c27ed3c67c32983aa0214e521e2d24':
  Disable animations for bluetooth.

Change-Id: I7325068e38900c7f1a16a1a8685a941ecc12707b
2016-04-12 22:44:48 +00:00
Chris Wren
106d8e57ce Merge "update station to show ranking and autobundles" into nyc-dev 2016-04-12 21:02:15 +00:00
Jason Monk
b63a4f8741 Merge "Guard against empty extraInfo" into nyc-dev 2016-04-12 20:11:17 +00:00
Jason Monk
1fd25b982a Merge "Work on settings startup speed" into nyc-dev 2016-04-12 20:11:00 +00:00
Jason Monk
9a6349a4d5 Guard against empty extraInfo
Change-Id: Iff297637edd3ebf5b6d26bc1dc51e9c17393e24f
Fixes: 27999693
2016-04-12 16:03:39 -04:00
Victor Chang
caa8877f75 Show trust option for multiple unapproved cert in chain
- Add a argument to pass user id
- Check approval status of certs in WorkerThread

Bug: 18224038
Change-Id: I5fd6a41e9593d0f339fecb4185331175e32c50c2
2016-04-12 21:00:14 +01:00
Nicolas Prevot
cda955072d Show the right icon and label for work profile in data usage.
Previously, it showed the icon and label of a random application.

BUG:26798809
Change-Id: I9d812943bdf6f99e87dfd9bb4a37b25644b8d18d
2016-04-12 20:29:22 +01:00
Jason Monk
5673ced93c Work on settings startup speed
- Cut down on amount stored in conditions xml
 - Remove extra work from dashboard startup
 - Move summary to min priority

Change-Id: I51ca3828e4446632d6faa60dcfbab3446d19d335
Fixes: 28134360
2016-04-12 15:19:50 -04:00
Jason Monk
90886f66f6 Merge "Disable animations for bluetooth." into nyc-dev 2016-04-12 19:18:47 +00:00
Noah Wang
e362ed3267 Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev
am: 0d03c3b

* commit '0d03c3b524181dd5a6dc0e8db734f1cb32ed8745':
  Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511

Change-Id: I2924e7bd2d26c0b56815ca2dd879e375ae94f48f
2016-04-12 18:50:27 +00:00
Noah Wang
d9c591bda0 Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332" into nyc-dev
am: 858a1c6

* commit '858a1c6f202865641c2f79fb919c13c2ae8c6f1a':
  Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332

Change-Id: If3caec0fe2bc386b650c6e6f7f6ab3d73ec96b10
2016-04-12 18:50:27 +00:00
Jorim Jaggi
0df85e3e23 Merge "Always update value of screenshot preference" into nyc-dev
am: 0493422

* commit '0493422de2a6c1f6ed5443ac6ebaa72fc844cef4':
  Always update value of screenshot preference

Change-Id: I9d00cfce4dbd8b9baf8aa4ce103e6dcd11c5496a
2016-04-12 18:50:26 +00:00
Jason Monk
ac06fed1d2 Disable animations for bluetooth.
Change-Id: I2aa77d8ce91f81b6704b4f91766ee61c79afb2f8
Fixes: 28135206
2016-04-12 14:45:41 -04:00
Noah Wang
0d03c3b524 Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev 2016-04-12 18:38:50 +00:00
Noah Wang
858a1c6f20 Merge "Postpone commit on PreviewSeekBarPreferenceFragment until the cross-fade animation has completed Bug: 27142332" into nyc-dev 2016-04-12 18:38:29 +00:00
Jorim Jaggi
0493422de2 Merge "Always update value of screenshot preference" into nyc-dev 2016-04-12 18:13:01 +00:00
Ricky Wai
f6fc22092a Unified work lock checkbox should roll back when user cancels confirm dialog
Bug: 28137228
Change-Id: I81cbd41462418ac25142c561c80394db1e6f7d74
2016-04-12 18:35:41 +01:00
Ricky Wai
16d93fbae4 Merge "Do not update unified setting before updating primary profile lock" into nyc-dev
am: 8e91558

* commit '8e91558c0a70a042e0fcbabb8e9c536c9f23b47f':
  Do not update unified setting before updating primary profile lock

Change-Id: Ibd55f7cd0bfce0361494246d3c9ba7cb0f3d0f5d
2016-04-12 17:11:05 +00:00
Ricky Wai
8e91558c0a Merge "Do not update unified setting before updating primary profile lock" into nyc-dev 2016-04-12 16:57:03 +00:00
Jason Monk
fb60f61b56 Merge "Settings dashboard performance work" into nyc-dev
am: 36ac2a1

* commit '36ac2a1eab550a69b787ab1df0ab5e11aa6c4687':
  Settings dashboard performance work

Change-Id: Ie777a3437797b17abf1627298f37af0054e785e3
2016-04-12 16:50:32 +00:00
Jason Monk
36ac2a1eab Merge "Settings dashboard performance work" into nyc-dev 2016-04-12 16:35:44 +00:00
Ricky Wai
a0a073864a Do not update unified setting before updating primary profile lock
Bug: 28135945
Change-Id: Ib6332f42d3b6416d8fd08d5f829bf9852fa0e9f0
2016-04-12 17:34:59 +01:00
Sanket Padawe
5f16c14d15 Merge "Fix UI issue in Sim Settings screen." into nyc-dev
am: 348a5c4

* commit '348a5c4c35038dd138c94e2c8f629da4e71dcd9d':
  Fix UI issue in Sim Settings screen.

Change-Id: I1c8567506e93e2ab0476da680b7a482c80f6b818
2016-04-12 16:06:27 +00:00
Sanket Padawe
348a5c4c35 Merge "Fix UI issue in Sim Settings screen." into nyc-dev 2016-04-12 15:58:06 +00:00
Victor Chang
d7d0e1b6b0 CertDialog supports multiple certs
- Allow user to trust multiple certs in chain in one AlertDialog
- The animation is similar to GrantPermissionsViewHandlerImpl.
  - Fadeout current, Slide-in next cert from the right.
  - Not animate scale as the CustomeView in AlertDialog matchParent
- Refactor CertDialogBuilder into a separate class
- The change for config multiple cert into the dialog is another CL

note: For single cert case when user taps on a system/user cert,
no change is visible to user after this change

Bug: 18224038
Change-Id: I09ee8f683031c800830af4001582882d61cd4974
2016-04-12 16:09:30 +01:00
Jason Monk
f8b2180b96 Settings dashboard performance work
- Don't block main thread with rebuild work
 - Don't run rebuild as foreground priority
 - Don't use comparator on apps/notifications summaries, we don't
   care about order
 - Simplify dashboard item layout

Change-Id: I33bdd06a234ea308b44b45cac5ed1e9eac1c7d43
Fixes: 26541310
2016-04-12 10:32:20 -04:00
Daniel U
a62dd8b1d1 Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev
am: 2f99770

* commit '2f99770cc178011de27813398364da20283fce47':
  Hint user that fingerprint cannot unlock FBE keys

Change-Id: I74e902c396a54b0bee8886c93eaeb30abdde54c9
2016-04-12 11:15:24 +00:00