Fyodor Kupolov
06a9c98bb8
Merge "Make prefs without an action unselectable" into nyc-dev
...
am: 9121169dca
2016-06-02 22:44:44 +00:00
Fyodor Kupolov
9121169dca
Merge "Make prefs without an action unselectable" into nyc-dev
2016-06-02 22:30:22 +00:00
Fyodor Kupolov
77865ec827
Make prefs without an action unselectable
...
Setting selectable=false is required for proper A11y. Otherwise Talkback
will inform the user that the item can be activated.
Bug: 29025567
Change-Id: I2b61c622c2d69fa83640f7822349613f51f849d5
2016-06-02 10:39:33 -07:00
Wei Wang
704476a96d
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
...
am: d0d3ca3b7c
2016-06-02 17:22:59 +00:00
Wei Wang
d0d3ca3b7c
Merge "Revert "Add an entry in developer options for location tools."" into nyc-dev
2016-06-02 17:14:02 +00:00
Wei Wang
a0b28146ba
Revert "Add an entry in developer options for location tools."
...
Bug:28251942
This reverts commit e1c1a13cba
2016-06-02 04:42:02 +00:00
Jason Monk
2cf7ecc1d4
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
...
am: 67e87fa4e9
2016-06-01 20:32:26 +00:00
Jason Monk
67e87fa4e9
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
2016-06-01 20:09:00 +00:00
Sudheer Shanka
61617948f6
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
...
am: df66d4abf0
2016-06-01 18:39:52 +00:00
TreeHugger Robot
df66d4abf0
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
2016-06-01 18:16:21 +00:00
Jason Monk
350a930c68
onResume -> onStart, onPause -> onStop
...
For SettingsActivity and DashboardSummary
Bug: 28896214
Change-Id: I235d5c82b04b1363bf4416acb5cf5fc1c4db704f
2016-06-01 13:45:25 -04:00
Jason Monk
4436467a25
Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
...
am: 9791704411
2016-06-01 17:37:12 +00:00
Jason Monk
dc8738fda2
Merge "Fix apps spinner jank." into nyc-dev
...
am: ad302548ea
2016-06-01 17:37:11 +00:00
Jason Monk
9791704411
Merge "Cache account prefs so we don't lose a11y focus" into nyc-dev
2016-06-01 17:19:56 +00:00
Jason Monk
cd66b4a99f
Cache account prefs so we don't lose a11y focus
...
Fixes: 28767151
Change-Id: I876712c42b02bb2efaaa492ad951ad42935ecb32
2016-06-01 17:19:01 +00:00
Jason Monk
ad302548ea
Merge "Fix apps spinner jank." into nyc-dev
2016-06-01 17:03:54 +00:00
Jason Monk
8a5d4bfbb8
Fix apps spinner jank.
...
Change-Id: I7fbe580627538037fd0f1823787f7dcebbb43252
Fixes: 29056706
2016-06-01 12:57:05 -04:00
Sudheer Shanka
65cabcd4ee
Start DeviceAdminSettings in a new task from support dialog.
...
Bug: 28998790
Change-Id: Ia43d6e719124e0908ec8ccb8c1ba7e80b5297096
2016-06-01 16:29:20 +00:00
Robin Lee
8a8f3f2f34
Disable restricted VPN actions onResume
...
am: 52541536d0
2016-06-01 14:22:07 +00:00
Robin Lee
52541536d0
Disable restricted VPN actions onResume
...
Otherwise it's pretty easy to circumvent any future restrictions by
keeping VPN settings for a particular app open and continuing to use
it even after DISALLOW_CONFIG_VPN is applied.
Two checks:
1) in onResume (catches almost every case)
2) in setAlwaysOn (catches every remaining case)
Bug: 28733079
Change-Id: I1c67bb14891ef620df5ed65fbd32678e417b4a65
2016-06-01 11:32:32 +01:00
Victor Chang
7a37b70bda
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
...
am: 36522e8854
2016-06-01 10:13:51 +00:00
Victor Chang
36522e8854
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
2016-06-01 10:07:16 +00:00
Victor Chang
71d1fed0e7
Show different strings when PO/DO user approves a cert
...
1. This is confusing for restricted users who don't have any options other
than 'Trust'.
2. show dialog title of "Check certificate" instead of "Trust or remove certificate"
The change only applies to ProfileOwner and DeviceOwner case
Fix: 28875819
Change-Id: I3f7dc8f3dcac75b4d99814cbc9af67433676a8c7
2016-05-31 22:43:09 +01:00
Roozbeh Pournader
aacca81c31
Merge "Show only up to two locales in Settings" into nyc-dev
...
am: a260cf8931
2016-05-31 01:14:42 +00:00
Roozbeh Pournader
a260cf8931
Merge "Show only up to two locales in Settings" into nyc-dev
2016-05-31 01:02:41 +00:00
Jason Monk
6ed9be1352
Merge "Fix pref availability for search" into nyc-dev
...
am: 8eaa3de931
2016-05-27 17:08:54 +00:00
Jason Monk
3b8dd1eeae
Merge "Don\'t allow restricted data usage of system" into nyc-dev
...
am: da52f08b0a
2016-05-27 17:08:54 +00:00
Jason Monk
8eaa3de931
Merge "Fix pref availability for search" into nyc-dev
2016-05-27 17:07:23 +00:00
Jason Monk
be9412107d
Fix pref availability for search
...
Change-Id: Ic080e131c6c751456b22d370aade77748d912b6b
Fixes: 28987828
2016-05-27 12:58:53 -04:00
Jason Monk
da52f08b0a
Merge "Don't allow restricted data usage of system" into nyc-dev
2016-05-27 16:51:59 +00:00
Paul Stewart
aa5afb18fe
Merge "Display connect button in the wifi connection menu" am: 9126cfba19
...
am: ace9f52725
2016-05-27 15:06:06 +00:00
Jason Monk
9b926c0bc6
Don't allow restricted data usage of system
...
Cause it will just crash
Change-Id: I4ee43633eb3fa488816b1d2767073cbe404c2c33
Fixes: 28979013
2016-05-27 10:57:10 -04:00
Paul Stewart
9126cfba19
Merge "Display connect button in the wifi connection menu"
2016-05-27 14:50:10 +00:00
Roozbeh Pournader
217b1d1581
Show only up to two locales in Settings
...
The list could otherwise grow very long, spamming the screen.
Bug: 28872122
Change-Id: I8c4dbe659e1c088eba8b5ba1b2905b5eb8bc0229
2016-05-26 19:01:06 -07:00
Julia Reynolds
fe77548afc
Merge "Importance slider updates." into nyc-dev
...
am: 7c2c025e4f
2016-05-26 17:37:02 +00:00
Jason Monk
031faa05e0
Merge "Fix crash from battery saver switch" into nyc-dev
...
am: 371aec1e92
2016-05-26 17:37:00 +00:00
Julia Reynolds
7c2c025e4f
Merge "Importance slider updates." into nyc-dev
2016-05-26 16:50:57 +00:00
Jason Monk
371aec1e92
Merge "Fix crash from battery saver switch" into nyc-dev
2016-05-26 16:46:51 +00:00
Julia Reynolds
373a9e2fcf
Importance slider updates.
...
Icon & tint.
Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-26 11:08:16 -04:00
Jason Monk
e4d0ed502d
Fix crash from battery saver switch
...
Turns out most things expect the conditions to be loaded immediately
so if the dashboard hasn't been hit, they crash. Instead load
immediately for everything but the dashboard.
Change-Id: Iaa1114c88b3766e2ac513acb417ef2a55a0f4e7f
Fixes: 28952354
2016-05-26 11:07:53 -04:00
Ricky Wai
fed850c9b6
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
...
am: fec38d0699
2016-05-26 14:04:25 +00:00
Ricky Wai
fec38d0699
Merge "Use LockPatternUtils.resetKeyStore() to clear keystore" into nyc-dev
2016-05-26 13:46:25 +00:00
Victor Chang
195330a9c2
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
...
am: eb02435cbf
2016-05-26 11:13:39 +00:00
Victor Chang
eb02435cbf
Merge "Fix Work Challenge / personal confirm credential is shown on top of keyguard after rotation" into nyc-dev
2016-05-26 10:55:26 +00:00
Derek Tan
a12ac3c683
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
...
am: 08e24d43b6
2016-05-25 23:51:58 +00:00
Derek Tan
08e24d43b6
Merge "Use getConfigForSubId instead of getConfig(int)." into nyc-dev
2016-05-25 23:41:20 +00:00
Sudheer Shanka
68a4e6c104
Merge "Guard against IllegalArgumentException" into nyc-dev
...
am: 96305a2b34
2016-05-25 23:10:43 +00:00
TreeHugger Robot
96305a2b34
Merge "Guard against IllegalArgumentException" into nyc-dev
2016-05-25 23:07:01 +00:00
Derek Tan
d1151c19d8
Use getConfigForSubId instead of getConfig(int).
...
Per API review, we want to revert getConfig(int) to
getConfigForSubId(int) (ag/1075011). This CL changes all
callers to use getConfigForSubId(int).
Bug: 28295813
Change-Id: I0e44a5e758aed34ce26740632270700bde66cff6
2016-05-25 15:00:27 -07:00
Robin Lee
cb5c925432
Merge "Don\'t crash trying to disable lockdown VPN" into nyc-dev
...
am: a6269236a2
2016-05-25 21:20:48 +00:00
