Jason Monk
8b8092aa09
am 3974d3d4
: am ef1d4b66
: Merge "Make Theme a DropDownPreference" into mnc-dev
...
* commit '3974d3d4e6f523bd743aa0078b68d366f64b4661':
Make Theme a DropDownPreference
2015-06-01 20:20:50 +00:00
Jason Monk
ef1d4b66ab
Merge "Make Theme a DropDownPreference" into mnc-dev
2015-06-01 19:54:53 +00:00
Jason Monk
3d95908e02
Make Theme a DropDownPreference
...
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.
Bug: 21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
2015-06-01 15:49:17 -04:00
Sanket Padawe
f90c8a46b8
am ef2b8dc4
: am 0be403db
: Merge "Send sim change notification based on sim state change." into mnc-dev
...
* commit 'ef2b8dc47ec28ade46c180813452898ee4b42ec4':
Send sim change notification based on sim state change.
2015-06-01 18:51:55 +00:00
Stuart Scott
b4c2ab8622
am 1925989e
: am 47ed6ca0
: Network Reset should have a lockdown like Factory Reset.
...
* commit '1925989ed9b91a1426a14346a6f687173e98b868':
Network Reset should have a lockdown like Factory Reset.
2015-06-01 18:50:47 +00:00
Sanket Padawe
0be403dbed
Merge "Send sim change notification based on sim state change." into mnc-dev
2015-06-01 17:55:12 +00:00
Sanket Padawe
9d7eb49e7b
Send sim change notification based on sim state change.
...
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.
Bug: 20739298
Bug: 18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
2015-06-01 10:25:46 -07:00
Xiyuan Xia
cb7312acd4
am 89a0ba67
: am dc6bd8d2
: Merge "Ignore fp error message when not listening" into mnc-dev
...
* commit '89a0ba67ff06be4d4fc842b25197b19ff01b85f9':
Ignore fp error message when not listening
2015-06-01 17:08:24 +00:00
Stuart Scott
47ed6ca004
Network Reset should have a lockdown like Factory Reset.
...
bug:20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit 176f512c5a
)
2015-06-01 16:30:48 +00:00
Fyodor Kupolov
222ebbafc1
am 59e340d7
: am 097936ad
: Hide guest entry if the user is not allowed to create guest
...
* commit '59e340d735b3b74b9eb6726f45f740c17302b740':
Hide guest entry if the user is not allowed to create guest
2015-06-01 15:28:14 +00:00
Fyodor Kupolov
aeaf219eae
am 8a1683f2
: am 01f35ce4
: Merge "Use DimmableIconPreference for Add user action" into mnc-dev
...
* commit '8a1683f24555803c853c6f86d8dff1355eeaf666':
Use DimmableIconPreference for Add user action
2015-06-01 15:27:23 +00:00
Fyodor Kupolov
4f621f5126
am 8e998b71
: am 2defc457
: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
...
* commit '8e998b71f0cdba1c85cadaebb4dfc8e80bd0ac52':
Hide the collapse/expand icon if text fits the screen
2015-06-01 15:27:21 +00:00
Tony Mantler
9e05e53691
am 55cd8fe3
: am 3e7f2b44
: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
...
* commit '55cd8fe3150fb4e7470dbbce58cbbab45373d3e5':
Move ZoneGetter into SettingsLib
2015-06-01 14:46:25 +00:00
John Spurlock
48018ddc72
am 08788dcc
: am 00e39238
: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
...
* commit '08788dccaf733d855b7a2391095076a642b697f9':
Settings: Migrate zen event conditions to use calendar name.
2015-06-01 14:46:23 +00:00
Xiyuan Xia
dc6bd8d2f1
Merge "Ignore fp error message when not listening" into mnc-dev
2015-05-30 03:28:52 +00:00
Xiyuan Xia
f1bc6e52b5
Ignore fp error message when not listening
...
Bug:21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
2015-05-29 16:19:29 -07:00
Fyodor Kupolov
097936ad1b
Hide guest entry if the user is not allowed to create guest
...
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.
Bug: 19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
2015-05-29 14:07:12 -07:00
Fyodor Kupolov
01f35ce46e
Merge "Use DimmableIconPreference for Add user action" into mnc-dev
2015-05-29 20:42:55 +00:00
Fyodor Kupolov
2defc457bd
Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
2015-05-29 20:27:15 +00:00
Fyodor Kupolov
1c8600b0c8
Hide the collapse/expand icon if text fits the screen
...
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.
Bug: 20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
2015-05-29 11:21:42 -07:00
Tony Mantler
3e7f2b4458
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
2015-05-29 16:44:48 +00:00
John Spurlock
00e392387b
Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
2015-05-29 13:22:36 +00:00
John Spurlock
bd352af3cf
Settings: Migrate zen event conditions to use calendar name.
...
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.
Bug: 17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
2015-05-28 22:20:44 -04:00
Paul Lawrence
c93ccee5e0
am a25cf52c
: am 750648c5
: Merge "Disable back button on crypto screen" into mnc-dev
...
* commit 'a25cf52c7ab590ab0c58d38a742f10d3d37fd63c':
Disable back button on crypto screen
2015-05-28 22:34:25 +00:00
Tony Mantler
550015e476
Move ZoneGetter into SettingsLib
...
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
2015-05-28 14:49:19 -07:00
Paul Lawrence
750648c5ae
Merge "Disable back button on crypto screen" into mnc-dev
2015-05-28 19:37:28 +00:00
Jason Monk
f8adf49347
am a5c3cf40
: am 7c3b9f28
: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
...
* commit 'a5c3cf4003ec5314a6fe05fa355e599c80e82469':
Make use of WifiTracker's WorkerThread support
2015-05-28 17:30:52 +00:00
Jason Monk
7c3b9f28b5
Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev
2015-05-28 16:37:39 +00:00
Jason Monk
7a0b412ed2
Make use of WifiTracker's WorkerThread support
...
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.
Bug: 21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
2015-05-28 12:26:09 -04:00
Jason Monk
eb859db14f
am 5ab0c9c9
: am a7fe759d
: Merge "More memory updates" into mnc-dev
...
* commit '5ab0c9c9e37d8ca17b2e40ccaf6913149cdd78c2':
More memory updates
2015-05-28 14:49:28 +00:00
Jason Monk
266fc6df94
am ef4ec260
: am 15dcebe1
: Help fallbacks and intent work
...
* commit 'ef4ec2603270dac4b7a001220b023721ce3aab54':
Help fallbacks and intent work
2015-05-28 14:34:07 +00:00
Jason Monk
a7fe759de7
Merge "More memory updates" into mnc-dev
2015-05-28 14:24:35 +00:00
Jason Monk
ab2046aa76
More memory updates
...
- Some string changes
- Make processes in memory details not clickable
- Put processes in a 'detail' category
- Hide processes when an app only has 1
- Add memory item to bottom of app info page
Bug: 20694769
Change-Id: Ifbe2205aeef230e44752d075578524249b30bdf8
2015-05-28 10:20:56 -04:00
Jason Monk
15dcebe1e7
Help fallbacks and intent work
...
- Handle a backup URI, so that if the specified URI is not available,
another can be used.
- Add some data to help intents when they are intent URIs
- Fill in the context with a classname when it isn't present
Bug: 15475009
Change-Id: I7050fa61121901929e650b20bd7a0ae21e8ba207
2015-05-28 09:50:45 -04:00
Sanket Padawe
479c5215e6
am 56eb3e61
: am ecf4339b
: Fix Eap method selection on screen rotation.
...
* commit '56eb3e611db35afb13b00bfa7b187d2d38eae942':
Fix Eap method selection on screen rotation.
2015-05-28 01:32:34 +00:00
Sanket Padawe
ecf4339bc7
Fix Eap method selection on screen rotation.
...
Bug: 19903254
Change-Id: I84322a785f9a4121c7885ada889a04129590e4ed
2015-05-27 18:04:23 -07:00
Paul Lawrence
177f3977dd
am 70aae38d
: am 90e9a903
: Merge "Honor password visible setting in CryptKeeper" into mnc-dev
...
* commit '70aae38d3d80bf10a60ff2216e2f31e0b93ab34c':
Honor password visible setting in CryptKeeper
2015-05-27 22:48:05 +00:00
Paul Lawrence
90e9a90312
Merge "Honor password visible setting in CryptKeeper" into mnc-dev
2015-05-27 22:15:51 +00:00
Adrian Roos
7581c30774
Only show emergency app preference if enabled
...
Bug: 21471480
Change-Id: I93e5dcb9acb8be1220d2874d5bca764819139760
2015-05-27 14:39:24 -07:00
Andres Morales
02122f6ab3
am fb171c21
: am 27c13e5d
: Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
...
* commit 'fb171c214f905c20053f7ced9f981bccb8275b29':
[ConfirmCredential] fix issue where patterns of length 4 are not checked
2015-05-27 21:34:22 +00:00
Andres Morales
27c13e5dc6
Merge "[ConfirmCredential] fix issue where patterns of length 4 are not checked" into mnc-dev
2015-05-27 20:59:28 +00:00
Chad Brubaker
fdda3f5dc7
am 08ffcb99
: am 227ba29e
: Merge "Clear only keystore credential entires" into mnc-dev
...
* commit '08ffcb996e5a54cf127e2ab87ee6689c23e0177e':
Clear only keystore credential entires
2015-05-27 20:45:54 +00:00
Andres Morales
6e3a182f9b
am 6042133f
: am b5746cb1
: Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
...
* commit '6042133f48b340b24babc8c590b874ddac9dfe6f':
[LockSettings] pipe through HW throttle timeout
2015-05-27 20:45:52 +00:00
Jorim Jaggi
57aeea920e
am 30ddbcdb
: am fd5ec09f
: Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
...
* commit '30ddbcdb680d1ace092fe8e377542a0f6dfc8436':
Cancel enrollment when navigating out of enrollment
String changes for app links in settings
Remove data item from app info when not supported
Monkey should not be allowed to switch USB mode
2015-05-27 20:45:49 +00:00
Paul Lawrence
2a6552ed50
Disable back button on crypto screen
...
The back button cannot do anything from this activity as it is
only ever launched first thing at boot. So do not permit going back.
Note that screens launched from here (emergency dialer, keyboard config)
still work and their back buttons still work.
Bug: 20730074
Change-Id: I939e05450e5fbd61d12890325c4afe9dcad35c1e
2015-05-27 20:34:14 +00:00
Paul Lawrence
c04420ce25
Honor password visible setting in CryptKeeper
...
Requires matching framework change:
https://googleplex-android-review.git.corp.google.com/#/c/692822/
Bug: 20184626
Change-Id: I04bfb9ed61a7b40fbc28fbc0b4b10bf848b34a2c
2015-05-27 20:33:46 +00:00
Andres Morales
864d13e2c9
[ConfirmCredential] fix issue where patterns of length 4 are not checked
...
Change-Id: I2bfcae01be88001a6a9bafa4908305d464522302
2015-05-27 13:04:38 -07:00
Chad Brubaker
227ba29e39
Merge "Clear only keystore credential entires" into mnc-dev
2015-05-27 20:04:14 +00:00
Andres Morales
b5746cb19b
Merge "[LockSettings] pipe through HW throttle timeout" into mnc-dev
2015-05-27 18:37:53 +00:00
Jorim Jaggi
fd5ec09fe2
Merge "Cancel enrollment when navigating out of enrollment" into mnc-dev
2015-05-27 18:33:26 +00:00