Offer Ethernet data when present, and better handling of devices with various radio combinations. Include "setprop" to help testing in future. Adopt new NetworkTemplate building in framework, and avoid crash when AsyncTask finishes after Fragment is removed. Bug: 5026016, 5029874 Change-Id: Ib7ab501d0111b9860a91c248193919663d47f2a2
46 lines
1.9 KiB
XML
46 lines
1.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2011 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
|
<item
|
|
android:id="@+id/action_settings"
|
|
android:icon="@drawable/ic_sysbar_quicksettings"
|
|
android:showAsAction="always">
|
|
<menu>
|
|
<item
|
|
android:id="@+id/data_usage_menu_roaming"
|
|
android:title="@string/data_usage_menu_roaming"
|
|
android:checkable="true" />
|
|
<item
|
|
android:id="@+id/data_usage_menu_restrict_background"
|
|
android:title="@string/data_usage_menu_restrict_background"
|
|
android:checkable="true" />
|
|
<item
|
|
android:id="@+id/data_usage_menu_split_4g"
|
|
android:title="@string/data_usage_menu_split_4g"
|
|
android:checkable="true" />
|
|
<item
|
|
android:id="@+id/data_usage_menu_show_wifi"
|
|
android:title="@string/data_usage_menu_show_wifi"
|
|
android:checkable="true" />
|
|
<item
|
|
android:id="@+id/data_usage_menu_show_ethernet"
|
|
android:title="@string/data_usage_menu_show_ethernet"
|
|
android:checkable="true" />
|
|
</menu>
|
|
</item>
|
|
</menu>
|