Snap for 7714994 from cd2016c7a062b7e56f3b741cd2e342fafb0b7e63 to sc-qpr1-release (ec72c909) · Commits · e / os / android_packages_apps_Settings

res/raw/udfps_edu_lottie.json

+153 −153

Original line number	Diff line number	Diff line
		@@ -2,7 +2,7 @@
		"v": "5.7.13",
		"fr": 60,
		"ip": 0,
		"op": 481,
		"op": 541,
		"w": 300,
		"h": 289,
		"nm": "enrollment_edu_02",
		@@ -877,13 +877,13 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		100
		]
		},
		{
		"t": 410,
		"t": 440,
		"s": [
		0
		]
		@@ -908,9 +908,9 @@
		"hd": false
		}
		],
		"ip": 388,
		"op": 481,
		"st": 202,
		"ip": 418,
		"op": 630,
		"st": 232,
		"bm": 0
		},
		{
		@@ -1786,13 +1786,13 @@
		0
		]
		},
		"t": 350,
		"t": 380,
		"s": [
		100
		]
		},
		{
		"t": 364,
		"t": 394,
		"s": [
		0
		]
		@@ -1812,9 +1812,9 @@
		"hd": false
		}
		],
		"ip": 339,
		"op": 388,
		"st": 202,
		"ip": 369,
		"op": 418,
		"st": 232,
		"bm": 0
		},
		{
		@@ -2685,13 +2685,13 @@
		0
		]
		},
		"t": 305,
		"t": 335,
		"s": [
		100
		]
		},
		{
		"t": 318,
		"t": 348,
		"s": [
		0
		]
		@@ -2716,9 +2716,9 @@
		"hd": false
		}
		],
		"ip": 294,
		"op": 339,
		"st": 101,
		"ip": 324,
		"op": 369,
		"st": 131,
		"bm": 0
		},
		{
		@@ -3594,13 +3594,13 @@
		0
		]
		},
		"t": 255,
		"t": 285,
		"s": [
		100
		]
		},
		{
		"t": 269,
		"t": 299,
		"s": [
		0
		]
		@@ -3620,9 +3620,9 @@
		"hd": false
		}
		],
		"ip": 248,
		"op": 294,
		"st": 101,
		"ip": 278,
		"op": 324,
		"st": 131,
		"bm": 0
		},
		{
		@@ -4493,13 +4493,13 @@
		0
		]
		},
		"t": 202,
		"t": 232,
		"s": [
		100
		]
		},
		{
		"t": 215,
		"t": 245,
		"s": [
		0
		]
		@@ -4524,9 +4524,9 @@
		"hd": false
		}
		],
		"ip": 188,
		"op": 248,
		"st": 0,
		"ip": 218,
		"op": 278,
		"st": 30,
		"bm": 0
		},
		{
		@@ -5402,13 +5402,13 @@
		0
		]
		},
		"t": 155,
		"t": 185,
		"s": [
		100
		]
		},
		{
		"t": 169,
		"t": 199,
		"s": [
		0
		]
		@@ -5428,9 +5428,9 @@
		"hd": false
		}
		],
		"ip": 130,
		"op": 188,
		"st": 0,
		"ip": 160,
		"op": 218,
		"st": 30,
		"bm": 0
		},
		{
		@@ -6301,13 +6301,13 @@
		0
		]
		},
		"t": 108,
		"t": 138,
		"s": [
		100
		]
		},
		{
		"t": 119,
		"t": 149,
		"s": [
		0
		]
		@@ -6333,8 +6333,8 @@
		}
		],
		"ip": 0,
		"op": 130,
		"st": 0,
		"op": 160,
		"st": 30,
		"bm": 0
		},
		{
		@@ -7210,13 +7210,13 @@
		0
		]
		},
		"t": 62,
		"t": 92,
		"s": [
		100
		]
		},
		{
		"t": 76,
		"t": 106,
		"s": [
		0
		]
		@@ -7237,8 +7237,8 @@
		}
		],
		"ip": 0,
		"op": 130,
		"st": 0,
		"op": 160,
		"st": 30,
		"bm": 0
		},
		{
		@@ -8112,8 +8112,8 @@
		}
		],
		"ip": 0,
		"op": 481,
		"st": 0,
		"op": 630,
		"st": 30,
		"bm": 0
		},
		{
		@@ -8181,7 +8181,7 @@
		0
		]
		},
		"t": 62,
		"t": 92,
		"s": [
		17.82,
		17.82,
		@@ -8213,7 +8213,7 @@
		0
		]
		},
		"t": 72,
		"t": 102,
		"s": [
		16.92,
		16.92,
		@@ -8245,7 +8245,7 @@
		0
		]
		},
		"t": 108,
		"t": 138,
		"s": [
		16.92,
		16.92,
		@@ -8277,7 +8277,7 @@
		0
		]
		},
		"t": 118,
		"t": 148,
		"s": [
		17.82,
		17.82,
		@@ -8309,7 +8309,7 @@
		0
		]
		},
		"t": 155,
		"t": 185,
		"s": [
		17.82,
		17.82,
		@@ -8341,7 +8341,7 @@
		0
		]
		},
		"t": 165,
		"t": 195,
		"s": [
		16.92,
		16.92,
		@@ -8373,7 +8373,7 @@
		0
		]
		},
		"t": 202,
		"t": 232,
		"s": [
		16.92,
		16.92,
		@@ -8405,7 +8405,7 @@
		0
		]
		},
		"t": 212,
		"t": 242,
		"s": [
		17.82,
		17.82,
		@@ -8437,7 +8437,7 @@
		0
		]
		},
		"t": 255,
		"t": 285,
		"s": [
		17.82,
		17.82,
		@@ -8469,7 +8469,7 @@
		0
		]
		},
		"t": 265,
		"t": 295,
		"s": [
		16.92,
		16.92,
		@@ -8501,7 +8501,7 @@
		0
		]
		},
		"t": 305,
		"t": 335,
		"s": [
		16.92,
		16.92,
		@@ -8533,7 +8533,7 @@
		0
		]
		},
		"t": 315,
		"t": 345,
		"s": [
		17.82,
		17.82,
		@@ -8565,7 +8565,7 @@
		0
		]
		},
		"t": 350,
		"t": 380,
		"s": [
		17.82,
		17.82,
		@@ -8597,7 +8597,7 @@
		0
		]
		},
		"t": 360,
		"t": 390,
		"s": [
		16.92,
		16.92,
		@@ -8629,7 +8629,7 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		16.92,
		16.92,
		@@ -8637,7 +8637,7 @@
		]
		},
		{
		"t": 409,
		"t": 439,
		"s": [
		17.82,
		17.82,
		@@ -8699,7 +8699,7 @@
		0.167
		]
		},
		"t": 62,
		"t": 92,
		"s": [
		0.247058838489,
		0.305882352941,
		@@ -8724,7 +8724,7 @@
		0.167
		]
		},
		"t": 68,
		"t": 98,
		"s": [
		0.105882360421,
		0.152941176471,
		@@ -8749,7 +8749,7 @@
		0.167
		]
		},
		"t": 108,
		"t": 138,
		"s": [
		0.105882360421,
		0.152941176471,
		@@ -8774,7 +8774,7 @@
		0.167
		]
		},
		"t": 113,
		"t": 143,
		"s": [
		0.247058838489,
		0.305882352941,
		@@ -8799,7 +8799,7 @@
		0.167
		]
		},
		"t": 155,
		"t": 185,
		"s": [
		0.247058838489,
		0.305882352941,
		@@ -8824,7 +8824,7 @@
		0.167
		]
		},
		"t": 160,
		"t": 190,
		"s": [
		0.117647059262,
		0.152941182256,
		@@ -8849,7 +8849,7 @@
		0.167
		]
		},
		"t": 202,
		"t": 232,
		"s": [
		0.117647059262,
		0.152941182256,
		@@ -8874,7 +8874,7 @@
		0.167
		]
		},
		"t": 207,
		"t": 237,
		"s": [
		0.258823543787,
		0.305882364511,
		@@ -8899,7 +8899,7 @@
		0.167
		]
		},
		"t": 255,
		"t": 285,
		"s": [
		0.258823543787,
		0.305882364511,
		@@ -8924,7 +8924,7 @@
		0.167
		]
		},
		"t": 260,
		"t": 290,
		"s": [
		0.117647059262,
		0.152941182256,
		@@ -8949,7 +8949,7 @@
		0.167
		]
		},
		"t": 305,
		"t": 335,
		"s": [
		0.117647059262,
		0.152941182256,
		@@ -8974,7 +8974,7 @@
		0.167
		]
		},
		"t": 310,
		"t": 340,
		"s": [
		0.258823543787,
		0.305882364511,
		@@ -8999,7 +8999,7 @@
		0.167
		]
		},
		"t": 350,
		"t": 380,
		"s": [
		0.258823543787,
		0.305882364511,
		@@ -9024,7 +9024,7 @@
		0.167
		]
		},
		"t": 355,
		"t": 385,
		"s": [
		0.117647059262,
		0.152941182256,
		@@ -9049,7 +9049,7 @@
		0.167
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		0.117647059262,
		0.152941182256,
		@@ -9058,7 +9058,7 @@
		]
		},
		{
		"t": 404,
		"t": 434,
		"s": [
		0.258823543787,
		0.305882364511,
		@@ -9139,8 +9139,8 @@
		}
		],
		"ip": 0,
		"op": 481,
		"st": 0,
		"op": 630,
		"st": 30,
		"bm": 0
		},
		{
		@@ -9565,7 +9565,7 @@
		0.167
		]
		},
		"t": 30,
		"t": 60,
		"s": [
		100
		]
		@@ -9587,7 +9587,7 @@
		0.167
		]
		},
		"t": 40,
		"t": 70,
		"s": [
		0
		]
		@@ -9609,13 +9609,13 @@
		0.167
		]
		},
		"t": 459,
		"t": 489,
		"s": [
		0
		]
		},
		{
		"t": 469,
		"t": 499,
		"s": [
		100
		]
		@@ -9688,8 +9688,8 @@
		}
		],
		"ip": 0,
		"op": 481,
		"st": 0,
		"op": 630,
		"st": 30,
		"bm": 0
		},
		{
		@@ -9835,13 +9835,13 @@
		0.167
		]
		},
		"t": 457,
		"t": 487,
		"s": [
		100
		]
		},
		{
		"t": 460,
		"t": 490,
		"s": [
		0
		]
		@@ -9946,13 +9946,13 @@
		0
		]
		},
		"t": 403,
		"t": 433,
		"s": [
		0
		]
		},
		{
		"t": 417,
		"t": 447,
		"s": [
		100
		]
		@@ -9972,9 +9972,9 @@
		"hd": false
		}
		],
		"ip": 399,
		"op": 460,
		"st": 0,
		"ip": 429,
		"op": 630,
		"st": 30,
		"bm": 0
		},
		{
		@@ -10042,7 +10042,7 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		7.2,
		7.2,
		@@ -10074,7 +10074,7 @@
		0
		]
		},
		"t": 407,
		"t": 437,
		"s": [
		19.525,
		19.525,
		@@ -10106,7 +10106,7 @@
		0
		]
		},
		"t": 424,
		"t": 454,
		"s": [
		17.185,
		17.185,
		@@ -10138,7 +10138,7 @@
		0
		]
		},
		"t": 450,
		"t": 480,
		"s": [
		17.185,
		17.185,
		@@ -10146,7 +10146,7 @@
		]
		},
		{
		"t": 460,
		"t": 490,
		"s": [
		7.2,
		7.2,
		@@ -10218,13 +10218,13 @@
		0.167
		]
		},
		"t": 452,
		"t": 482,
		"s": [
		100
		]
		},
		{
		"t": 460,
		"t": 490,
		"s": [
		0
		]
		@@ -10277,13 +10277,13 @@
		0.167
		]
		},
		"t": 452,
		"t": 482,
		"s": [
		100
		]
		},
		{
		"t": 460,
		"t": 490,
		"s": [
		0
		]
		@@ -10355,9 +10355,9 @@
		"hd": false
		}
		],
		"ip": 399,
		"op": 460,
		"st": 0,
		"ip": 429,
		"op": 630,
		"st": 30,
		"bm": 0
		},
		{
		@@ -10468,13 +10468,13 @@
		0.167
		]
		},
		"t": 450,
		"t": 480,
		"s": [
		100
		]
		},
		{
		"t": 456,
		"t": 486,
		"s": [
		0
		]
		@@ -10553,9 +10553,9 @@
		"hd": false
		}
		],
		"ip": 447,
		"op": 481,
		"st": 0,
		"ip": 477,
		"op": 630,
		"st": 30,
		"bm": 0
		},
		{
		@@ -10748,7 +10748,7 @@
		0
		]
		},
		"t": 350,
		"t": 380,
		"s": [
		0
		]
		@@ -10770,13 +10770,13 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		22.5
		]
		},
		{
		"t": 410,
		"t": 440,
		"s": [
		26
		]
		@@ -10796,9 +10796,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -10909,13 +10909,13 @@
		0.167
		]
		},
		"t": 39,
		"t": 69,
		"s": [
		0
		]
		},
		{
		"t": 49,
		"t": 79,
		"s": [
		100
		]
		@@ -11017,9 +11017,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -11212,7 +11212,7 @@
		0
		]
		},
		"t": 255,
		"t": 285,
		"s": [
		0
		]
		@@ -11234,7 +11234,7 @@
		0
		]
		},
		"t": 305,
		"t": 335,
		"s": [
		22.5
		]
		@@ -11256,13 +11256,13 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		22.5
		]
		},
		{
		"t": 410,
		"t": 440,
		"s": [
		26
		]
		@@ -11282,9 +11282,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -11395,13 +11395,13 @@
		0.167
		]
		},
		"t": 39,
		"t": 69,
		"s": [
		0
		]
		},
		{
		"t": 49,
		"t": 79,
		"s": [
		100
		]
		@@ -11503,9 +11503,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -11698,7 +11698,7 @@
		0
		]
		},
		"t": 155,
		"t": 185,
		"s": [
		0
		]
		@@ -11720,7 +11720,7 @@
		0
		]
		},
		"t": 202,
		"t": 232,
		"s": [
		22.5
		]
		@@ -11742,13 +11742,13 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		22.5
		]
		},
		{
		"t": 410,
		"t": 440,
		"s": [
		26
		]
		@@ -11768,9 +11768,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -11881,13 +11881,13 @@
		0.167
		]
		},
		"t": 39,
		"t": 69,
		"s": [
		0
		]
		},
		{
		"t": 49,
		"t": 79,
		"s": [
		100
		]
		@@ -11989,9 +11989,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -12184,7 +12184,7 @@
		0
		]
		},
		"t": 62,
		"t": 92,
		"s": [
		0
		]
		@@ -12206,7 +12206,7 @@
		0
		]
		},
		"t": 108,
		"t": 138,
		"s": [
		22.5
		]
		@@ -12228,13 +12228,13 @@
		0
		]
		},
		"t": 399,
		"t": 429,
		"s": [
		22.5
		]
		},
		{
		"t": 410,
		"t": 440,
		"s": [
		26
		]
		@@ -12254,9 +12254,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		},
		{
		@@ -12367,13 +12367,13 @@
		0.167
		]
		},
		"t": 39,
		"t": 69,
		"s": [
		0
		]
		},
		{
		"t": 49,
		"t": 79,
		"s": [
		100
		]
		@@ -12475,9 +12475,9 @@
		"hd": false
		}
		],
		"ip": 0,
		"op": 447,
		"st": 0,
		"ip": -7,
		"op": 477,
		"st": 30,
		"bm": 0
		}
		],

res/values/strings.xml

+9 −2

Original line number	Diff line number	Diff line
		@@ -7952,9 +7952,13 @@
		<!-- Enhaced 4G LTE Mode title for carriers who want to show 4G Calling. [CHAR LIMIT=50] -->
		<string name="enhanced_4g_lte_mode_title_4g_calling">4G Calling</string>
		<!-- Enhaced 4G LTE Mode summary. [CHAR LIMIT=100] -->
		<string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
		<string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice calls (recommended)</string>
		<!-- Enhaced 4G LTE Mode summary for 4g calling. [CHAR LIMIT=100] -->
		<string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice and other communications (recommended)</string>
		<string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice calls (recommended)</string>
		<!-- NR advanced calling(VoNR or Vo5G) title. [CHAR LIMIT=50] -->
		<string name="nr_advanced_calling_title">Vo5G</string>
		<!-- NR advanced calling(VoNR or Vo5G) summary. [CHAR LIMIT=NONE] -->
		<string name="nr_advanced_calling_summary">Use 5G for voice calls</string>
		<!-- Title of a preference determining whether or not the user has allowed the device to share
		their contacts' phone numbers with their carrier in order to implement contact discovery,
		which is a service that exchanges contacts with the carrier to determine if your
		@@ -8349,6 +8353,9 @@
		<!-- List of synonyms for the enhance 4G LTE titles, used to match in settings search [CHAR LIMIT=NONE] -->
		<string name="keywords_enhance_4g_lte">volte, advanced calling, 4g calling</string>

		<!-- List of synonyms for the NR advanced calling(VoNR or Vo5G) titles, used to match in settings search [CHAR LIMIT=NONE] -->
		<string name="keywords_nr_advanced_calling">vo5g, vonr, advanced calling, 5g calling</string>

		<!-- List of synonyms for add language, used to match in settings search [CHAR LIMIT=NONE] -->
		<string name="keywords_add_language">add language, add a language</string>

res/xml/mobile_network_settings.xml

+7 −0

Original line number	Diff line number	Diff line
		@@ -247,6 +247,13 @@
		android:summary="@string/enable_2g_summary"
		settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />

		<SwitchPreference
		android:key="nr_advanced_calling"
		android:title="@string/nr_advanced_calling_title"
		android:persistent="false"
		android:summary="@string/nr_advanced_calling_summary"
		settings:keywords="@string/keywords_nr_advanced_calling"
		settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>
		</PreferenceCategory>

		<Preference

src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -198,8 +198,9 @@ public class UsbDefaultFragment extends RadioButtonPickerFragment {

		@Override
		public void onTetheringStarted() {
		Log.d(TAG, "onTetheringStarted()");
		// Set default usb functions again to make internal data persistent
		mCurrentFunctions = mUsbBackend.getCurrentFunctions();
		Log.d(TAG, "onTetheringStarted() : mCurrentFunctions " + mCurrentFunctions);
		mUsbBackend.setDefaultUsbFunctions(mCurrentFunctions);
		}

src/com/android/settings/network/telephony/MobileNetworkSettings.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -193,6 +193,7 @@ public class MobileNetworkSettings extends AbstractMobileNetworkSettings {
		.addListener(videoCallingPreferenceController);
		use(ContactDiscoveryPreferenceController.class).init(getParentFragmentManager(), mSubId,
		getLifecycle());
		use(NrAdvancedCallingPreferenceController.class).init(mSubId);
		}

		@Override