Commit Graph

26471 Commits

Author SHA1 Message Date
Adrian Roos
77181e9478 Fix crash when changing encrypt with credential
Bug: 27173979
Change-Id: If8ef7a9342bcb1b0602791df1dc7634b3e980ee7
2016-02-25 15:43:50 -08:00
Philip P. Moltmann
e1f50ab779 Do not count print jobs if printing is not available.
am: 24264eb250

* commit '24264eb2508d54de473b00b934807d2a0881b0aa':
  Do not count print jobs if printing is not available.
2016-02-25 22:32:35 +00:00
Philip P. Moltmann
24264eb250 Do not count print jobs if printing is not available.
Bug: 27339883
Change-Id: I0b0761917798581e831e8b2692fdc9c5fefb1155
2016-02-25 13:07:26 -08:00
Felipe Leme
677d1c7e67 Merge "Makes call to MetricsLogger right away when taking bugreports." into nyc-dev
am: 4c1cefcd3b

* commit '4c1cefcd3b8f64f028f2a53fe0107913d83867b6':
  Makes call to MetricsLogger right away when taking bugreports.
2016-02-25 19:51:23 +00:00
Felipe Leme
4c1cefcd3b Merge "Makes call to MetricsLogger right away when taking bugreports." into nyc-dev 2016-02-25 19:45:05 +00:00
Felipe Leme
038bf65686 Makes call to MetricsLogger right away when taking bugreports.
Previously the call was made on takeBugreport(), which caused a NPE on
interative report calls because the context was null since it was
handled by a handler.

BUG: 27354167
Change-Id: I19e91cb4b43a7aa0bfcdab440c4cd4225110fdfb
2016-02-25 11:37:56 -08:00
Muyuan Li
418abb7a86 Fixed a bug in DisplayUtils in which the length of entries will be added twice, causing IndexOutOfBound exception at runtime when using custom DPI
am: ab15e923a5

* commit 'ab15e923a599ff2a0d3712c5029eba5c4b4b75b5':
  Fixed a bug in DisplayUtils in which the length of entries will be added twice, causing IndexOutOfBound exception at runtime when using custom DPI
2016-02-25 18:13:33 +00:00
Julia Reynolds
518b93f565 Introduce IMPORTANCE_MIN.
Bug: 22960980
Change-Id: Ia3876e0b3b5dae19553fd467313b46408fcbb0f4
2016-02-25 13:06:57 -05:00
Muyuan Li
ab15e923a5 Fixed a bug in DisplayUtils in which the length of entries will be added
twice, causing IndexOutOfBound exception at runtime when using custom
DPI

Change-Id: Ib106f0ee8044893e2c1f3b4f334b741194171e2a
(cherry picked from commit d4ed8400ff7bc60e1391f4ea248390342a9f90dd)
2016-02-25 18:01:13 +00:00
Adrian Roos
761bf42f09 Add setting to allow RemoteInput on keyguard
am: d553f4f9a9

* commit 'd553f4f9a94a16bb19463fb42294212dbc21c09a':
  Add setting to allow RemoteInput on keyguard
2016-02-25 17:34:41 +00:00
Adrian Roos
d553f4f9a9 Add setting to allow RemoteInput on keyguard
Bug: 26440855
Change-Id: I57e02876c615f558eee279f2dc7edca8b28fc495
2016-02-25 09:22:14 -08:00
Sanket Padawe
d84467bd65 Remove displaying of WifiCalling twice in Settings search.
+ WifiCalling was getting displayed twice due to addition of
WifiCallingSettings screen in Settings ranking & index files.
+ This also solves issue of displaying WifiCalling option in non supported
carrier/platform.

Bug: 25669303
Change-Id: I179128d1f3c876a4d3f826e0365cbb2b761d57dd
2016-02-24 17:47:03 -08:00
Fyodor Kupolov
52ae05314d Do not allow removing current user if it's in a call
Bug: 20652663
Change-Id: I2eb91bc73259e25b3fa68337df2a0576a438244a
2016-02-24 15:56:13 -08:00
Noah Wang
4cf7b2de1e Merge "Fix sensitive labels for font size settings." into nyc-dev
am: b671780528

* commit 'b671780528d53e7bfab5e66f439fa682890b336d':
  Fix sensitive labels for font size settings.
2016-02-24 23:05:09 +00:00
Noah Wang
b671780528 Merge "Fix sensitive labels for font size settings." into nyc-dev 2016-02-24 22:57:28 +00:00
Jason Monk
0691134c66 Merge "Update suggestion text" into nyc-dev
am: 06663375ca

* commit '06663375cabe621f51841a2be33dcce2490223f5':
  Update suggestion text
2016-02-24 22:52:25 +00:00
Jason Monk
06663375ca Merge "Update suggestion text" into nyc-dev 2016-02-24 22:45:46 +00:00
Jason Monk
ec1f28e50c Update suggestion text
Bug: 27151995
Change-Id: If7c9620b816ae4f08b5a41dd7c88469184efe234
2016-02-24 17:39:29 -05:00
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
Noah Wang
72cf2f246b Fix sensitive labels for font size settings.
bug: 27122995
Change-Id: I6d549fa417a46ee565a38269ccfb1fccae425b53
2016-02-24 13:26:43 -08: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