Commit Graph

11011 Commits

Author SHA1 Message Date
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
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
Nathan Harold
709846a099 Merge "Minor Fixes for RadioInfo Test Menu" into nyc-dev am: 0887ace
am: 69f68de

* commit '69f68debd59c24857662ffb34178d03742cb6dac':
  Minor Fixes for RadioInfo Test Menu

Change-Id: I4307f76190e470c4d57f247de018445d9183a6e8
2016-04-13 07:46:34 +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
Chris Wren
285ad580df Merge "update station to show ranking and autobundles" into nyc-dev am: 106d8e5
am: 7b4a9dc

* commit '7b4a9dc9ccf44aa738c1cb1834c593c91db383e6':
  update station to show ranking and autobundles

Change-Id: I049fa6fe4746532547d0c7f65a9c603c50e6dbb5
2016-04-13 00:33:25 +00: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
Chris Wren
106d8e57ce Merge "update station to show ranking and autobundles" into nyc-dev 2016-04-12 21:02:15 +00:00
Jason Monk
f96916606d Merge "Add demo mode to dev options" into nyc-dev am: 7b5c400
am: 2230710

* commit '2230710d319745294f44b696d09301f15f281493':
  Add demo mode to dev options

Change-Id: I54c5a963461127e04f7169ecc90ba367f4883dd1
2016-04-12 19:14:37 +00:00
Jason Monk
2230710d31 Merge "Add demo mode to dev options" into nyc-dev
am: 7b5c400

* commit '7b5c4007e224a00933029f9874d7d830b8a70742':
  Add demo mode to dev options

Change-Id: I48eefd0ae371f09f8841b1aaa113cea7e208a5a9
2016-04-12 19:07:47 +00:00
Sudheer Shanka
ed277a1005 Merge "Auto-link web urls in support messages." into nyc-dev am: 67d068e
am: 6cd4555

* commit '6cd4555ac4577a025fab54a09907290398f52207':
  Auto-link web urls in support messages.

Change-Id: I891fb47cf6c1ff220d5cf9c90d9f4fe12fcf3d1e
2016-04-12 18:55:49 +00:00
Felipe Leme
45f003291b Merge "Make "Take bugreport" dialog scrollable." into nyc-dev am: 5cbac88
am: 0b2a97f

* commit '0b2a97fa5a6318214f8c227f863191119966f144':
  Make "Take bugreport" dialog scrollable.

Change-Id: I2b8b541d51cf7ba47209086c85a460b55b5455a3
2016-04-12 18:55:48 +00:00
Noah Wang
2a1e94aeb1 Merge "Fix content description and accessibility focus on PreviewSeekBarPreferenceFragment. Bug: 27911511" into nyc-dev am: 0d03c3b
am: e362ed3

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

Change-Id: Ia3b26bc7e848ea01de9abf6f83b0e27fbcec7363
2016-04-12 18:55:48 +00:00
Udam Saini
c72a8de8dc Merge "Increase string char limit." into nyc-dev am: 7f6ba63
am: 0ec0ffd

* commit '0ec0ffde587d87edffb75bf5ffae4a2024b2409a':
  Increase string char limit.

Change-Id: I60961d02c21bc409996ac100ba6d5fff1f6194cc
2016-04-12 18:55:46 +00:00
Jason Monk
7b5c4007e2 Merge "Add demo mode to dev options" into nyc-dev 2016-04-12 18:53:18 +00:00
Sudheer Shanka
6cd4555ac4 Merge "Auto-link web urls in support messages." into nyc-dev
am: 67d068e

* commit '67d068e57749fa82ec54794d616a10e0e0a592b1':
  Auto-link web urls in support messages.

Change-Id: I28f26bc84e009c7a199ef9cead16cdbb92d1018c
2016-04-12 18:50:28 +00:00
Felipe Leme
0b2a97fa5a Merge "Make "Take bugreport" dialog scrollable." into nyc-dev
am: 5cbac88

* commit '5cbac8884118d8618da7af4a3a42d7b67bcdb77e':
  Make "Take bugreport" dialog scrollable.

Change-Id: I8e6e3ddb2a96b2fd12756794d39aa275a9e6c98a
2016-04-12 18:50:27 +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
Udam Saini
0ec0ffde58 Merge "Increase string char limit." into nyc-dev
am: 7f6ba63

* commit '7f6ba63fcf7692bec0af1a5eec3fe1e77e58a9f9':
  Increase string char limit.

Change-Id: I6ca7f13286ef630b0770b7e67d4ebea8d9d1f395
2016-04-12 18:50:25 +00:00
Sudheer Shanka
67d068e577 Merge "Auto-link web urls in support messages." into nyc-dev 2016-04-12 18:44:40 +00:00
Felipe Leme
5cbac88841 Merge "Make "Take bugreport" dialog scrollable." into nyc-dev 2016-04-12 18:41:16 +00: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
Udam Saini
7f6ba63fcf Merge "Increase string char limit." into nyc-dev 2016-04-12 17:42:53 +00:00
Felipe Leme
e0011a8235 Make "Take bugreport" dialog scrollable.
Without scrolling, such dialog might not fit on small screens, specially
on multi-window environments.

BUG: 28137501
Change-Id: I84ed1ff946d1023712efcf80f15bac4a57966f19
2016-04-12 10:12:53 -07:00
Jason Monk
fb0d8fb3a9 Add demo mode to dev options
Change-Id: I8c12dc55aef99b54d8d12f7d34e69ca77408f5b2
Fixes: 27919212
2016-04-12 13:09:13 -04:00
Jason Monk
e247608846 Merge "Fix switchbar margin" into nyc-dev am: eb72900
am: 6e7b095

* commit '6e7b09561f7019b4684f55c26fa075180f882bfe':
  Fix switchbar margin

Change-Id: Id711bb8464fe556af06d2d3e79cb48162e248351
2016-04-12 16:56:21 +00:00
Jason Monk
4c1f0ef625 Merge "Settings dashboard performance work" into nyc-dev am: 36ac2a1
am: fb60f61

* commit 'fb60f61b56647dadaaf5035b8610c48e7ce44a4b':
  Settings dashboard performance work

Change-Id: I26686589f1a4fe07dc32541fe67751e6c1f07345
2016-04-12 16:56:21 +00:00
Jason Monk
6e7b09561f Merge "Fix switchbar margin" into nyc-dev
am: eb72900

* commit 'eb7290055c377cf9f6136cc609646c0f897587a2':
  Fix switchbar margin

Change-Id: I45abaf3127a7402d473389ece8cba0a12b690605
2016-04-12 16:50:32 +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
eb7290055c Merge "Fix switchbar margin" into nyc-dev 2016-04-12 16:38:09 +00:00
Jason Monk
99e607dccf Fix switchbar margin
All screens have an up arrow or a drawer icon so the switchbar should
always have the subsettings margin.

Change-Id: If016dc718612d1a26c4e01a5e3f6c8f2f88c6fc1
Fixes: 27599891
2016-04-12 12:35:01 -04: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
Oleksandr Peletskyi
dccb31525a Improved UX for DISALLOW_SET_USER_ICON restriction.
Modified popup menu, so that each item has a hint, why it is
blocked (in case the DISALLOW_SET_USER_ICON is set).

BUG:27914812
Change-Id: I1f891ffe725f383285d577cf47d89c294f2c3986
2016-04-12 15:34:46 +02:00
Ricky Wai
e4b811fe6a Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev am: 2f99770
am: a62dd8b

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

Change-Id: I1fbf61bd752ace0b52b3de4e8f9f5945a6b3aa21
2016-04-12 11:20:54 +00: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
Ricky Wai
2f99770cc1 Merge "Hint user that fingerprint cannot unlock FBE keys" into nyc-dev 2016-04-12 11:06:25 +00:00
Nathan Harold
6322fa7e0c Cleanup RadioInfo Test Menu am: 2b77d74
am: 262b404

* commit '262b404cf9d6c3360439ec2a1b9a153db8ac4a16':
  Cleanup RadioInfo Test Menu

Change-Id: I343d6654b9a1b923d383d34a4aca6773012e4700
2016-04-12 01:19:23 +00:00
Nathan Harold
262b404cf9 Cleanup RadioInfo Test Menu
am: 2b77d74

* commit '2b77d7460ccebd97826529f186596df14050f0ae':
  Cleanup RadioInfo Test Menu

Change-Id: I63f6638893e60e0eef75396d3bee0d8bf223cff1
2016-04-12 01:14:23 +00:00
Nathan Harold
2b77d7460c Cleanup RadioInfo Test Menu
-Convert multi-mode buttons to toggle switches to reduce
 confusion.
-Remove long-deprecated PhoneStateIntentReceiver references
 and convert all functions to use PhoneStateListener
-Remove vestigial menu items that no longer reference working
 system properties or code
-Add new ARFCN/UARFCN/EARFCN fields to CellInfo Display
-Convert CellInfoListRate to a Dropdown menu
-Fixed bugs with screen rotation that caused network preferences
 to change (and could crash the radio)
-Fixed bugs related to onResume not updating values correctly
-Re-ordered menu items to group like-items together
-Minor string edits for clarity, correctness, and consistency

Change-Id: Ied5ed7a250682ee3327e51884d80ee4f3a7eb913
2016-04-11 15:31:59 -07:00
Noah Wang
9faec5600b Fix content description and accessibility focus on
PreviewSeekBarPreferenceFragment.
Bug: 27911511

Change-Id: I45673e582a29028cb0598669b0fa1a48c071181d
2016-04-11 15:00:58 -07:00
Fan Zhang
3213165773 Merge changes from topic 'revert_noe_status'
* changes:
  Revert "Add suggestion carousel view and dependencies to settings"
  Remove DashboardStatusFragment and hide sliding tab layout.
  Revert "Add a RecyclerView adapter for first tab in settings."
  Revert "Dashboard status cards UI."
2016-04-11 20:45:16 +00:00
Jason Monk
7d49252421 Merge "Fix battery history details" into nyc-dev am: 43fa74b
am: 9eeb3f3

* commit '9eeb3f3d2d7892ca540ae6dc9567d1816dcf0613':
  Fix battery history details

Change-Id: I3c3bf2755ca8d7e2cca0cbf3277d1d515c8c072e
2016-04-11 19:11:46 +00:00
Jason Monk
9eeb3f3d2d Merge "Fix battery history details" into nyc-dev
am: 43fa74b

* commit '43fa74b9fdaf8398d0c1498311b307fbfea135a0':
  Fix battery history details

Change-Id: I57cc3e650cb9b1d0ff0d786dc6e27179d27107bb
2016-04-11 19:06:55 +00:00
Jason Monk
43fa74b9fd Merge "Fix battery history details" into nyc-dev 2016-04-11 18:58:25 +00:00
Jason Monk
0b026116be Fix battery history details
Change-Id: Ibf73d28d227574cba0866accdf7c9dc810b24906
Fixes: 27844566
2016-04-11 14:55:34 -04:00
Fan Zhang
4bffbdb928 Revert "Add suggestion carousel view and dependencies to settings"
This reverts commit 0050ac0bb7.

Change-Id: Ic61137bae0fa1a6de5ba4970e8a3a3b4fe0469a3
2016-04-11 09:56:46 -07:00
Fan Zhang
3645373b6f Remove DashboardStatusFragment and hide sliding tab layout.
Bug: 28090184
Change-Id: I34ff46d0f5ba87c824d1484f1018fad154696e15
2016-04-11 09:56:39 -07:00
Chris Wren
6b11a06035 update station to show ranking and autobundles
Bug: 26919636
Change-Id: I5f1ce737ca2d06e6706c3248bd09bd40ef36774f
2016-04-11 12:26:50 -04:00