Commit Graph

74229 Commits

Author SHA1 Message Date
Lucas Dupin
5f44b7cf54 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I607edce1f3981b4b8882bea1530362980a280de9
2020-08-12 21:50:32 +00:00
Lucas Dupin
e899f749a1 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev 2020-08-12 21:27:45 +00:00
Yi-Ling Chuang
228bc78bf9 [DO NOT MERGE] Pre-allocate height for contextual cards.
To prevent the UI jank causing by the async card loads, we pre-allocate
some space for the card to fill in. After this change, only one card can
be shown at a time.

More details:
- When the card number configuration is set to 0, don't trigger the card
loader.
- The height adjusting logic is as follows.
When Settings is opened, pre-allocate a space first.
After the RV finish laying out, reset the RV to wrap_content. So if the
card has to be expanded(eg. wifi large mode or dismissal view), then it
will adjust the height accordingly. While if a card previously shown
becomes unavailable(dismissed or conditions not meet), we also reset the
RV so the space can be gone.

Bug: 163288869
Test: robotest
Change-Id: I0dcb2dae8f0533e562ad06f664b7ae7a9afecd21
2020-08-12 21:40:06 +08:00
TreeHugger Robot
6af0342084 Merge "Display "see all" option when bluetooth is off" 2020-08-12 10:24:29 +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
Hugh Chen
bde100849e Display "see all" option when bluetooth is off
- This CL before, Bluetooth settings will hide the "see all"
  option when bluetooth is off. For the UX improvement, this
  CL will show the "see all" button when bluetooth is off. And
  turn on the BT when user press "see all" button to let user to
  quick pair their disconnected devices.
- Update and add test case

Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
2020-08-12 17:07:33 +08: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
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
0d11f25a77 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-12 08:00:06 +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
Arc Wang
ae79c41cd7 [Wi-Fi] Fix crash after editing invalid hotspot password
From Android 11, Wi-Fi framework only supports ASCII encoding
for hotspot password, APP should check if password character is
valid.

This change checks if SoftApConfiguration accepts the password
and disable the OK button if the password is invalid.

Bug: 163353576
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiUtilsTest
Change-Id: Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe
2020-08-12 14:34:02 +08:00
Arc Wang
b432cf293c [Wi-Fi] Fix crash after editing invalid hotspot password
From Android 11, Wi-Fi framework only supports ASCII encoding
for hotspot password, APP should check if password character is
valid.

This change checks if SoftApConfiguration accepts the password
and disable the OK button if the password is invalid.

Bug: 163353576
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiUtilsTest
Change-Id: Icf3b5c85856906e4cbe2f0ad79583c1b7182b8c7
Merged-In: Ief3c6c1f08f8fcdf128768cde3ab8eef91f19fbe
2020-08-12 14:29:30 +08: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
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
e581cab958 Merge "Display "pair new" only when local output device is available." 2020-08-12 03:05:53 +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
Jeffrey Carlyle
f22059f21f Add BatteryStatusFeatureProvider
This allows the battery header status line to be overridden.

Bug: 150239363
Test: implemented provider and changed status line text
Signed-off-by: Jeffrey Carlyle <jcarlyle@google.com>
Change-Id: I05bedbee641f087de5ee1b25a00724ce2de51f87
Merged-In: I05bedbee641f087de5ee1b25a00724ce2de51f87
2020-08-11 13:49:27 -07: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
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
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
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
Bonian Chen
cb6df05e95 [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 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: I0d12957f0e00665646d7be0b1d919033450d7fbc
2020-08-11 03:35:42 +00:00
Bonian Chen
41a77501c3 [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -s ours am: e8c233c4dc -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: I4e6af4b49d9e9649a790f32a72ccb8b6d5d138c5
2020-08-11 03:18:30 +00:00
Bonian Chen
e8c233c4dc [automerger skipped] Merge "Add interface and extend db to support storing slice uris" am: 5c4154b2e4 am: 6cc261d709 -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: I15340b9727806d93ad352c154e0b7ed6d16d9def
2020-08-11 02:58:33 +00:00
timhypeng
113ac8102a Display "pair new" only when local output device is available.
-If media app does not support cast->phone transferring, local output
audio device is unavailable. "pair new" is for Bluetooth which should be
also unavilable.
-These types are local output audio devices:
TYPE_BUILTIN_SPEAKER
TYPE_WIRED_HEADSET
TYPE_WIRED_HEADPHONES
TYPE_USB_DEVICE
TYPE_USB_HEADSET
TYPE_USB_ACCESSORY
TYPE_DOCK
TYPE_HDMI

Bug: 163095048
Test: make -j50 RunSettingsRoboTests
Change-Id: Ib844c7546e1946cb87fac04cb8b2b8f4acf06451
2020-08-11 10:52:57 +08:00