Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,568 Commits 1 Branch 0 Tags
7e795ee8225d9ef756f2edafa71dcb0aa4eb556c
Commit Graph

25568 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julia Reynolds
7e795ee822 Merge "Introduce IMPORTANCE_MIN." into nyc-dev am: c2bcc727d9 
am: 09da802710

* commit '09da8027103055203495ee7ca421bd8be0fea2f7':
  Introduce IMPORTANCE_MIN.
 2016-02-26 16:23:18 +00:00
Julia Reynolds
09da802710 Merge "Introduce IMPORTANCE_MIN." into nyc-dev 
am: c2bcc727d9

* commit 'c2bcc727d9a43dc5f43574c7558f28ca9b798533':
  Introduce IMPORTANCE_MIN.
 2016-02-26 16:17:53 +00:00
Julia Reynolds
c2bcc727d9 Merge "Introduce IMPORTANCE_MIN." into nyc-dev 2016-02-26 16:14:33 +00:00
Jason Monk
e3a3abb204 Workarounds to avoid removing all prefs am: 2071eda150 
am: 447ad113df

* commit '447ad113dfc1d16fbc832df19b583e5b652f9479':
  Workarounds to avoid removing all prefs
 2016-02-26 16:08:23 +00:00
Jason Monk
447ad113df Workarounds to avoid removing all prefs 
am: 2071eda150

* commit '2071eda150c4ade320fa91ec99678114afbd223e':
  Workarounds to avoid removing all prefs
 2016-02-26 16:05:35 +00:00
Jason Monk
2071eda150 Workarounds to avoid removing all prefs 
Removing all prefs causes ugly animations, so avoid it at all cost
and cache all the prefs (while still added) as long as possible.

Bug: 26271353
Change-Id: I33b84d751938b460f4b66c0158057407dd45d974
 2016-02-26 11:00:01 -05:00
Adrian Roos
fb873e316b Merge "Fix crash when changing encrypt with credential" into nyc-dev am: 6c09bd2538 
am: 1c7891f22b

* commit '1c7891f22b8910bbba9a03bb0c254c28d0359f52':
  Fix crash when changing encrypt with credential
 2016-02-26 00:21:37 +00:00
Adrian Roos
1c7891f22b Merge "Fix crash when changing encrypt with credential" into nyc-dev 
am: 6c09bd2538

* commit '6c09bd2538f9b5474a3d0b38c46f1216c660d71d':
  Fix crash when changing encrypt with credential
 2016-02-26 00:18:52 +00:00
Adrian Roos
6c09bd2538 Merge "Fix crash when changing encrypt with credential" into nyc-dev 2016-02-26 00:11:07 +00:00
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
d381748618 Do not count print jobs if printing is not available. am: 24264eb250 
am: e1f50ab779

* commit 'e1f50ab779ee0bdc82616532940cc7c1746030fa':
  Do not count print jobs if printing is not available.
 2016-02-25 22:37:40 +00: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
f0cfd777e7 Merge "Makes call to MetricsLogger right away when taking bugreports." into nyc-dev am: 4c1cefcd3b 
am: 677d1c7e67

* commit '677d1c7e675159a14d2a483c9015140d7c55d6d1':
  Makes call to MetricsLogger right away when taking bugreports.
 2016-02-25 20:15:17 +00: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
8ccfebff7e 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 
am: 418abb7a86

* commit '418abb7a865ec6c213899121b98a37c8915618a0':
  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:15:56 +00: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
3cbcbbfe21 Add setting to allow RemoteInput on keyguard am: d553f4f9a9 
am: 761bf42f09

* commit '761bf42f0980382a1f0448eb8d953bd8f41b7f00':
  Add setting to allow RemoteInput on keyguard
 2016-02-25 17:44:04 +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
Noah Wang
ffb686a296 Merge "Fix sensitive labels for font size settings." into nyc-dev am: b671780528 
am: 4cf7b2de1e

* commit '4cf7b2de1e2c7e5e92adc6799e2da7a9e7431423':
  Fix sensitive labels for font size settings.
 2016-02-24 23:11:30 +00: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
Jason Monk
991b6c8711 Merge "Update suggestion text" into nyc-dev am: 06663375ca 
am: 0691134c66

* commit '0691134c660497f479ccc7df05f3d5ca181e149d':
  Update suggestion text
 2016-02-24 23:00:28 +00:00
Makoto Onuki
8528d88132 Merge "Allow disabling non-system device admins" into nyc-dev am: 9dd15f1bfa 
am: b7cc6e4a72

* commit 'b7cc6e4a7293edeaf93fcf91edabd12326a8046a':
  Allow disabling non-system device admins
 2016-02-24 23:00:15 +00:00
Bo Hu
0a0c891ea6 Merge "Emulator: avoid accessing null BluetoothAdapter" into nyc-dev am: 9b9ca65db9 
am: 11e94adaec

* commit '11e94adaec3b17bce9c4c304ae55c24682b090ba':
  Emulator: avoid accessing null BluetoothAdapter
 2016-02-24 23:00:00 +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
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