Commit Graph

26180 Commits

Author SHA1 Message Date
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
049de74bc5 Merge "Update font size preview strings. Bug: 27225672" into nyc-dev am: fa3816d771
am: 693f78c929

* commit '693f78c9292b1fb56e04a1059071253cae9a0124':
  Update font size preview strings. Bug: 27225672
2016-02-24 20:40:53 +00: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
c35dbf7e23 Merge "Replace slider with switches; move slider to tuner." into nyc-dev am: c4835dc6e3
am: 3f54dcfc16

* commit '3f54dcfc161a0e1d527f0cae6fb5e435943f03f7':
  Replace slider with switches; move slider to tuner.
2016-02-24 19:56:02 +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
a9f1ef2a34 Merge "Use KeyChain instead of Credentials to delete certs" into nyc-dev am: 34ecc000ae
am: 23e5801a3b

* commit '23e5801a3bad0a5f4c30eafdc49400e8d479eee3':
  Use KeyChain instead of Credentials to delete certs
2016-02-24 19:33:07 +00: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
Gustav Sennton
c366daf7a3 Merge "Block the user from enabling or disabling webview fallback packages." into nyc-dev am: 0f1e17b76c
am: b9473866dd

* commit 'b9473866dd91be923173158035e180cdd55c5816':
  Block the user from enabling or disabling webview fallback packages.
2016-02-24 19:13:52 +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
c2193039be Merge "Restrict ICE to system image only in settings." into nyc-dev am: c4b8c70e8a
am: d1590a9424

* commit 'd1590a94244f36133a64d2ec4e9341d4dbe7eeed':
  Restrict ICE to system image only in settings.
2016-02-24 18:42:01 +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
8aeef47c23 Merge "Read out confirmation message upon selecting options on LabeledSeekBar." into nyc-dev am: e0255a7197
am: 9c3e2bae74

* commit '9c3e2bae745d2f420faddf05925ce561691006f0':
  Read out confirmation message upon selecting options on LabeledSeekBar.
2016-02-24 17:27:29 +00: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
1149cd2653 Merge "Show second warning screen before converting to FBE" into nyc-dev am: 642e1d9b59
am: ceb467296b

* commit 'ceb467296bb99c364196c965b93333f4f4dbad46':
  Show second warning screen before converting to FBE
2016-02-24 17:08:10 +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
026b73b592 Merge "Show gear for apps that provide general settings intent" into nyc-dev am: 5d052a38e5
am: d80a7ff436

* commit 'd80a7ff4363ce2fca83ce64162d38cb595f47929':
  Show gear for apps that provide general settings intent
2016-02-24 16:31:37 +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ță
e4b7b1d068 Merge "Fix various UX bugs." into nyc-dev am: ceb80c9888
am: 2c1664b414

* commit '2c1664b414b4f4ede76f678e6f4cade12a7743c8':
  Fix various UX bugs.
2016-02-24 16:18:32 +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
325a912fdd Merge "fix issue when cancelling OEM unlocking change" into nyc-dev am: cc81fb8875
am: 6987b28d94

* commit '6987b28d94501ef4caf1a6aad4d064b31b48e91c':
  fix issue when cancelling OEM unlocking change
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
3a9a4650c3 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9b67583c64 -s ours
am: 2c3f97ec3e  -s ours

* commit '2c3f97ec3e69760eb08468bfba5ff79771e83350':
  Import translations. DO NOT MERGE
2016-02-24 15:39:28 +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
aaa2e26770 Merge "Spell checker settings updates" into nyc-dev am: 8d41c2049a
am: a69fe868ad

* commit 'a69fe868ad579b6b98480f63756e4bbf7b767192':
  Spell checker settings updates
2016-02-24 15:01:52 +00: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
6a672d509c Merge "Update the admin app icon in the support dialog." into nyc-dev am: df1cbdcf56
am: 29fca4709f

* commit '29fca4709f48ca2d9fc786f6dfe3326301c3f9d8':
  Update the admin app icon in the support dialog.
2016-02-24 14:41:37 +00: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
Geoff Mendal
5164f9a4ea Merge "Import translations. DO NOT MERGE" 2016-02-24 14:36:15 +00:00
Jason Monk
ef1d5bd101 Merge changes I24a9d34d,I443e9d2b into nyc-dev am: 346c1f4f24
am: 59ed2c9dcf

* commit '59ed2c9dcf3f1148337186a297f480225330888e':
  Add default app prefs to app info
  Rearrange configure/default apps
2016-02-24 14:33:18 +00:00