PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev

Browse Source 
* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control
This commit is contained in:
Zoltan Szatmary-Ban
2014-09-04 12:45:17 +00:00
committed by Android Git Automerger
parent 0635a3b9dd c91d2cd082
commit c465867bde
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -406,6 +406,8 @@
android:value="com.android.settings.vpn2.VpnSettings" /> android:value="com.android.settings.vpn2.VpnSettings" />
<meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID" <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
android:resource="@id/wireless_settings" /> android:resource="@id/wireless_settings" />
<meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
android:value="true" />
</activity> </activity>
<activity android:name="Settings$DateTimeSettingsActivity" <activity android:name="Settings$DateTimeSettingsActivity"