Robin Lee
cfc0fb02c1
Restrict Settings always-on to NYC+
...
Bug: 28413917
Change-Id: I1c40bdc94bb05d21daf589840adbbf04abe6c10f
2016-06-06 17:04:36 +00:00
Andrew Sapperstein
6c52398695
Merge "Add safety & regulatory info to "about device"." into nyc-mr1-dev
2016-06-03 22:22:38 +00:00
Bill Yi
1f055cb81d
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: edafefc1ed
2016-06-03 22:21:49 +00:00
Jason Monk
8a1d371239
Merge "Fix accidental non-translatable string" into nyc-dev
...
am: 8c5dccc6bf
2016-06-03 22:21:47 +00:00
TreeHugger Robot
edafefc1ed
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-03 19:22:57 +00:00
TreeHugger Robot
6c3dac1f89
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-03 19:18:31 +00:00
Jason Monk
8c5dccc6bf
Merge "Fix accidental non-translatable string" into nyc-dev
2016-06-03 19:12:09 +00:00
Jason Monk
18b603f84f
Fix accidental non-translatable string
...
Bug: 29034697
Change-Id: If45ef25db1d23fd2ce83ca3119fa63c0ebbcdead
2016-06-03 15:06:56 -04:00
Bill Yi
ed57d2f783
Import translations. DO NOT MERGE
...
Change-Id: Ief4e4adccef8f8a438e629d07e3129f3441293b6
Auto-generated-cl: translation import
2016-06-03 10:43:44 -07:00
Sudheer Shanka
377623b6ee
Merge "Avoid triggering device admin settings in non-current user." into nyc-dev
...
am: a433fd2429
2016-06-03 17:14:43 +00:00
Bill Yi
73642fd30c
Import translations. DO NOT MERGE
...
Change-Id: Iafa80717a736b94e0ef1ccd8eaa42b61379349e2
Auto-generated-cl: translation import
2016-06-03 10:09:43 -07: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
Makoto Onuki
622992625f
Fix RTL layout
...
am: 3a87050921
2016-06-03 15:33:52 +00:00
Makoto Onuki
3a87050921
Fix RTL layout
...
Bug 29072224
Change-Id: I414d868b4256e034850a873511bf34d9430842dc
2016-06-02 17:52:17 -07:00
Fyodor Kupolov
a015e6ca16
Merge "Make prefs without an action unselectable" into nyc-dev
...
am: 9121169dca
2016-06-02 22:49:07 +00:00
Fyodor Kupolov
9121169dca
Merge "Make prefs without an action unselectable" into nyc-dev
2016-06-02 22:30:22 +00:00
Andrew Sapperstein
1fad9af3c7
Add safety & regulatory info to "about device".
...
Renamed "Regulatory information" to "Regulatory labels"
and added a new option called "Safety & regulatory information".
The new option only shows if an activity exists that can
accept android.settings.SHOW_SAFETY_AND_REGULATORY_INFO intents.
BUG: 27876015
Change-Id: Iaf9588658eb7919b330ac8b3d673b8e81a4f76dc
2016-06-02 14:12:19 -07: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
c687e9bfbd
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
718c84f121
resolve merge conflicts of 67e87fa to nyc-mr1-dev
...
Change-Id: I8c5a79de3176912a1803a481b8b179faf1dad178
2016-06-01 16:20:01 -04:00
Jason Monk
67e87fa4e9
Merge "onResume -> onStart, onPause -> onStop" into nyc-dev
2016-06-01 20:09:00 +00:00
Sudheer Shanka
4080861e75
Merge "Start DeviceAdminSettings in a new task from support dialog." into nyc-dev
...
am: df66d4abf0
2016-06-01 18:39:24 +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
7e1b47347a
Merge "Fix some top-level settings not updating with language" into nyc-dev
...
am: ed70356506
2016-06-01 17:39:13 +00:00
Jason Monk
6548f7f3f5
Merge "Cache account prefs so we don\'t lose a11y focus" into nyc-dev
...
am: 9791704411
2016-06-01 17:30:19 +00:00
Jason Monk
f4c27c2689
Merge "Fix apps spinner jank." into nyc-dev
...
am: ad302548ea
2016-06-01 17:30:13 +00:00
Jason Monk
ed70356506
Merge "Fix some top-level settings not updating with language" into nyc-dev
2016-06-01 17:27:49 +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
Bill Yi
b925300049
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: fb9e8e3188
2016-06-01 15:22:23 +00:00
TreeHugger Robot
fb9e8e3188
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-06-01 15:14:12 +00:00
TreeHugger Robot
da38e871de
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
2016-06-01 15:12:42 +00:00
Robin Lee
849edeb23e
Disable restricted VPN actions onResume
...
am: 52541536d0
2016-06-01 14:22:07 +00:00
Bill Yi
d3cf866b7c
Import translations. DO NOT MERGE
...
Change-Id: I6e36edcd4fa922050390eb4f0e934b910b0a33c6
Auto-generated-cl: translation import
2016-06-01 06:40:08 -07:00
Bill Yi
824b1f09f7
Import translations. DO NOT MERGE
...
Change-Id: I19e1428a2e4ec2971c4aa611345a3372cc7ef4e3
Auto-generated-cl: translation import
2016-06-01 06:23:22 -07: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
5ab70294ed
Merge "Show different strings when PO/DO user approves a cert" into nyc-dev
...
am: 36522e8854
2016-06-01 10:13:52 +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
Tony Mak
caeb93ceda
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
...
am: ffb10f8156
2016-06-01 09:44:06 +00:00
Tony Mak
ffb10f8156
Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
2016-06-01 09:36:51 +00:00
Meng Wang
90e8e4713c
Launch E911 address management activity at turning on Wifi Calling
...
Bug: 28404126
Change-Id: Id551d784d151e5f24cfcec96e6cf4b999f39ce0f
2016-05-31 15:57:27 -07: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
Tony Mak
fe0ce01da7
Fix RTL issue in Trusted Credentail page
...
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
to resolve the random issue. I guess it is a framework bug, but
anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout
Bug: 28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
2016-05-31 19:53:49 +00:00
