Commit Graph

25402 Commits

Author SHA1 Message Date
Makoto Onuki
b7cc6e4a72 Merge "Allow disabling non-system device admins" into nyc-dev
am: 9dd15f1bfa

* commit '9dd15f1bfab7fdcd828d2ffbb1b36d3f80301eaf':
  Allow disabling non-system device admins
2016-02-24 22:28:37 +00:00
Bo Hu
11e94adaec Merge "Emulator: avoid accessing null BluetoothAdapter" into nyc-dev
am: 9b9ca65db9

* commit '9b9ca65db9a0692c2381eb0a68a02ab6325fc7db':
  Emulator: avoid accessing null BluetoothAdapter
2016-02-24 22:21:10 +00:00
Makoto Onuki
9dd15f1bfa Merge "Allow disabling non-system device admins" into nyc-dev 2016-02-24 22:20:06 +00:00
Bo Hu
9b9ca65db9 Merge "Emulator: avoid accessing null BluetoothAdapter" into nyc-dev 2016-02-24 22:18:12 +00:00
Makoto Onuki
7cdaa52161 Allow disabling non-system device admins
In safe mode, PM.queryXxx() doesn't return non-system apps.
Use IPM.getReceiverInfo() instead.

Bug 27108276

Change-Id: I391a41eb07e414ba224a808a362125912b177de2
2016-02-24 13:14:56 -08:00
Anna Galusza
693f78c929 Merge "Update font size preview strings. Bug: 27225672" into nyc-dev
am: fa3816d771

* commit 'fa3816d771a828a74c407761272a9b9434d69c70':
  Update font size preview strings. Bug: 27225672
2016-02-24 20:35:33 +00:00
Anna Galusza
fa3816d771 Merge "Update font size preview strings. Bug: 27225672" into nyc-dev 2016-02-24 20:30:36 +00:00
Julia Reynolds
3f54dcfc16 Merge "Replace slider with switches; move slider to tuner." into nyc-dev
am: c4835dc6e3

* commit 'c4835dc6e3378d6acb2ac0ffc33f64bec0499428':
  Replace slider with switches; move slider to tuner.
2016-02-24 19:49:36 +00:00
Julia Reynolds
c4835dc6e3 Merge "Replace slider with switches; move slider to tuner." into nyc-dev 2016-02-24 19:44:17 +00:00
Anna Galusza
29c93d4e08 Update font size preview strings.
Bug: 27225672

Change-Id: I777d33127971bc7cda0241c941a60095f131b057
2016-02-24 11:34:59 -08:00
Robin Lee
23e5801a3b Merge "Use KeyChain instead of Credentials to delete certs" into nyc-dev
am: 34ecc000ae

* commit '34ecc000ae63ccfa9a69032c543fa5e833bb9e91':
  Use KeyChain instead of Credentials to delete certs
2016-02-24 19:23:01 +00:00
Robin Lee
34ecc000ae Merge "Use KeyChain instead of Credentials to delete certs" into nyc-dev 2016-02-24 19:10:50 +00:00
Gustav Sennton
b9473866dd Merge "Block the user from enabling or disabling webview fallback packages." into nyc-dev
am: 0f1e17b76c

* commit '0f1e17b76cbf7c55e1bf582c164cc66424ce0ef8':
  Block the user from enabling or disabling webview fallback packages.
2016-02-24 19:09:02 +00:00
Gustav Sennton
0f1e17b76c Merge "Block the user from enabling or disabling webview fallback packages." into nyc-dev 2016-02-24 19:00:35 +00:00
Robin Lee
da7bc51615 Use KeyChain instead of Credentials to delete certs
Credentials is a bit too low-level. KeyChain will call into the same API
but also arrange deletion of grants, send out STORAGE_CHANGED broadcast
and anything else that might be needed in future.

Bug: 27335182
Change-Id: I764ffa3c5539ddec2b9a776bd3fec6a78a043248
2016-02-24 18:58:31 +00:00
Akshay Kannan
d1590a9424 Merge "Restrict ICE to system image only in settings." into nyc-dev
am: c4b8c70e8a

* commit 'c4b8c70e8a6e33da21f9969b0172d982e3b5cf31':
  Restrict ICE to system image only in settings.
2016-02-24 18:35:44 +00:00
Akshay Kannan
c4b8c70e8a Merge "Restrict ICE to system image only in settings." into nyc-dev 2016-02-24 18:26:10 +00:00
Akshay Kannan
5cddcf2408 Restrict ICE to system image only in settings.
Bug: 23591361
Change-Id: I56767e94eb5f30bc175a097bb8cae340cb9dfb3a
2016-02-24 10:07:27 -08:00
Julia Reynolds
d4559a8035 Replace slider with switches; move slider to tuner.
Bug: 22451710
Change-Id: I86a57479757b3c7a43a789b0b3d7a81afb6d0cf9
2016-02-24 12:52:31 -05:00
Noah Wang
9c3e2bae74 Merge "Read out confirmation message upon selecting options on LabeledSeekBar." into nyc-dev
am: e0255a7197

* commit 'e0255a7197574c0ef833f50aa1ef3a7ee3083b0b':
  Read out confirmation message upon selecting options on LabeledSeekBar.
2016-02-24 17:22:27 +00:00
Noah Wang
e0255a7197 Merge "Read out confirmation message upon selecting options on LabeledSeekBar." into nyc-dev 2016-02-24 17:15:24 +00:00
Paul Lawrence
ceb467296b Merge "Show second warning screen before converting to FBE" into nyc-dev
am: 642e1d9b59

* commit '642e1d9b59c174c3883e511092a1cce9d5ab251f':
  Show second warning screen before converting to FBE
2016-02-24 17:03:37 +00:00
Paul Lawrence
642e1d9b59 Merge "Show second warning screen before converting to FBE" into nyc-dev 2016-02-24 16:56:52 +00:00
Jason Monk
d80a7ff436 Merge "Show gear for apps that provide general settings intent" into nyc-dev
am: 5d052a38e5

* commit '5d052a38e56303be787c38972bb00231ac3757cc':
  Show gear for apps that provide general settings intent
2016-02-24 16:27:25 +00:00
Jason Monk
5d052a38e5 Merge "Show gear for apps that provide general settings intent" into nyc-dev 2016-02-24 16:23:01 +00:00
Mihai Niță
2c1664b414 Merge "Fix various UX bugs." into nyc-dev
am: ceb80c9888

* commit 'ceb80c988815de59d674bf4f9b97dbd70b26755d':
  Fix various UX bugs.
2016-02-24 16:14:14 +00:00
Andres Morales
6987b28d94 Merge "fix issue when cancelling OEM unlocking change" into nyc-dev
am: cc81fb8875

* commit 'cc81fb8875f07773ad28fe049ab62edc434e8788':
  fix issue when cancelling OEM unlocking change
2016-02-24 16:10:18 +00:00
Mihai Niță
ceb80c9888 Merge "Fix various UX bugs." into nyc-dev 2016-02-24 16:08:17 +00:00
Andres Morales
cc81fb8875 Merge "fix issue when cancelling OEM unlocking change" into nyc-dev 2016-02-24 16:05:21 +00:00
Geoff Mendal
2c3f97ec3e Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 9b67583c64  -s ours

* commit '9b67583c64a58e34f8af5f498801064151dabdc8':
  Import translations. DO NOT MERGE
2016-02-24 15:35:13 +00:00
Geoff Mendal
9b67583c64 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-02-24 15:29:34 +00:00
Geoff Mendal
40928ab658 Import translations. DO NOT MERGE
Change-Id: Idfebdeda93da8d39d8fa69293cc0ddbf6911b1ab
Auto-generated-cl: translation import
2016-02-24 07:27:58 -08:00
Jason Monk
0c55bb103c Show gear for apps that provide general settings intent
Bug: 27276982
Change-Id: If598e2901a25f5df2b76a87a95590a5ff831a2dc
2016-02-24 10:25:55 -05:00
Paul Lawrence
31467520ed Show second warning screen before converting to FBE
Bug: 27126952
Change-Id: If045a0676600f4f9611ab27cfb686b8078b3cd5a
2016-02-24 07:22:13 -08:00
Jason Monk
a69fe868ad Merge "Spell checker settings updates" into nyc-dev
am: 8d41c2049a

* commit '8d41c2049ac72ab7760145133b897f9e2df2ba8f':
  Spell checker settings updates
2016-02-24 14:57:46 +00:00
bohu
625bc4bd21 Emulator: avoid accessing null BluetoothAdapter
bug: 27324609
Emulator has no bluetooth support at this moment, and settings
should not crash in this case.

Change-Id: I1bfc6c907ac02d4798b6c118291e6a9d1bf23c7c
2016-02-24 06:55:16 -08:00
Jason Monk
8d41c2049a Merge "Spell checker settings updates" into nyc-dev 2016-02-24 14:53:15 +00:00
Jason Monk
42123f70c5 Spell checker settings updates
Bug: 26108333
Change-Id: I41e5da4a41978262283bc494a76c887e281266a8
2016-02-24 09:52:34 -05:00
Sudheer Shanka
29fca4709f Merge "Update the admin app icon in the support dialog." into nyc-dev
am: df1cbdcf56

* commit 'df1cbdcf56945c0eb86ecbfd247341b94b0aa563':
  Update the admin app icon in the support dialog.
2016-02-24 14:37:38 +00:00
Sudheer Shanka
df1cbdcf56 Merge "Update the admin app icon in the support dialog." into nyc-dev 2016-02-24 14:32:54 +00:00
Jason Monk
59ed2c9dcf Merge changes I24a9d34d,I443e9d2b into nyc-dev
am: 346c1f4f24

* commit '346c1f4f2461fc7c38e4c2ad87f26864ad4fa347':
  Add default app prefs to app info
  Rearrange configure/default apps
2016-02-24 14:29:10 +00:00
Jason Monk
a889e86494 Merge "Fix and update battery detail page" into nyc-dev
am: e4cf5b20a1

* commit 'e4cf5b20a1f78bcb1267e49d7faf96359bcacce0':
  Fix and update battery detail page
2016-02-24 14:25:01 +00:00
Jason Monk
346c1f4f24 Merge changes I24a9d34d,I443e9d2b into nyc-dev
* changes:
  Add default app prefs to app info
  Rearrange configure/default apps
2016-02-24 14:22:37 +00:00
Jason Monk
e4cf5b20a1 Merge "Fix and update battery detail page" into nyc-dev 2016-02-24 14:21:18 +00:00
Jason Monk
2108d361bb Add default app prefs to app info
This makes them easier to discover and to know the state of them.

Bug: 27276982
Change-Id: I24a9d34d7e189b19df39cc0b9028b6412f76aa05
2016-02-24 08:55:01 -05:00
Jason Monk
91e2f89b0f Rearrange configure/default apps
Bug: 27276982
Bug: 27279305
Change-Id: I443e9d2bc0c3fd9bcc13ee86716c14fbb55af0ba
2016-02-24 08:55:01 -05:00
Jeff Sharkey
fd862887eb Merge "Make fallback home a bit more graceful." into nyc-dev
am: e57f7cbc8c

* commit 'e57f7cbc8c80d298bbbd63b7536acd67c7f95df4':
  Make fallback home a bit more graceful.
2016-02-24 03:55:17 +00:00
Jeff Sharkey
e57f7cbc8c Merge "Make fallback home a bit more graceful." into nyc-dev 2016-02-24 03:48:59 +00:00
Jeff Sharkey
e555a6f610 Make fallback home a bit more graceful.
This change switches the theme used so we show through to the
wallpaper (instead of showing black), which makes initial device
startup less jarring.

Bug: 26458596
Change-Id: I73c7f1cf25dd21cb4a4012fb62f8828eb46a8368
2016-02-23 20:48:03 -07:00
Christopher Tate
927cc57399 No separators in the list of hosts whose links apps open
am: 1a157e69b4

* commit '1a157e69b4f190a0f6bf2992a397c830b215f3cb':
  No separators in the list of hosts whose links apps open
2016-02-24 03:21:42 +00:00