Commit Graph

74229 Commits

Author SHA1 Message Date
The Android Open Source Project
1f9135acc9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I40df6a5d07d26214d0b57dc1c68b18b9858342af
2020-08-06 21:19:19 -07:00
Bonian Chen
c78b12f3f4 Merge "[Settings] Remove Phone hidden constants access" 2020-08-07 04:12:03 +00:00
Bonian Chen
2410478bee Merge "[Settings] Code refactor" 2020-08-07 04:11:29 +00:00
Jerry Chang
a9125045e5 Update strings for swipe bottom to notification preference
Updates final strings confirmed in go/android-reach

Bug: 151993111
Test: manual check Settings > System > Gesture > Swipe for notifications
Change-Id: I66738ab088c87d0f286acc7d0970e5b1c8bfd905
2020-08-07 11:56:55 +08:00
The Android Open Source Project
960aea8975 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: ff86e0d371 -s ours am: e9c4836070 -s ours am: be6b0a191a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc86ab1f9b87e5254971c70d54b6efeb830dee01
2020-08-07 03:40:28 +00:00
Automerger Merge Worker
2f5215aa0d Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: d4cd30eaa6 -s ours" into rvc-qpr-dev-plus-aosp am: 3ce4553eb1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I705b77d44aa0f3f5111bb208866a1d578639e8ce
2020-08-07 03:40:21 +00:00
The Android Open Source Project
6f16cf1161 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: 1905f56993 -s ours am: bc7dea7c5d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdd3e2a48c231327d217868af623d937271ad1a7
2020-08-07 03:40:06 +00:00
The Android Open Source Project
e0aa6cf8cc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ice617a49a4e8b1271deac5b4f8156421a2edd354
2020-08-06 20:35:44 -07:00
The Android Open Source Project
be6b0a191a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: ff86e0d371 -s ours am: e9c4836070 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d42455c696136710cbcff2a982355393d0e97d8
2020-08-07 03:26:47 +00:00
Automerger Merge Worker
3ce4553eb1 Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: d4cd30eaa6 -s ours" into rvc-qpr-dev-plus-aosp 2020-08-07 03:26:44 +00:00
The Android Open Source Project
3072f8c916 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: d4cd30eaa6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14a651f4f5b580fe57defab5e85802c5fb571397
2020-08-07 03:26:40 +00:00
The Android Open Source Project
bc7dea7c5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours am: 1905f56993 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I04f5c84b5c1f368955117ad3cd3716d185beab3d
2020-08-07 03:26:36 +00:00
The Android Open Source Project
e9c4836070 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: ff86e0d371 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If5ae9a3a7ce4b0ec684c6bfc9a35ab00536fd78d
2020-08-07 03:07:06 +00:00
The Android Open Source Project
1905f56993 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I03bf43bdeafdcea7402eaf92c12ae8634867a6c7
2020-08-07 03:06:52 +00:00
The Android Open Source Project
d4cd30eaa6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours am: b4752ee39f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1d67daf2072f8ba45fe2a29dd3c3c7a7909cdf2d
2020-08-07 03:06:46 +00:00
The Android Open Source Project
ff86e0d371 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9b19ecf8d43f7c9c20db6a995bb7def64688f5a8
2020-08-07 02:50:57 +00:00
The Android Open Source Project
b4752ee39f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 24cabff9dd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I98d9f4f2f16671fa0ca8d6c7c237a76f5ba56206
2020-08-07 02:50:55 +00:00
The Android Open Source Project
c13c712b58 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3bb874713476b81f55c01ce7e216a9c45cd5a4c4
2020-08-06 19:08:08 -07:00
TreeHugger Robot
677a202b00 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-07 01:36:44 +00:00
The Android Open Source Project
24cabff9dd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I77ea27e55c35b45123c1ee7cae67b09cc3e4218f
2020-08-06 18:23:50 -07:00
Bonian Chen
d8c7d06d1d [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours am: 5b01d70d8c -s ours am: cf10e35ea5 -s ours am: 3df18c4d1f -s ours
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: I073a9f6736824b5718ee3f137e9317cc412cdc64
2020-08-06 17:13:23 +00:00
Bonian Chen
926f22b882 [automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c am: 28e5351779 -s ours am: b0e6b28c4b -s ours am: b770db49d9 -s ours am: 52e2324b61 -s ours
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585 is in history

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

Change-Id: I3f9e8d160f0ba493dd453a590cabb3b7e21ccbed
2020-08-06 17:12:35 +00:00
Bonian Chen
4e6f391b77 [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours am: cce627f7a7 -s ours am: 09071f7a2d -s ours am: 3e26a1e58d -s ours
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: Ib719a98b255d06fe574106d9acee8997859106fb
2020-08-06 17:12:05 +00:00
Bonian Chen
28899c9fa2 [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours am: 5b79ed5ffa -s ours am: 309cd83703 -s ours am: e501cd2a91 -s ours
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

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

Change-Id: I9ad2450b0125555601c06994cdb8ea2f5ce8a7b2
2020-08-06 17:11:56 +00:00
Bonian Chen
a61d07c2f4 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -s ours am: fb8293a152 -s ours
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

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

Change-Id: I4fbf8de036f37012b9a8860e403d657d6e0d99ce
2020-08-06 17:11:46 +00:00
Bonian Chen
49a060496f [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours am: b77aaf8055 -s ours
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

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

Change-Id: I0bf95079d8eb2a73c616c8647c02e2a04a68ae7e
2020-08-06 17:10:14 +00:00
Bonian Chen
28b81ab03d [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours am: 8f8468fd08 -s ours
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

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

Change-Id: Ibf47cd2ab147b636015b3d22912bfc74b5d41fca
2020-08-06 17:09:30 +00:00
Xin Li
2412da9a44 Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da am: ff75eec671
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: Ice1f181ad4d9b7a5ff5c8a1359fe9acfc1f5bb95
2020-08-06 17:06:29 +00:00
Bonian Chen
3df18c4d1f [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours am: 5b01d70d8c -s ours am: cf10e35ea5 -s ours
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: Id389b1e3c4d968b10bf903617f337cc8286234a0
2020-08-06 16:55:07 +00:00
Bonian Chen
52e2324b61 [automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c am: 28e5351779 -s ours am: b0e6b28c4b -s ours am: b770db49d9 -s ours
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585 is in history

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

Change-Id: Ib9a383b64c4f02ab103aa246f655fc9f7499319f
2020-08-06 16:54:51 +00:00
Bonian Chen
3e26a1e58d [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours am: cce627f7a7 -s ours am: 09071f7a2d -s ours
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: Ib42ae53c6b7781be764cec229b2bee6b175a1f2a
2020-08-06 16:54:44 +00:00
Bonian Chen
e501cd2a91 [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours am: 5b79ed5ffa -s ours am: 309cd83703 -s ours
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

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

Change-Id: Iba75d964901531cb32ac386064be3a59af81ae7b
2020-08-06 16:54:36 +00:00
Bonian Chen
fb8293a152 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours am: db44ed63d8 -s ours
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

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

Change-Id: I25ab1624f08db239b6d0783aa580722a649804db
2020-08-06 16:54:14 +00:00
Bonian Chen
b77aaf8055 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours am: 4486da9ea9 -s ours
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

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

Change-Id: Iee0800365e6a9ca0ca27b0482baa5d8d220ca46c
2020-08-06 16:53:03 +00:00
Bonian Chen
8f8468fd08 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours am: 339c352ac3 -s ours
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

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

Change-Id: Iaef18fc04be9b7d94cb84655dca15d9479778f1d
2020-08-06 16:51:16 +00:00
Xin Li
ff75eec671 Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b am: c9e538e9da
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: I71a23041e53c6f666bcba7360f07917fdbcab96b
2020-08-06 16:48:26 +00:00
Bonian Chen
cf10e35ea5 [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours am: 5b01d70d8c -s ours
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: Ibc36bfff1566749ec274e2a7cf3d8bdca8e39d2a
2020-08-06 16:36:31 +00:00
Bonian Chen
b770db49d9 [automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c am: 28e5351779 -s ours am: b0e6b28c4b -s ours
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585 is in history

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

Change-Id: I9459c3e557266dc6fb3730571e09d42390283aab
2020-08-06 16:36:22 +00:00
Bonian Chen
09071f7a2d [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours am: cce627f7a7 -s ours
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: I90c98f6131f2f5f597c1982a30f10f1c7b4b7f26
2020-08-06 16:36:12 +00:00
Bonian Chen
309cd83703 [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours am: 5b79ed5ffa -s ours
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

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

Change-Id: I5785c59cc57f97c35202c642716be82e9c375f47
2020-08-06 16:36:04 +00:00
Bonian Chen
db44ed63d8 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours am: 45bd473128 -s ours
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

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

Change-Id: I872d489107430b37a8123482a1a12474cb5226ce
2020-08-06 16:35:47 +00:00
Bonian Chen
4486da9ea9 [automerger skipped] Merge "[Mainline] Use isActiveSubscriptionId instead of isActiveSubId for mainline" am: 75b3666b02 am: 0a1d15530b -s ours am: f9803fc6c2 -s ours
am skip reason: Change-Id If740c2d7ea2c1392d5fe538091ea6e5c4575ad26 with SHA-1 f4d2771526 is in history

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

Change-Id: I5fd41f91894c3596eb24935b9ddc17dac3d4ddf5
2020-08-06 16:35:39 +00:00
Bonian Chen
339c352ac3 [automerger skipped] Merge "Look up CBS package name through PackageManager." am: e24a23f9ab am: f42a022a8f -s ours am: e60cb2f67b -s ours
am skip reason: Change-Id I0feb356e6cd4868f71198bdee49a7658b4b98b5d with SHA-1 b6139c0caf is in history

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

Change-Id: Ibf4937b0c5da38d7102def87014b475e01b6cc55
2020-08-06 16:35:21 +00:00
Xin Li
c9e538e9da Merge "Merge QQ3A.200805.001" am: cded32987b am: dcaeff56e3 am: 761d56988b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1388671

Change-Id: Idcf8e17d4ace8b00c4a8c76c25e25840ae880874
2020-08-06 16:22:27 +00:00
Edgar Wang
01c4a32195 Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Change-Id: If69691157079221158440ab26eace10dedf38b55
Test: robotest & manual
2020-08-06 16:09:34 +00:00
Bonian Chen
5b01d70d8c [automerger skipped] Merge "[Settings] Avoid from EUICC access blocking main thread" am: bb750ad2d7 am: 7b7b900fa3 -s ours
am skip reason: Change-Id Ic1a2bd948b69d40632555d293df6ed56a6b7a712 with SHA-1 23ed0b2c34 is in history

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

Change-Id: I00d35bda613fcba39b0cd5356cc1bb488d118f2f
2020-08-06 16:06:57 +00:00
Bonian Chen
b0e6b28c4b [automerger skipped] Merge "[Settings] Enable access from non-UI thread" am: 9ec200f85c am: 28e5351779 -s ours
am skip reason: Change-Id I768f41f76d0223634be2b728d33fa0cfcc69fe69 with SHA-1 19507e7585 is in history

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

Change-Id: I3aed4bd7866c29d049a454fa3bc22511cc3aad6c
2020-08-06 16:06:50 +00:00
Bonian Chen
cce627f7a7 [automerger skipped] Merge "[Settings] Sync summary of call preference with dialer" am: 35f53d7fbd am: 4b755362e6 -s ours
am skip reason: Change-Id Iaa5fa1f3efe7ba2463caa0b450077f885d42b1c8 with SHA-1 e17e302c9e is in history

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

Change-Id: Icb6307eb82260d281a381975eff6607505ba5455
2020-08-06 16:06:43 +00:00
Bonian Chen
5b79ed5ffa [automerger skipped] Merge "[Settings] Access ProxySubscriptionManager within DataUsage" am: 96533385f0 am: fc47bff681 -s ours
am skip reason: Change-Id I2cb30dd0570a09543a13ca01cf054ba2d18d70d4 with SHA-1 dcd92af0a1 is in history

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

Change-Id: I57ea4371d2effc3fd4a1ee9faac999014696599c
2020-08-06 16:06:35 +00:00
Bonian Chen
45bd473128 [automerger skipped] Merge "Remove useless png and add vector drawable" am: 0cfec664c4 am: 44fbf04469 -s ours
am skip reason: Change-Id I5ccf4855b63f47b138a1662317d0c4ba8ce8984c with SHA-1 cf1489891a is in history

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

Change-Id: Id49648216c4f5d251c3fe1d817904d66aca04237
2020-08-06 16:05:56 +00:00