PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,810 Commits 1 Branch 0 Tags
f27ebe28ba24587d48d80f2a12bd39a93734b6e1
Commit Graph

75810 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bonian Chen
f27ebe28ba [automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours am: 8dfe7ea127 -s ours am: c120b09dcc -s ours am: aa9a93d737 -s ours am: 440ba9e297 -s ours 
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549 is in history

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

Change-Id: I019024dca220a5c6a3963564a63863066ea999ba
 2020-08-12 10:27:31 +00:00
Bonian Chen
440ba9e297 [automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours am: 8dfe7ea127 -s ours am: c120b09dcc -s ours am: aa9a93d737 -s ours 
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549 is in history

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

Change-Id: Ie2df3fcf9208d4d4ee3a289f21d0f7885d3b31a6
 2020-08-12 10:09:47 +00:00
Bonian Chen
aa9a93d737 [automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours am: 8dfe7ea127 -s ours am: c120b09dcc -s ours 
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549 is in history

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

Change-Id: I0a08fbdcea2b51d3427522a1773092205187d14e
 2020-08-12 09:51:12 +00:00
Bonian Chen
c120b09dcc [automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours am: 8dfe7ea127 -s ours 
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549 is in history

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

Change-Id: I094d14db59d3bacd0dc84548034c6c4f6e6e20a5
 2020-08-12 09:35:29 +00:00
Bonian Chen
8dfe7ea127 [automerger skipped] Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 am: 86320e5484 -s ours 
am skip reason: Change-Id I68462368669b81e10d09bbb93e74e23ea9a1f446 with SHA-1 ced9489549 is in history

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

Change-Id: I4320c9249fbbae470bb5b320cd9fde425a2c8828
 2020-08-12 09:15:35 +00:00
Bonian Chen
86320e5484 Merge "[Settings] Code refactor for Wifi calling IMS API" am: 6fe15deeb1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1397828

Change-Id: I8cec53b0c426cf73c470db0d763280d13435b257
 2020-08-12 08:57:39 +00:00
TreeHugger Robot
11efd242e4 Merge "Update language to comply with Android's inclusive language guidance" am: 6a128b486f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12324924

Change-Id: I057818fbcc885c1ca2b620f32b080955f3dd17e0
 2020-08-12 08:48:40 +00:00
Bonian Chen
6fe15deeb1 Merge "[Settings] Code refactor for Wifi calling IMS API" 2020-08-12 08:41:29 +00:00
TreeHugger Robot
6a128b486f Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 08:19:06 +00:00
TreeHugger Robot
df1b0eb020 Merge "Update language to comply with Android's inclusive language guidance" am: 0d11f25a77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12324966

Change-Id: I77ea3c77e882e103d18d7c5506900e5685ca4fb9
 2020-08-12 08:10:04 +00:00
TreeHugger Robot
0d11f25a77 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 08:00:06 +00:00
Treehugger Robot
12342f69e1 Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a am: 455d7924c4 am: 43cff6baff am: cc70bf2117 am: 0eb1091927 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: I3395ebb47b456afbdfd6b8a8b6017511b41cd571
 2020-08-12 07:32:22 +00:00
Treehugger Robot
0eb1091927 Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a am: 455d7924c4 am: 43cff6baff am: cc70bf2117 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: I03362cd0a041cac0d4d50a11f0938e7331c8f7a7
 2020-08-12 07:16:30 +00:00
Treehugger Robot
cc70bf2117 Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a am: 455d7924c4 am: 43cff6baff 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: I95587957bbfe79c37dd1246d3bec0a67201d217f
 2020-08-12 07:02:12 +00:00
Treehugger Robot
43cff6baff Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a am: 455d7924c4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: I4721d6a74d655fca65f7a95ee996d3421581871e
 2020-08-12 06:46:58 +00:00
Treehugger Robot
455d7924c4 Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef am: c855a8a21a 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: Ibdb29f86401439a66c9aa3a456454e6caadddffa
 2020-08-12 06:26:47 +00:00
Treehugger Robot
c855a8a21a Merge "Prevent errors when updating operator pref summary" am: 5a19cea4ef 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1364660

Change-Id: I20645fd922e5908a8911fd7dc975f3ea4e053990
 2020-08-12 06:10:58 +00:00
Bonian Chen
5a2c67528a [automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 am: 59dfd94170 -s ours am: 8c8761b74e -s ours am: db8bd6ac06 -s ours am: 636d86d5eb -s ours am: 42faeb8949 -s ours 
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d is in history

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

Change-Id: Iff778749be84267e8fed2f1ffdc2cb77e14ac89b
 2020-08-12 06:02:24 +00:00
Treehugger Robot
5a19cea4ef Merge "Prevent errors when updating operator pref summary" 2020-08-12 05:54:27 +00:00
Bonian Chen
91412b5069 [Settings] Code refactor for Wifi calling IMS API 
Replacing logics of
ImsManager#isWfcEnabledByPlatform() &
MobileNetworkUtils#isWfcProvisionedOnDevice()
into WifiCallingQueryImsState#isWifiCallingProvisioned().

Bug: 140542283
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSliceHelperTest
Merged-In: I68462368669b81e10d09bbb93e74e23ea9a1f446
Change-Id: I26d616f082a4dd3f2cb14defc5f68218f668ad48
 2020-08-12 13:43:46 +08:00
Bonian Chen
42faeb8949 [automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 am: 59dfd94170 -s ours am: 8c8761b74e -s ours am: db8bd6ac06 -s ours am: 636d86d5eb -s ours 
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d is in history

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

Change-Id: If565260efaf56506d6d23ada63390a9267eb35d1
 2020-08-12 05:43:42 +00:00
Bonian Chen
636d86d5eb [automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 am: 59dfd94170 -s ours am: 8c8761b74e -s ours am: db8bd6ac06 -s ours 
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d is in history

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

Change-Id: Iad8632321126718672589b5f7dcc91947579dd7d
 2020-08-12 05:25:45 +00:00
Bonian Chen
db8bd6ac06 [automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 am: 59dfd94170 -s ours am: 8c8761b74e -s ours 
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d is in history

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

Change-Id: I2a0c58e8bca107541ae83985eba12f2b58ce4d59
 2020-08-12 05:08:39 +00:00
Bonian Chen
8c8761b74e [automerger skipped] Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 am: 59dfd94170 -s ours 
am skip reason: Change-Id Ib136beea325eabdfbd8a6a843611143958dce603 with SHA-1 217e88710d is in history

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

Change-Id: Idf79d9aa5960948943959c262a01d4c3f7d3c97a
 2020-08-12 04:42:00 +00:00
Bonian Chen
59dfd94170 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" am: 60d00b58f3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394560

Change-Id: I84b5d35b4a9a0ea77597c45b445768bd2782c845
 2020-08-12 04:24:57 +00:00
Bonian Chen
60d00b58f3 Merge "Change MobileNetworkUtils to use EuiccManager.isSupportedCountry" 2020-08-12 04:10:10 +00:00
Edgar Wang
a8742aa7ab Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual
Change-Id: Ia8625091a107fc3fb652d3ba3f75ea3cc1a8d9f5
 2020-08-12 11:29:07 +08:00
Edgar Wang
8c8a2e85ec Update language to comply with Android's inclusive language guidance 
See https://source.android.com/setup/contribute/respectful-code for reference

Bug: 161896447
Test: robotest & manual

Change-Id: I32f369a608c8b4f513f2c32afca6d408ee273428
 2020-08-12 11:25:21 +08:00
tim peng
c8f033e82d Merge "Display "pair new" only when local output device is available." am: e581cab958 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343227

Change-Id: I3c9c1ca8320b9f8367fcd9bdfd4671b12e28e787
 2020-08-12 03:18:28 +00:00
tim peng
e581cab958 Merge "Display "pair new" only when local output device is available." 2020-08-12 03:05:53 +00:00
TreeHugger Robot
5146b84076 Merge "Update language to comply with Android's inclusive language guidance" am: 232aaec569 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12325205

Change-Id: I107e6e531720358409b083923666994ad6d77130
 2020-08-12 02:43:01 +00:00
TreeHugger Robot
3f3e84ce77 Merge "Update inclusive language for Accessibility Settings" am: 3c8f93a6a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12317404

Change-Id: I147884635469f5bf81e460c9d820107b534dc353
 2020-08-12 02:42:45 +00:00
TreeHugger Robot
232aaec569 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 02:36:07 +00:00
TreeHugger Robot
3c8f93a6a5 Merge "Update inclusive language for Accessibility Settings" 2020-08-12 02:28:23 +00:00
TreeHugger Robot
ba288554e9 Merge "Update char limit for title of swipe for notificaiton gesture preference" am: ec93f346fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12343232

Change-Id: I85f89fca632a94b4b157b521e93881db2529be50
 2020-08-11 10:54:58 +00:00
TreeHugger Robot
ec93f346fe Merge "Update char limit for title of swipe for notificaiton gesture preference" 2020-08-11 10:39:11 +00:00
Bonian Chen
5731445b96 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -s ours am: 6e8d241cd9 -s ours am: 0083abcd3b -s ours am: f570a8afff -s ours 
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: Ia1917a2a50d56335dba5acf62cac8e2d3ee719c5
 2020-08-11 09:57:37 +00:00
Bonian Chen
f570a8afff [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -s ours am: 6e8d241cd9 -s ours am: 0083abcd3b -s ours 
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: Ib455fb2040cd6593d295857e53c6e3e5123a8a8f
 2020-08-11 09:41:27 +00:00
Bonian Chen
0083abcd3b [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -s ours am: 6e8d241cd9 -s ours 
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: Id0fff72461e532250c723b29a13036146c172f48
 2020-08-11 09:15:16 +00:00
Jerry Chang
cbd88e0eff Update char limit for title of swipe for notificaiton gesture preference 
Bug: 163359886
Test: manual check preference strings in settings
Change-Id: I1f5becde86ea514c30b11e5755feef2e01d91e04
 2020-08-11 17:02:37 +08:00
Bonian Chen
6e8d241cd9 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours am: 17a4871845 -s ours 
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: I16c99ac5fe38cb7391858d02abd4b21539d6d032
 2020-08-11 08:57:21 +00:00
Betty Chang
b5f3099755 Merge "[Testing] Use AndroidJUnit4 instead in DataConnectivityListenerTest" am: b9c21e38cc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12326250

Change-Id: I18b88283b072079848619d9aa1a084e23c6bdd32
 2020-08-11 08:56:23 +00:00
Betty Chang
b9c21e38cc Merge "[Testing] Use AndroidJUnit4 instead in DataConnectivityListenerTest" 2020-08-11 08:45:55 +00:00
Bonian Chen
17a4871845 [automerger skipped] Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 am: a9a69c6aa3 -s ours 
am skip reason: Change-Id I3f9c8202d9b75b24b80ebcf385abc95f8df851e2 with SHA-1 ec81d6121e is in history

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

Change-Id: Ifda29d94ccdae085264cf14d4b8064db055b4ea2
 2020-08-11 08:37:45 +00:00
Bonian Chen
a9a69c6aa3 Merge "Override 2 getSliceUri() instance to return platform slice" am: f116c5fae7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1394548

Change-Id: I92dbf184a274d3a22ad597bff0b24d2c44218266
 2020-08-11 08:26:23 +00:00
Bonian Chen
f116c5fae7 Merge "Override 2 getSliceUri() instance to return platform slice" 2020-08-11 08:05:10 +00:00
changbetty
7f57ef4766 [Testing] Use AndroidJUnit4 instead in DataConnectivityListenerTest 
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context

Bug: 162048313
Test: atest -c DataConnectivityListenerTest
Change-Id: I8f05ac7f5f14cb2b990da137099a22e4a89fcc37
 2020-08-11 15:32:58 +08:00
Fan Zhang
6c046831de Override 2 getSliceUri() instance to return platform slice 
(This is not a clear cherry-pick, @Override need to be removed.)

Bug: 126222433
Test: robotest
Merged-In: I3f9c8202d9b75b24b80ebcf385abc95f8df851e2
Change-Id: Iec9fae48e91baef5861baef946fc155b1eb37904
 2020-08-11 04:24:27 +00:00
Bonian Chen
eef4739057 [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours am: e8c233c4dc -s ours am: 41a77501c3 -s ours am: cb6df05e95 -s ours am: 386bd9c7b9 -s ours 
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c is in history

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

Change-Id: I50bfeab34f2c2b595f20d777cf8d0cd9c01cfa3f
 2020-08-11 04:09:38 +00:00
Bonian Chen
386bd9c7b9 [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours am: e8c233c4dc -s ours am: 41a77501c3 -s ours am: cb6df05e95 -s ours 
am skip reason: Change-Id Ie81e69477d297aa96a0daad02d56196c956271a3 with SHA-1 225da1517c is in history

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

Change-Id: I286cdd6bd135dc4bb95657b13ad106f460040df2
 2020-08-11 03:51:04 +00:00