Commit Graph

71483 Commits

Author SHA1 Message Date
TreeHugger Robot
18e427260d Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-14 07:18:13 +00:00
Bill Yi
6415c5b511 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: If17aadb947be94b348718f1cfb72d743468df69c
2020-08-14 05:02:26 +00:00
Bill Yi
5512b2f2dc Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6385dcbd99493b0ccc9e8dff10e42bc738dd3c13
2020-08-14 04:27:09 +00:00
Jeffrey Carlyle
7a7a55c1a4 Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev am: d553d434cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12153212

Change-Id: I36bc3699d0af28ad40e52fd11946ae3222eb90a4
2020-08-14 03:03:20 +00:00
Jeffrey Carlyle
d553d434cd Merge "Add BatteryStatusFeatureProvider" into rvc-qpr-dev 2020-08-14 02:32:05 +00:00
Zhen Zhang
c1b516b2c1 Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev am: b49bd3592e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363010

Change-Id: I9d867fcfa8e3af30dfbfdb2a7990950b4443b2e6
2020-08-13 23:45:39 +00:00
Zhen Zhang
b49bd3592e Merge "Update subtext of Ethernet Tethering preference" into rvc-qpr-dev 2020-08-13 23:31:01 +00:00
Bonian Chen
1c97e70641 [Settings] Grant permissions to submit junit test
Grant permissions for adding new Junit test case.

Change-Id: Iabde2307669815fd50cdba241492c82b9e2cf64d
2020-08-13 18:49:31 +08:00
Jackal Guo
c6d3501a70 [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours am: 37448ae2ae am: 9928eff933
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I6d5b6251c52b9d53902691ccafcfcc5ecacac364
2020-08-13 10:09:45 +00:00
Jason Chiu
b824187524 [DO NOT MERGE] Update contextual cards display mechanism
1. Make Wi-Fi card default to collapse.
2. Support showing a default card when there's no displayable card.
3. Solve the problem of icon not showing for cached slices in card
renderer

Bug: 163288869
Fixes: 159092915
Test: manual, robotest
Change-Id: Ie8b61ad58410337334e29b7a794353b0c6a6ba8c
2020-08-13 17:58:55 +08:00
Jackal Guo
9928eff933 [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours am: 37448ae2ae
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I7f420c6ae54685d42039a19223ce1c27060a16be
2020-08-13 09:52:33 +00:00
Bonian Chen
5d9d199615 [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours am: 8eb932b5b1 -s ours am: 00e8b63d0f -s ours
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: Ifea57b05ebc568110ff421ec9d0f3264aa5cf5ca
2020-08-13 09:41:26 +00:00
Jackal Guo
37448ae2ae [automerger skipped] Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438 am: e8b8d9917a -s ours
am skip reason: skipped by user jackalguo

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

Change-Id: Ia3b8566a3fa72c7cf45501d1610c183bcc6ee7be
2020-08-13 09:32:19 +00:00
Bonian Chen
00e8b63d0f [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours am: 8eb932b5b1 -s ours
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: I9aa4c9e5995037bfa5ad5ace90889d430993dd27
2020-08-13 09:25:07 +00:00
Bonian Chen
8eb932b5b1 [automerger skipped] Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e am: 4fc5e348bf -s ours
am skip reason: Change-Id Ie6ae5b5914322644f2655e585b03a6b685bbc84a with SHA-1 21361e1f84 is in history

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

Change-Id: I22f62a4e0a0474cf9ead4d1ed38090b28bf0b243
2020-08-13 09:14:05 +00:00
Arc Wang
8df77fd7a3 Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev am: b6a9493804
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355969

Change-Id: Ibe5882d260907654e8c8891a4e65fb73e9e39730
2020-08-13 09:06:17 +00:00
Jackal Guo
e8b8d9917a Merge "Revert "[Settings] Refactor PhoneStateListener"" am: d7f05b5438
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398396

Change-Id: I7fc418fd2abb11be330b2b7f2139d5d44307b3d1
2020-08-13 08:56:03 +00:00
Bonian Chen
4fc5e348bf Merge "[Settings] Refactor PhoneStateListener" am: 7903cf872e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398391

Change-Id: Icf8d0db6ffb41041652ae27f0573da2f118465c3
2020-08-13 08:55:56 +00:00
Jackal Guo
d7f05b5438 Merge "Revert "[Settings] Refactor PhoneStateListener"" 2020-08-13 08:52:47 +00:00
Arc Wang
b6a9493804 Merge "[Wi-Fi] Fix crash after editing invalid hotspot password" into rvc-qpr-dev 2020-08-13 08:52:27 +00:00
Jackal Guo
765fb8293d Revert "[Settings] Refactor PhoneStateListener"
This reverts commit e01df59027.

Reason for revert: b/163995409 | Build failure.

Change-Id: Ia413a4bae93055ceca5b6aa85602c84a8fbe5424
2020-08-13 08:48:31 +00:00
Bonian Chen
7903cf872e Merge "[Settings] Refactor PhoneStateListener" 2020-08-13 08:13:25 +00:00
Bonian Chen
5278ed8be1 [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours am: ce259b61f6 -s ours am: bdd022172e -s ours
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: I0d8fcdf66e7c9d664c75525cce723e4f83d15bc5
2020-08-13 05:28:58 +00:00
Bonian Chen
bdd022172e [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours am: ce259b61f6 -s ours
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: Ibb972bf5b76ae57ff451fe2ee65d312fcf388956
2020-08-13 05:14:59 +00:00
Bonian Chen
e01df59027 [Settings] Refactor PhoneStateListener
Remove Looper and update of mSubId

Bug: 144542981
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=Enhanced4gBasePreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Merged-In: Ie6ae5b5914322644f2655e585b03a6b685bbc84a
Change-Id: I5306b3a80220c02d2de1b25f20e8ef7f845e9a09
2020-08-13 13:02:04 +08:00
Bonian Chen
ce259b61f6 [automerger skipped] Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b am: 5c21396034 -s ours
am skip reason: Change-Id I965a0c07c7c9ef5897b33809bae6a7921977db18 with SHA-1 31367d7a72 is in history

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

Change-Id: I219267b4f2b50f71acf7065aa58478d382472ddf
2020-08-13 04:57:28 +00:00
Bonian Chen
5c21396034 Merge "[Settings] Replace getSimCount() API" am: 3b8794d16b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1398389

Change-Id: Ib8e712b0416e24857b1e2d1203cf22bd12ba4786
2020-08-13 04:43:30 +00:00
Bonian Chen
3b8794d16b Merge "[Settings] Replace getSimCount() API" 2020-08-13 04:27:36 +00:00
Bonian Chen
5560882548 [Settings] Replace getSimCount() API
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
make RunSettingsRoboTests -j ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Merged-In: I965a0c07c7c9ef5897b33809bae6a7921977db18
Change-Id: I8010f74c41826b081aa9f599d33a9519a1888215
2020-08-13 10:56:55 +08:00
Zhen Zhang
75028dd946 Update subtext of Ethernet Tethering preference
Update the subtext summary according to UX

Bug: 153761463
Test: built successfully; manually test
Change-Id: I96d1a1f5111f85ee4b10f61ab4408822b99032e1
2020-08-12 16:13:48 -07:00
Lucas Dupin
7925b0c044 Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 01cb6c4a20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I570f25117a12b55046dac45c086693e859e2cc6c
2020-08-12 22:08:40 +00:00
Lucas Dupin
6430a4b88f Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev am: e899f749a1 am: 5f44b7cf54
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12337522

Change-Id: I7f2ae48cbdcad2fa44d96382b7d2c175b7605f59
2020-08-12 22:07:32 +00:00
Lucas Dupin
01cb6c4a20 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: I4dae464e9f3c581d80a10d515934302c345ef336
2020-08-12 21:51:47 +00:00
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
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
Bonian Chen
6fe15deeb1 Merge "[Settings] Code refactor for Wifi calling IMS API" 2020-08-12 08:41:29 +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
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
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