Merge "Add a plus button to the mobile pref on Network & internet page"
This commit is contained in:
committed by
Android (Google) Code Review
commit
a0690b3d2e
30
res/layout/preference_widget_add.xml
Normal file
30
res/layout/preference_widget_add.xml
Normal file
@@ -0,0 +1,30 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
Copyright (C) 2019 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.
|
||||
-->
|
||||
|
||||
<ImageView
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/add_preference_widget"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:paddingStart="?android:attr/listPreferredItemPaddingEnd"
|
||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||
android:background="?android:attr/selectableItemBackground"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_add_24dp"
|
||||
android:contentDescription="@string/add" />
|
||||
|
||||
@@ -658,6 +658,8 @@
|
||||
<string name="apply">Apply</string>
|
||||
<!-- Button label for generic share action [CHAR LIMIT=20] -->
|
||||
<string name="share">Share</string>
|
||||
<!-- Button label for generic add action [CHAR LIMIT=20] -->
|
||||
<string name="add">Add</string>
|
||||
|
||||
<!-- Title of the Settings activity shown within the application itself. -->
|
||||
<string name="settings_label">Settings</string>
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
android:key="add_more"
|
||||
android:title="@string/mobile_network_list_add_more"
|
||||
android:icon="@drawable/ic_menu_add"
|
||||
android:order="100" />
|
||||
android:order="100" >
|
||||
<intent android:action="android.telephony.euicc.action.PROVISION_EMBEDDED_SUBSCRIPTION" />
|
||||
</Preference>
|
||||
|
||||
</PreferenceScreen>
|
||||
|
||||
@@ -39,7 +39,7 @@
|
||||
android:targetClass="Settings$WifiSettingsActivity" />
|
||||
</com.android.settings.widget.MasterSwitchPreference>
|
||||
|
||||
<com.android.settingslib.RestrictedPreference
|
||||
<com.android.settings.widget.AddPreference
|
||||
android:key="mobile_network_list"
|
||||
android:title="@string/network_settings_title"
|
||||
android:summary="@string/summary_placeholder"
|
||||
|
||||
Reference in New Issue
Block a user