Merge changes I7d29b58c,I2f1d22fb,I55e0fa2c into sc-v2-dev am: c8ee867f2d am: ca02377238

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16262278

Change-Id: Id27a7fed84ef5e33edddc4e951b77d7705d8e9be
This commit is contained in:
Zoey Chen
2021-11-18 20:27:46 +00:00
committed by Automerger Merge Worker
20 changed files with 48 additions and 481 deletions

View File

@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- @deprecated This class will be removed in Android U, use {@link network_provider_sims_list.xml}
instead.-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"

View File

@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- @deprecated This class will be removed in Android U, use {@link network_provider_internet.xml}
instead.-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"