Commit Graph

16053 Commits

Author SHA1 Message Date
Hugh Chen
aadc44ae26 Fix default usb settings will set wrong function when onPause()
Bug: 229200265
Test: make -j64 RunSettingsRoboTests
Change-Id: Ibee2d39af8b341d03117d96029446ddcd45921fe
2022-04-18 12:16:57 +00:00
ykhung
83a47bfa33 Format BatteryEntry and BatteryDiffEntry class am: b593e00af0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17782705

Change-Id: I1193e3e0638dab1b35865f8523cf08764fb0d58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-17 15:23:29 +00:00
ykhung
b593e00af0 Format BatteryEntry and BatteryDiffEntry class
Bug: N/A
Test: make RunSettingsRoboTests
Change-Id: I14e2ef4c455209e58edc5ccdbe064f469815cccd
2022-04-17 06:23:47 +00:00
Chaohui Wang
d9c7a49ce7 Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev am: fbafdbdd8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17607148

Change-Id: I06abe7c118003f5b1230b77d1c3bdd724095eb51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 23:42:01 +00:00
Chaohui Wang
fbafdbdd8f Merge "Fix title clipped for "Custom settings for schedule"" into tm-dev 2022-04-14 23:22:19 +00:00
Quang Luong
0bbdf3a983 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev am: 93ae7acbf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17483256

Change-Id: I6839b69c92f10905e1386c0a4555a4c980eccebc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 16:34:52 +00:00
Quang Luong
93ae7acbf4 Merge "Use WifiEntry.getStandardString() for Wi-Fi Type summary" into tm-dev 2022-04-14 16:14:21 +00:00
Tsung-Mao Fang
de992a99f8 Merge "Use androidx.window from prebuilt." into tm-dev am: 7877c073e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17644388

Change-Id: I89af98755aef258bfa9234bcdd490ca9a43c9e94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 15:05:45 +00:00
Diego Vela
668aea9b55 Use androidx.window from prebuilt.
Use androidx.window prebuilt for consistency.

Bug: 223114509
Test: m -j

Change-Id: Ifeba7d0073ba7aeb6308c186738161c4857a97a3
2022-04-14 09:55:36 +00:00
SongFerng Wang
459429c182 Merge changes I6871db6c,Ia261e3b4,I1588bd4a,I1b81faf0,I9a596440, ... am: 3e9e489c0c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064409

Change-Id: I0737e21c4a5939de394c418cb9261a52a3f5df86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:21 +00:00
SongFerngWang
6282d8a5de In E+E, the user can't enable the PSIM am: ccd55cc5c9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064408

Change-Id: If0aeb9e68364fc649d0b3877ba4f8bdc0dd9afec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:20 +00:00
SongFerngWang
83311b6208 [MEP] psim's logical slot index is 0 am: 2479c9f7bd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2064407

Change-Id: Id29b82927a35b45ca339abbf3896d7a2e788b426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:19 +00:00
SongFerngWang
f795e9b6d0 [MEP]The Esim's PhysicalSlotIndex is wrong am: d3f3730721
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063560

Change-Id: If1d1172fd657eb43510b1672323244317163d1a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:10 +00:00
SongFerngWang
a6794dcc8a The list does not follow the UX dialog design doc in alert dialog. am: f88ffb09fd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2063558

Change-Id: I117ed9f34fdf3758525dec30b1364db0a7645bf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-14 08:24:08 +00:00
SongFerngWang
ef80331fb0 [MEP] sort the simSlotMapping by logcal slot id
The modem assign the simSlotMapping like UiccSlotMapping[
(mPortIndex=0, mPhysicalSlotIndex=0, mLogicalSlotIndex=1),
UiccSlotMapping (mPortIndex=1, mPhysicalSlotIndex=0,
mLogicalSlotIndex=0)]. The settings replace the first one
UiccSlotMapping when user insert psim and the both of esim
profile are not enabled. It is not correct. The root cause is that
the settings did not sort the simSlotMapping by logcal slot id.

Bug: 223662007
Test: atest UiccSlotUtilTest  (PASS)
Change-Id: I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85
Merged-In: I6871db6c2d8d7b9f3cb334bb5cd2c7978b5b3b85
2022-04-14 03:47:20 +08:00
SongFerngWang
ccd55cc5c9 In E+E, the user can't enable the PSIM
In the E+E and there is the empty slot, the user can't enable PSIM.
Since the settings can't set the correct simSlotMapping.

Bug: 222231991
Test: atest UiccSlotUtilTest (All passes) and Build pass
Change-Id: Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec
Merged-In: Ia261e3b41c6c4a43a5429815d93ae9f6ff16f0ec
2022-04-14 03:46:28 +08:00
SongFerngWang
2479c9f7bd [MEP] psim's logical slot index is 0
psim's logical slot index is 0, so changing the API and adding test
cases.

Bug: 221839363
Test: atest UiccSlotUtilTest
Change-Id: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
(cherry picked from commit b162438b5d)
Merged-In: I1588bd4a2f552a6b41844883b6ad50f1bfec95de
2022-04-14 03:45:55 +08:00
SongFerngWang
d3f3730721 [MEP]The Esim's PhysicalSlotIndex is wrong
Using the getUiccSlotInfo API to get the PhysicalSlotIndex of esim

Bug: 215302360
Test: atest UiccSlotUtilTest
Change-Id: Ic43d6c4a3209d24673769b71b9a148e780ee81ab
Merged-In: Ic43d6c4a3209d24673769b71b9a148e780ee81ab
2022-04-14 03:33:42 +08:00
SongFerngWang
f88ffb09fd The list does not follow the UX dialog design doc in alert dialog.
Please refer the comment#1 at bug and there are change below
- the divider is 4dp
- the item's radius is different in the list.

Bug: 216233391
Test: manual test: check the UI
make RunSettingsRoboTests ROBOTEST_FILTER=SimListDialogFragmentTest (PASS)

Change-Id: I758d60202fcf477aeb49014e60b949e7ad08c082
Merged-In: I758d60202fcf477aeb49014e60b949e7ad08c082
2022-04-14 03:32:16 +08:00
TreeHugger Robot
18b0dde5d7 Merge "Unchecked battery saver switch once it's 1st launch" into tm-dev am: 55aba46fe9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17707388

Change-Id: I748241f2dc580bd910c9455ad15821bbdd455a32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 11:56:26 +00:00
TreeHugger Robot
55aba46fe9 Merge "Unchecked battery saver switch once it's 1st launch" into tm-dev 2022-04-13 11:15:46 +00:00
Wesley Wang
d2ce1d9194 Unchecked battery saver switch once it's 1st launch
- Add low battery warning ack check to onSwitchChanged(), reset the
   switch to off once it's 1st time launch, the switch should be enable
   by battery saver change event at 1st instead of enable directly, will
   not check this state anymore after 1st launch

Bug: 227725656
Test: make RunSettingsRoboTests
Change-Id: I79f502f567fae5dd10166d8b24fd50d59c261001
2022-04-13 17:06:52 +08:00
Edgar Wang
f520a1f648 Merge "Index the gesture options in System Navigation Settings page" into tm-dev am: 5a539c5cb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17684395

Change-Id: I3c3891c154e4fec5214741afc9a9792fa39b5e90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 05:00:13 +00:00
Edgar Wang
5a539c5cb2 Merge "Index the gesture options in System Navigation Settings page" into tm-dev 2022-04-13 04:34:04 +00:00
PETER LIANG
c18637a51f Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev am: 8bd6647885
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17614845

Change-Id: Ia7c99a555600f57989dcecd6afe7235640282a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:44:51 +00:00
PETER LIANG
8bd6647885 Merge "Fix that device isn't responding for a while when resetting all settings on “Display size and text” page." into tm-dev 2022-04-13 00:39:27 +00:00
Peter_Liang
09a2a49bd3 Fix that device isn't responding for a while when resetting all settings on “Display size and text” page.
Goal:
Probably has the race condition issue between "Bold text" and  the other features including "Display Size", “Font Size” if they would be enabled at the same time, so our workaround is that the “Bold text” would be reset first and then do the remaining to avoid flickering problem.

Bug: 223747686
Bug: 220082104
Bug: 220070773
Test: make RunSettingsRoboTests ROBOTEST_FILTER=TextReadingPreferenceFragmentTest
Change-Id: If1425fe2579bec8dded69680ac73fbfb03c37321
2022-04-13 00:38:44 +00:00
TreeHugger Robot
71f87d544e Merge "Add missing extra when launching apps" into tm-dev am: 14a3861f0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17721989

Change-Id: Ib9e96390eb5b388ce8cc65bc41071de860450083
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13 00:35:55 +00:00
TreeHugger Robot
14a3861f0b Merge "Add missing extra when launching apps" into tm-dev 2022-04-12 23:27:14 +00:00
Julia Reynolds
87bb1b34c5 Add missing extra when launching apps
As promised in the api docs

Test: AbstractZenModeAutomaticRulePreferenceControllerTest, view
schedule DND page
Fixes: 221423986

Change-Id: I7ddc1b112950da225afa2ba13ebf5df481922177
2022-04-12 16:20:01 -04:00
TreeHugger Robot
f0d733d51f Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev am: 7a4f6a5ba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17474927

Change-Id: Idf69f945ca458d3abcc71be9a0f98f18193afd2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12 17:28:36 +00:00
TreeHugger Robot
7a4f6a5ba3 Merge "Apply only RING_VIBRATION_INTENSITY to ringtone vibrations" into tm-dev 2022-04-12 17:24:05 +00:00
Edgar Wang
257ebe4a5e Index the gesture options in System Navigation Settings page
Fixes: 167536360
Test: manual verify & robotest
Change-Id: Ie1a24a7206153dc1405f8a28369a6bade11ddd39
2022-04-11 21:05:37 +08:00
TreeHugger Robot
66903e1328 Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev am: 3ed73b7b2d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17630131

Change-Id: I2535c12e487cce2beb462995f0abda80415cf626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-09 09:22:00 +00:00
TreeHugger Robot
3ed73b7b2d Merge "Fix unexpected Wi-Fi hotspot shutdown" into tm-dev 2022-04-09 08:59:05 +00:00
Mill Chen
9cbec63704 Merge "Add cache mechanism for secondary users in Storage" into tm-dev am: 34eecaad79
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17182074

Change-Id: If51dbd3ab6723ff8bc15035118a3bf11d05c8312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 06:13:01 +00:00
Mill Chen
34eecaad79 Merge "Add cache mechanism for secondary users in Storage" into tm-dev 2022-04-08 05:48:45 +00:00
Weng Su
6c42636cb8 Fix unexpected Wi-Fi hotspot shutdown
- Filter out unnecessary onSwitchChanged callbacks when the switch is
  disabled, which should not be triggered by user input.

- Refine the state handling function to avoid unnecessary
  onSwitchChanged callback.

- Refine the error handling of isHotspotPasswordValid function.

Bug: 227719584
Test: manual test
make RunSettingsRoboTests \
  ROBOTEST_FILTER=WifiTetherSwitchBarControllerTest

Change-Id: If62aaadc8ddb214769b1367d7801b6125bb5377c
2022-04-08 05:35:14 +08:00
Peiyong Lin
8e23b02de5 Merge "Remove GameSettings and ExtraAppInfo." into tm-dev am: 7ef70db34d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17599733

Change-Id: If856da79393481c5c5d4fbddfd966a2f9d0879f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:54 +00:00
Chaohui Wang
2e5180884a Merge "Clean up unused Sliceable.copy()" into tm-dev am: f2178a48ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17539525

Change-Id: I10e8e4a64531f5e4b8340b98ab3783f516b8c492
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 17:55:08 +00:00
Peiyong Lin
7ef70db34d Merge "Remove GameSettings and ExtraAppInfo." into tm-dev 2022-04-07 17:48:18 +00:00
Chaohui Wang
f2178a48ee Merge "Clean up unused Sliceable.copy()" into tm-dev 2022-04-07 17:31:08 +00:00
TreeHugger Robot
e406597fe2 Merge "Restrict Wi-Fi toggle in Internet Settings" into tm-dev am: 59c849da4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17628094

Change-Id: I2b91d4ac1320ce79037c073f913800f0f0ca785c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-07 11:54:52 +00:00
Weng Su
22c8bf81e1 Restrict Wi-Fi toggle in Internet Settings
- Disable Wi-Fi toggle when user is not allowed to change Wi-Fi state.

- Show restriction message in Wi-Fi toggle summary.

- See the result screenshot in b/203168097#comment24

Bug: 203168097
Test: manual test
atest -c WifiSwitchPreferenceControllerTest

Change-Id: I3cfe2f4f0e855dde91a82babe3a03005c3985d59
2022-04-07 12:06:13 +08:00
TreeHugger Robot
3a23af64cd Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev am: d23aa91e8b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17578008

Change-Id: I83e7923119669ea604bdd72f121d3182bf2dd550
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-06 15:00:32 +00:00
TreeHugger Robot
d23aa91e8b Merge "Fixes 'learn more' link in ScreenTimeoutSettings" into tm-dev 2022-04-06 15:00:11 +00:00
Yi Jiang
284cb1c2b2 Fixes 'learn more' link in ScreenTimeoutSettings
Bug: 227292811
Test: make RunSettingsRoboTests

Change-Id: I0e5678e6760ebd590dfd526f362207776ece3a70
2022-04-06 06:49:19 +00:00
Chaohui Wang
5d0057615a Fix title clipped for "Custom settings for schedule"
Set rule to header, switch and action buttons controllers before their
isAvailable() is called in onCreate().

Fix: 228262001
Test: manual
Change-Id: Idc0ea779ab768497a8426ac847c4bbb2c6c4faea
2022-04-06 13:57:48 +08:00
TreeHugger Robot
f733c0d7c9 Merge "Added test for FP Enroll vibration" into tm-d1-dev 2022-04-06 01:04:47 +00:00
Joshua McCloskey
2a05de0df1 Added test for FP Enroll vibration
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=FingerprintEnrollEnrollingTest
Fixes: 222593183
Change-Id: I18ba2471c506c9a34151dc34c5f5f423db478c06
2022-04-05 23:28:14 +00:00