OSDN Git Service
Bill Yi [Tue, 21 Jun 2016 16:56:44 +0000 (16:56 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
f315e2e6f0 -s ours
Change-Id: I8216d1ead0653fff4d1a335f11ff92879d587fcc
TreeHugger Robot [Tue, 21 Jun 2016 16:53:39 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 21 Jun 2016 16:53:25 +0000 (16:53 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Sunny Goyal [Tue, 21 Jun 2016 16:39:33 +0000 (16:39 +0000)]
Merge "Adding custom manifest shortcuts in Settings app" into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 15:57:08 +0000 (15:57 +0000)]
Fix non-app non-user preferences in Settings > Data usage
am:
afea1cae25
Change-Id: I55e991f5cd9c39a740dd62945fe113ee59ea18a9
Fan Zhang [Tue, 21 Jun 2016 15:28:29 +0000 (15:28 +0000)]
Merge "Log button taps in support tab." into nyc-mr1-dev
Zoltan Szatmary-Ban [Tue, 21 Jun 2016 11:57:30 +0000 (12:57 +0100)]
Fix non-app non-user preferences in Settings > Data usage
Bug:
29466113
Change-Id: Ib7a6d477146a856c0cb9c49143ffbf4fb99e38ed
Bill Yi [Tue, 21 Jun 2016 11:40:02 +0000 (04:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia258f44583c5690bd396d20517e1309807c659ad
Auto-generated-cl: translation import
Bill Yi [Tue, 21 Jun 2016 11:28:46 +0000 (04:28 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iebfc06a928c222879aceec01c3aaf35f2cf78561
Auto-generated-cl: translation import
Sunny Goyal [Wed, 15 Jun 2016 19:36:50 +0000 (12:36 -0700)]
Adding custom manifest shortcuts in Settings app
Bug:
28298258
Change-Id: Ie7fd86a999fa2abe2522adfb29573b86f36db3a5
Julia Reynolds [Mon, 20 Jun 2016 19:08:43 +0000 (19:08 +0000)]
Merge \"Fix NPE printing notification actions.\" into nyc-dev
am:
43b04bcc7d
Change-Id: I427adea08ff2a9f50c0d54329ae1b5adcca508c8
Julia Reynolds [Mon, 20 Jun 2016 18:43:04 +0000 (18:43 +0000)]
Merge "Fix NPE printing notification actions." into nyc-dev
Jason Monk [Mon, 20 Jun 2016 17:29:24 +0000 (17:29 +0000)]
Fix focusability of battery history chart
am:
9c6ab88bd7
Change-Id: I8239280074c191c98414e57c0c915463ade9ec9c
Fan Zhang [Fri, 17 Jun 2016 00:28:27 +0000 (17:28 -0700)]
Log button taps in support tab.
Bug:
29282762
Change-Id: I7d573f95450292840413cb5e266915f64f6d667d
Fan Zhang [Mon, 20 Jun 2016 16:35:51 +0000 (16:35 +0000)]
Merge "Add a "Do not show" checkbox in support disclaimer dialog." into nyc-mr1-dev
Jason Monk [Mon, 20 Jun 2016 15:04:43 +0000 (11:04 -0400)]
Fix focusability of battery history chart
Change-Id: I0bd0da84a08ed6e3c51da3dc6a68e878c5c0d3cd
Fixes:
29453492
Julia Reynolds [Mon, 20 Jun 2016 14:23:44 +0000 (10:23 -0400)]
Fix NPE printing notification actions.
Change-Id: Icb52e7bc632bf7109a75a7695fb253b2183e7360
Fixes:
29017025
TreeHugger Robot [Sat, 18 Jun 2016 04:02:49 +0000 (04:02 +0000)]
Merge "Hide 'Update Emergecy Address' preference w/o carrier support" into nyc-mr1-dev
Fan Zhang [Fri, 17 Jun 2016 20:15:46 +0000 (20:15 +0000)]
Merge "Use metrics defined by proto in new Settings tabs." into nyc-mr1-dev
Fan Zhang [Fri, 17 Jun 2016 18:20:52 +0000 (11:20 -0700)]
Add a "Do not show" checkbox in support disclaimer dialog.
Bug:
28762823
Change-Id: I8fe0a82efbb47c8b2f9e34480005fa108583b203
Doris Ling [Fri, 17 Jun 2016 18:15:57 +0000 (18:15 +0000)]
Merge "Add handling for fingerprint swipe in gesture settings." into nyc-mr1-dev
Jason Monk [Fri, 17 Jun 2016 17:52:01 +0000 (17:52 +0000)]
Merge \"Protect against crash in memory details\" into nyc-dev
am:
c3ec1ab889
Change-Id: If36b3350e0694ffae3086be9307295c4516828dd
Jason Monk [Fri, 17 Jun 2016 17:52:01 +0000 (17:52 +0000)]
Make sure screen pinning desc is part of view hierarchy
am:
0c2ccba2f9
Change-Id: Iac6d8d4df22fb8e32e61ad25aed06e079d1fa348
Jason Monk [Fri, 17 Jun 2016 17:22:03 +0000 (17:22 +0000)]
Merge "Protect against crash in memory details" into nyc-dev
Jason Monk [Fri, 17 Jun 2016 14:12:37 +0000 (10:12 -0400)]
Protect against crash in memory details
Change-Id: Ie80efa04d0c6bc9c117802e5a7018d448f4dc7b8
Fixes:
29308942
Jason Monk [Fri, 17 Jun 2016 14:05:06 +0000 (10:05 -0400)]
Make sure screen pinning desc is part of view hierarchy
Change-Id: I2c2e25e129d8530512e1a1f4ee6a7483b5322286
Fixes:
29243233
Adrian Roos [Fri, 17 Jun 2016 01:54:50 +0000 (18:54 -0700)]
resolve merge conflicts of
333ba2d to nyc-mr1-dev
Change-Id: I32f284bb2216755ae0ddbea4b7fc76a38c7aa7e2
Ajay Kumar Nadathur Sreenivasan [Fri, 17 Jun 2016 01:18:00 +0000 (01:18 +0000)]
Merge "[SetupWizard] Fix talkback on lock screen." into nyc-mr1-dev
Meng Wang [Thu, 16 Jun 2016 01:17:06 +0000 (18:17 -0700)]
Hide 'Update Emergecy Address' preference w/o carrier support
Bug:
29256401
Change-Id: I59f9d6192d39e2a259e3f2cbee641335d5b8b8d7
Adrian Roos [Thu, 16 Jun 2016 23:33:55 +0000 (23:33 +0000)]
Merge "Remove RemoteInput on lockscreen setting" into nyc-dev
Fan Zhang [Fri, 6 May 2016 17:52:26 +0000 (10:52 -0700)]
Use metrics defined by proto in new Settings tabs.
Bug:
28141203
Change-Id: Ia0c566f873f93e46203d19f35161bb98acc60a38
Maurice Lam [Thu, 16 Jun 2016 23:15:44 +0000 (16:15 -0700)]
Center pattern lock screen vertically
Pull the header into the content area, so that the pattern view on
the right side can be centered overall, rather than centered starting
below the title.
Bug:
24405946
Change-Id: I6c9cfe8175014e40c9e1fc78d4c15e027860d8fe
Maurice Lam [Thu, 16 Jun 2016 22:00:20 +0000 (22:00 +0000)]
Merge "Use GLIF theme for Settings > Security > Screen lock" into nyc-mr1-dev
Ajay Nadathur [Thu, 16 Jun 2016 21:07:27 +0000 (14:07 -0700)]
[SetupWizard] Fix talkback on lock screen.
- On volantis, talkback will now speak 'Protect your tablet' instead of
'Choose screen lock'
Testing:
-------
- Tested and verified on volantis
Change-Id: If010ab8f3fcd107b99294081765a52e98ed8cc1f
Yohei Yukawa [Thu, 16 Jun 2016 21:40:53 +0000 (21:40 +0000)]
Merge \"Teach hard keyboard settings about correct user ID\" into nyc-dev
am:
db6f1f2cb5
Change-Id: Ie47fd6128435c75cc08d3d478a23c442f44a514c
Yohei Yukawa [Thu, 16 Jun 2016 21:24:04 +0000 (21:24 +0000)]
Merge "Teach hard keyboard settings about correct user ID" into nyc-dev
Adrian Roos [Thu, 16 Jun 2016 20:28:44 +0000 (13:28 -0700)]
Remove RemoteInput on lockscreen setting
Bug:
29370898
Change-Id: I6fef3deb55357e8569e023968967663582974f79
Doris Ling [Thu, 16 Jun 2016 19:30:53 +0000 (12:30 -0700)]
Add handling for fingerprint swipe in gesture settings.
Hide fingerprint swipe setting if it is not supported, and update the
corresponding config when user enable/disable the fingerprint gesture.
Bug:
28565958
Change-Id: I5a124d3b6933ea6d3aadceaa0eecaa4bee2ccd9d
Maurice Lam [Wed, 15 Jun 2016 20:39:34 +0000 (13:39 -0700)]
Use GLIF theme for Settings > Security > Screen lock
Bug:
24405946
Change-Id: I1fed96cbc228b6bb367637f83f9cd3bac2761417
Doris Ling [Thu, 16 Jun 2016 18:52:30 +0000 (18:52 +0000)]
Merge "Update gesture related settings in Display." into nyc-mr1-dev
Doris Ling [Tue, 14 Jun 2016 18:21:57 +0000 (11:21 -0700)]
Update gesture related settings in Display.
1. Remove "Press power button twice for camera. Toggle is now available
in Settings->Gestures.
2. Remove toggle from "Ambient Display" and make it point to
Settings->Gestures->Quick screen check.
Bug:
28565958
Change-Id: I32fd2253a40be76ac9843a627df153eb4f1307d8
TreeHugger Robot [Thu, 16 Jun 2016 10:35:08 +0000 (10:35 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Thu, 16 Jun 2016 10:28:56 +0000 (10:28 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
32b427b137 -s ours
Change-Id: I829656295916ec3bbd89ff9ca71dad569beca264
TreeHugger Robot [Thu, 16 Jun 2016 10:25:12 +0000 (10:25 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Thu, 16 Jun 2016 09:03:59 +0000 (02:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6520ea1418dac76ad17a77c0ddd393cc7a41938
Auto-generated-cl: translation import
Bill Yi [Thu, 16 Jun 2016 08:52:41 +0000 (01:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9909b1c75f95258630ca3b014768b5a7afcd8411
Auto-generated-cl: translation import
Yohei Yukawa [Thu, 16 Jun 2016 07:02:01 +0000 (00:02 -0700)]
Teach hard keyboard settings about correct user ID
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD is a per-user settings.
PhysicalKeyboardFragment needs to use the current user's ID rather than
hard-coded user ID 0.
Bug:
29406181
Change-Id: Ie40f729f3c85e9ce9ad8f957caba338786b119d9
Roozbeh Pournader [Thu, 16 Jun 2016 01:59:37 +0000 (01:59 +0000)]
BidiFormat adapter name for bluetooth_is_visible_message
am:
77893a4c4b
Change-Id: I2df1050e9b9cb20e369fca56e3e457a3cf2a0397
Daniel Nishi [Wed, 15 Jun 2016 22:14:08 +0000 (22:14 +0000)]
Merge "Show storage manager settings using a system property." into nyc-mr1-dev
Roozbeh Pournader [Wed, 15 Jun 2016 21:37:30 +0000 (14:37 -0700)]
BidiFormat adapter name for bluetooth_is_visible_message
Previously, adapter names which tend to be LTR and may appear at the
beginning of the string could cause the detected bidi direction of the whole
string (which would be RTL in RTL locales) to get miscalculated as LTR.
With this fix, not only the detected bidi direction would be correct,
but also odd adapter names would not impact the bidi layout of the
whole string.
Bug:
28816891
Change-Id: I1d25edbeeff7e9c013bb6c741e7f706431e721dc
Chris Wren [Wed, 15 Jun 2016 18:17:52 +0000 (18:17 +0000)]
Merge \"log as counters instead of histograms\" into nyc-dev
am:
6913b6118f
Change-Id: Ic3178f2514097df73527f446a5daf11fc6c25acc
TreeHugger Robot [Wed, 15 Jun 2016 18:13:52 +0000 (18:13 +0000)]
Merge "log as counters instead of histograms" into nyc-dev
Daniel Nishi [Tue, 14 Jun 2016 00:37:06 +0000 (17:37 -0700)]
Show storage manager settings using a system property.
This removes a Settings-only configuration on whether or not the
storage manager is enabled and replaced it with a system property.
Bug:
29336081
Change-Id: I2328c213f5f11f89bf0fe61e77d3062459036fc3
Maurice Lam [Wed, 15 Jun 2016 17:07:54 +0000 (17:07 +0000)]
Merge "Update UI style for GLIF buttons" into nyc-mr1-dev
Maurice Lam [Wed, 15 Jun 2016 17:07:27 +0000 (17:07 +0000)]
Merge "Fingerprint string updates" into nyc-mr1-dev
Jason Monk [Wed, 15 Jun 2016 16:59:09 +0000 (16:59 +0000)]
Merge \"Fix SimStatus updatePhoneInfos\" into nyc-dev
am:
b53117f55c
Change-Id: I49ceb02471844e719da35f1939c329f317b6953b
TreeHugger Robot [Wed, 15 Jun 2016 16:48:45 +0000 (16:48 +0000)]
Merge "Fix SimStatus updatePhoneInfos" into nyc-dev
Ricky Wai [Wed, 15 Jun 2016 16:38:28 +0000 (16:38 +0000)]
Merge \"Remove work fingerprints when primary profile lock is removed\" into nyc-dev
am:
42cbbc3052
Change-Id: Ia46cdcee9c65d7394896e34e216f19dc1e7a5d31
Jason Monk [Wed, 15 Jun 2016 16:37:16 +0000 (16:37 +0000)]
Merge "resolve merge conflicts of
f4ad443 to nyc-mr1-dev" into nyc-mr1-dev
Chris Wren [Wed, 15 Jun 2016 15:44:16 +0000 (11:44 -0400)]
log as counters instead of histograms
this will interoperate better with UMA
Bug:
26687914
Change-Id: Ie63b2be2d457054c96b070ada3bb92141ab1fb5a
Fan Zhang [Wed, 15 Jun 2016 16:15:53 +0000 (16:15 +0000)]
Merge "Remove forum link from support tab." into nyc-mr1-dev
Ricky Wai [Wed, 15 Jun 2016 16:02:18 +0000 (16:02 +0000)]
Merge "Remove work fingerprints when primary profile lock is removed" into nyc-dev
Jason Monk [Wed, 15 Jun 2016 15:31:14 +0000 (11:31 -0400)]
resolve merge conflicts of
f4ad443 to nyc-mr1-dev
Change-Id: I1d8a3f1cb62ee7d5f39e120c613ae45d495f0fb7
Jason Monk [Wed, 15 Jun 2016 14:23:18 +0000 (10:23 -0400)]
Fix SimStatus updatePhoneInfos
Looks like we got updatePhoneInfos in the right place for IccLockSettings
but not SimStatus.
Also return the right view in onCreateView
Change-Id: Ifd4cbd93351bb05571ed5a9873e9352c7c3a2357
Fixes:
29335528
Jason Monk [Wed, 15 Jun 2016 14:53:43 +0000 (14:53 +0000)]
Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev
Maurice Lam [Wed, 15 Jun 2016 02:14:37 +0000 (19:14 -0700)]
Fingerprint string updates
Bug:
29119674
Change-Id: I22489507b3c215bac6cf1b3d4e201448be1dc999
Maurice Lam [Wed, 15 Jun 2016 01:35:37 +0000 (18:35 -0700)]
Update UI style for GLIF buttons
Bug:
29105355
Change-Id: I9dfb8b6fb40242298bf1d7caa18cd7fbd2f62725
Julia Reynolds [Tue, 14 Jun 2016 22:30:19 +0000 (22:30 +0000)]
Merge \"Prevent users from blocking system notifications.\" into nyc-dev
am:
b2301cb4c2
Change-Id: I9d5f2f4957bdc86ab25e0436100f5b126cb97bb7
TreeHugger Robot [Tue, 14 Jun 2016 22:25:25 +0000 (22:25 +0000)]
Merge "Prevent users from blocking system notifications." into nyc-dev
Fan Zhang [Tue, 14 Jun 2016 20:01:45 +0000 (13:01 -0700)]
Remove forum link from support tab.
Bug:
29356288
Change-Id: I95c737d8249eb5689f09e037016832e25bbf9244
Fan Zhang [Tue, 14 Jun 2016 19:44:48 +0000 (12:44 -0700)]
Align text for conditions with text for other tiles.
Bug:
29107343
Text should be 72dp from left of screen, not 76dp.
Change-Id: I86cb015ed2e574c3f16fb642d7c3653a6f2a017f
Fan Zhang [Tue, 14 Jun 2016 19:26:28 +0000 (19:26 +0000)]
Merge "Support tab UI polish." into nyc-mr1-dev
Sanket Padawe [Tue, 14 Jun 2016 18:04:52 +0000 (18:04 +0000)]
Fix bug in Sim Status Settings.
am:
fb87919fde
Change-Id: I4bc932a15028e6e24bc62e21f7f5149ce7355899
Fan Zhang [Mon, 13 Jun 2016 20:50:13 +0000 (13:50 -0700)]
Support tab UI polish.
Bug:
29107343
Bug:
29101595
1) Changing the font weight of the tabs to Medium
2) Changing the tab indicator color
3) Increasing the padding on the top and bottom of the entire suggestion
space (from 6dp to 8dp)
4) Balancing the space of list components within their perspective list
heights
5) Adjusting the padding on the right side to improve alignment
6) Changing "Suggestions" and suggestions counter font weight and size
7) Removing the drop shadow on the bottom of the suggestion space
8) "More help" subheader has been removed
9) Use 54% #000000 as tint color for more help icons.
Change-Id: If3e1c5ce2701422fba6185e7fa340abccc9bd30c
Sanket Padawe [Tue, 14 Jun 2016 17:12:39 +0000 (10:12 -0700)]
Fix bug in Sim Status Settings.
Bug:
29332493
Change-Id: Idd519e704ce6fdd0b92319948bdf02c0fa45ff34
Sunny Goyal [Tue, 14 Jun 2016 16:51:09 +0000 (16:51 +0000)]
Merge "Changing the WallpaperSuggestionActivity to redirect to the actual wallpaper picker component defined in the config." into nyc-mr1-dev
Sunny Goyal [Mon, 13 Jun 2016 22:28:47 +0000 (15:28 -0700)]
Changing the WallpaperSuggestionActivity to redirect to the actual
wallpaper picker component defined in the config.
Bug:
28554244
Change-Id: Iebd38b8fee13608e060acb2b52332014c5c3d87e
Anna Galusza [Tue, 14 Jun 2016 16:09:23 +0000 (16:09 +0000)]
Merge "Remove "Help & feedback" from toggle screen for accessibility services to prevent confusion when users are trying to submit feedback for a specific accessibility service (accessibility services can place their own "Help & feedabck" in their apks and route it appropriately). Bug:
29278252" into nyc-mr1-dev
Ricky Wai [Mon, 13 Jun 2016 14:48:27 +0000 (15:48 +0100)]
Remove work fingerprints when primary profile lock is removed
Bug:
29264034
Change-Id: Ia4043e8a4f4481ff72b8d7069fd139a381158083
Bill Yi [Tue, 14 Jun 2016 12:09:38 +0000 (12:09 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am:
7221f5b6b4 -s ours
Change-Id: I638873a702599a87476abd1ef92734099dca3c76
TreeHugger Robot [Tue, 14 Jun 2016 12:04:54 +0000 (12:04 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Tue, 14 Jun 2016 11:47:33 +0000 (11:47 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Tue, 14 Jun 2016 10:33:30 +0000 (03:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I06952539cefb81ca62a8fde4455f1f3e3ba92f67
Auto-generated-cl: translation import
Bill Yi [Tue, 14 Jun 2016 10:17:02 +0000 (03:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4dca3edd37931754e3ba3d6152bde6fe235e7b42
Auto-generated-cl: translation import
Julia Reynolds [Tue, 14 Jun 2016 01:57:37 +0000 (01:57 +0000)]
DND header should be translated.
am:
5a67d5f6f0
Change-Id: I238ebd6abe78925fde071b3fb09b27690e6d6311
Julia Reynolds [Mon, 13 Jun 2016 16:55:20 +0000 (12:55 -0400)]
DND header should be translated.
Change-Id: Iac764d71e91f5a0dc1b58bfca8a38d823f0598b9
Fixes:
29123731
TreeHugger Robot [Mon, 13 Jun 2016 22:01:45 +0000 (22:01 +0000)]
Merge "Added new setting for gestures." into nyc-mr1-dev
Daniel Nishi [Mon, 13 Jun 2016 21:18:28 +0000 (21:18 +0000)]
Merge "Use Settings.Secure for days to retain." into nyc-mr1-dev
Doris Ling [Tue, 24 May 2016 00:06:26 +0000 (17:06 -0700)]
Added new setting for gestures.
Added a new entry to the top level Settings' Device section to
enable/disable gestures.
Bug:
28565958
Change-Id: Icf642b6a3058c692fb2be9914579996598f03b7d
Daniel Nishi [Fri, 10 Jun 2016 20:56:16 +0000 (13:56 -0700)]
Use Settings.Secure for days to retain.
Previously, we used Shared Preferences, which worked when the
storage manager was localized to Settings. Now that it is in
its own separate APK, we need to use a separate setting to configure
it.
Bug:
28965462
Change-Id: I073859ef1a764679bbc63d3c0cd96af82306212e
Michal Karpinski [Mon, 13 Jun 2016 17:40:13 +0000 (17:40 +0000)]
Merge \"Remove \'You can choose to either trust or remove this certificate\' from Check certificate dialog\" into nyc-dev
am:
86c9894f04
Change-Id: I7d2252a50b54c765e2c2a9837ca181861a7bae35
TreeHugger Robot [Mon, 13 Jun 2016 17:29:21 +0000 (17:29 +0000)]
Merge "Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog" into nyc-dev
Jason Monk [Mon, 13 Jun 2016 17:08:32 +0000 (13:08 -0400)]
Make linkify handle emptys urls better DO NOT MERGE
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes:
29045818
Julia Reynolds [Mon, 13 Jun 2016 16:49:45 +0000 (12:49 -0400)]
Prevent users from blocking system notifications.
Change-Id: I1864d54b01e4db03393078504b8f592ee41ed1c2
Fixes:
29191134
Robin Lee [Mon, 13 Jun 2016 16:15:20 +0000 (16:15 +0000)]
Merge \"Respect DISALLOW_CONFIG_VPN for disconnect dialog\" into nyc-dev
am:
cab4f9dc39
Change-Id: Iaab70bd402967dd628958abbbc06a469cea01b49
Robin Lee [Mon, 13 Jun 2016 16:03:54 +0000 (16:03 +0000)]
Merge "Respect DISALLOW_CONFIG_VPN for disconnect dialog" into nyc-dev
Michal Karpinski [Mon, 13 Jun 2016 15:52:58 +0000 (16:52 +0100)]
Remove 'You can choose to either trust or remove this certificate' from Check certificate dialog
Removing because user might not be able to remove (because the option is disallowed).
Bug:
29102580
Change-Id: I4aaedb2a74742a891e95c65e39d0f702377e6836
Robin Lee [Mon, 13 Jun 2016 13:19:44 +0000 (14:19 +0100)]
Respect DISALLOW_CONFIG_VPN for disconnect dialog
Change-Id: Idfe3899e81eec5efdbd5700bdc65921de6853898
Fix:
29265163
Nicolas Prevot [Mon, 13 Jun 2016 12:50:11 +0000 (12:50 +0000)]
Merge \"Fix rendering of policy transparency activity.\" into nyc-dev
am:
98704bc495
Change-Id: I42bba7f5351b214b45255d9e48c3c6802b306b14
Nicolas Prévot [Mon, 13 Jun 2016 12:37:05 +0000 (12:37 +0000)]
Merge "Fix rendering of policy transparency activity." into nyc-dev