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

Merge "Remove VPN Overflow menu" into nyc-dev

Browse Source 
am: 2037876

* commit '2037876888db8a33b28cf5f876b5e47deec0da72':
  Remove VPN Overflow menu

Change-Id: I248091e385321e75df345e4f5aab938a5fcec166
This commit is contained in:
Victor Chang
2016-03-29 18:59:46 +00:00
committed by android-build-merger
parent 2c1bfe37c1 2037876888
commit 24ac9d93ca
7 changed files with 83 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/vpn_dialog.xml
View File

@@ -132,6 +132,9 @@
<CheckBox style="@style/vpn_value" android:id="@+id/save_login"
android:singleLine="false"
android:text="@string/vpn_save_login"/>
<CheckBox style="@style/vpn_value" android:id="@+id/always_on_vpn"
android:singleLine="false"
android:text="@string/vpn_menu_lockdown"/>
</LinearLayout>
</LinearLayout>
</ScrollView>

4
res/menu/vpn.xml
View File

@@ -20,8 +20,4 @@
android:title="@string/vpn_create"
android:icon="@drawable/ic_menu_add_white"
android:showAsAction="always" />
<item
android:id="@+id/vpn_lockdown"
android:title="@string/vpn_menu_lockdown"
android:showAsAction="never" />
</menu>