Roozbeh Pournader
241f8e6e9c
Merge \"Use existing localizations for formatting data usage [DO NOT MERGE]\" into nyc-dev
...
am: 5eddc4bde9
2016-06-09 23:06:55 +00:00
Roozbeh Pournader
5eddc4bde9
Merge "Use existing localizations for formatting data usage [DO NOT MERGE]" into nyc-dev
2016-06-09 23:04:22 +00:00
Svet Ganov
0984141943
Merge \"Don\'t send user to permissions screen if none requested\" into nyc-dev
...
am: 3e5318496e
2016-06-09 22:53:07 +00:00
Svetoslav Ganov
3e5318496e
Merge "Don't send user to permissions screen if none requested" into nyc-dev
2016-06-09 22:45:49 +00:00
Roozbeh Pournader
3697dbeaa3
Use existing localizations for formatting data usage [DO NOT MERGE]
...
This partially reverts I5be9bb7ce3b11709117da698d6c03610f4e5e40e in
order to use existing localizations and also avoid hard to localize
strings.
Also, we now bidi wrap the usage value, since it may break in the RTL
locales otherwise.
Bug: 28747101
Change-Id: Ibc03632cccfe671164cfbb670a423ada1177db65
2016-06-09 13:25:56 -07:00
Svet Ganov
30ee6ab320
Don't send user to permissions screen if none requested
...
bug:29105157
Change-Id: I90ef18f41deae9a7cf28192bd47f16c3af262c29
2016-06-09 12:28:10 -07:00
Jason Monk
feee247e0c
Fix build
...
Change-Id: I264b0d9507e62ad5a2debad663faedd549414012
(cherry picked from commit e3ce6713d3
2016-06-08 21:29:48 +00:00
Jason Monk
167f6cc87c
Merge \"Remove PreferenceActivity\" into nyc-dev
...
am: 7f7092c705
2016-06-08 19:15:42 +00:00
Jason Monk
2c7e1d844f
Merge \"Fix data usage format strings\" into nyc-dev
...
am: cb1972b908
2016-06-08 19:15:42 +00:00
Jason Monk
4db5484a9d
Merge \"Fix disabling of tiles that are not relevant\" into nyc-dev
...
am: 9c5d3164f5
2016-06-08 19:15:41 +00:00
Jason Monk
7f7092c705
Merge "Remove PreferenceActivity" into nyc-dev
2016-06-08 19:13:05 +00:00
Jason Monk
cb1972b908
Merge "Fix data usage format strings" into nyc-dev
2016-06-08 19:11:51 +00:00
Jason Monk
9c5d3164f5
Merge "Fix disabling of tiles that are not relevant" into nyc-dev
2016-06-08 19:10:09 +00:00
Ricky Wai
263b210c16
Merge \"Make work challenge settings work even work profile is not enabled yet\" into nyc-dev
...
am: 68c263cf2e
2016-06-08 14:47:43 +00:00
Ricky Wai
68c263cf2e
Merge "Make work challenge settings work even work profile is not enabled yet" into nyc-dev
2016-06-08 14:34:02 +00:00
Jason Monk
b7e4380cd2
Remove PreferenceActivity
...
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.
Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Ricky Wai
7250016447
Make work challenge settings work even work profile is not enabled yet
...
Bug: 29090660
Change-Id: I21996700f1ee451e8420f3f257c6ed51feea4ecb
2016-06-08 13:33:57 +00:00
Jim Miller
6233c1d0bc
Merge \"Move legacy full disk encryption code to Settings.\" into nyc-dev
...
am: f8c64089b1
2016-06-08 00:38:35 +00:00
TreeHugger Robot
f8c64089b1
Merge "Move legacy full disk encryption code to Settings." into nyc-dev
2016-06-08 00:31:30 +00:00
Jim Miller
358ff29f38
Move legacy full disk encryption code to Settings.
...
Fixes bug 27617297
Change-Id: Ib975cf8d4f2e1e7fa8a77550ca4ee8233647e9db
2016-06-07 15:44:46 -07:00
Jason Monk
5862c1ef02
Fix disabling of tiles that are not relevant
...
- Fix restricted user tiles being disabled
- Call new better method in SettingsDrawerActivity for disabling
Change-Id: I2fb6ddd3d505189d2b6d96c0a1039291b80a2f70
Fixes: 29080209
2016-06-07 14:02:33 -04:00
Robin Lee
cff703e68a
Merge "Restrict Settings always-on to NYC+" into nyc-dev
...
am: 8f2c17e12c
2016-06-06 21:09:29 +00:00
Robin Lee
8f2c17e12c
Merge "Restrict Settings always-on to NYC+" into nyc-dev
2016-06-06 20:59:01 +00:00
Jason Monk
aa5a8a6a4c
Fix data usage format strings
...
Bug: 28747101
Change-Id: I5be9bb7ce3b11709117da698d6c03610f4e5e40e
2016-06-06 16:39:55 -04:00
Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Sudheer Shanka
7469d799a8
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:13:09 +00:00
TreeHugger Robot
a433fd2429
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
2016-06-03 17:02:51 +00:00
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
Sudheer Shanka
8b72e563ec
Avoid triggering device admin settings in non-current user.
...
Bug: 28953755
Change-Id: Ic9f6f57b1ef4cc1de2d1ea227b17faf4334ffec8
2016-06-02 12:40:22 -07: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
