Commit Graph

139687 Commits

Author SHA1 Message Date
Joshua Mccloskey
16f973b836 Revert "Restart fingerprint auth on cancel."
This reverts commit 4efd4c16f9.

Reason for revert: Breaks auth behavior

Fixes: 347858844

Change-Id: Ie1b8be9dfae2cba7e2b37187f08cf1360aedf29f
2024-06-25 21:35:00 +00:00
Joshua McCloskey
4efd4c16f9 Restart fingerprint auth on cancel.
Test: atest FingerprintSettingsFragmentTest
Fixes: 336572954
Change-Id: Ie64d509caf052271a141e466f5c840e92f5dc119
2024-04-29 22:30:23 +00:00
Treehugger Robot
1eca5e767d [automerger skipped] Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev am: 29ad4163c2 -s ours
am skip reason: Merged-In I2c4d2b7e224973c4afa75573e05afe7607d2ae6b with SHA-1 f4462ac5c2 is already in history

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

Change-Id: Ic64b0fe542f96aee7ba31afe92c9c18448af9268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 18:07:39 +00:00
Meng Wang
0fd3a69995 [automerger skipped] When erasing an eSIM, verify the device screen PIN lock if one is set. am: 63d10cc4ba -s ours
am skip reason: Merged-In I2c4d2b7e224973c4afa75573e05afe7607d2ae6b with SHA-1 f4462ac5c2 is already in history

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

Change-Id: Ib5e8cc40346bca3d8f25974b34a63909177574f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 18:07:35 +00:00
Treehugger Robot
29ad4163c2 Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into 24D1-dev 2024-04-18 17:46:59 +00:00
Chun-Ku Lin
0245c465b9 Merge "Update footer text whenever the ScreenPinningSettings is shown" into main 2024-04-18 17:25:17 +00:00
Rafael Higuera Silva
066283ea45 [automerger skipped] Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev am: 6389239f76 -s ours
am skip reason: Merged-In Iccec9245da27d525cfb3d74504ab86859e152a6e with SHA-1 ea0453e5f6 is already in history

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

Change-Id: I0a47f7656904e6ee46b6789f9228782232541051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 16:53:24 +00:00
Rafael Higuera Silva
7607f311af [automerger skipped] Add logic to log interaction of RAC warning dialog. am: 268fa16d5b -s ours
am skip reason: Merged-In Iccec9245da27d525cfb3d74504ab86859e152a6e with SHA-1 ea0453e5f6 is already in history

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

Change-Id: Ifc04394abdfbb3daf12c9bbcfc5937a1210a7abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-18 16:53:19 +00:00
Rafael Higuera Silva
6389239f76 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-18 16:28:38 +00:00
Chaohui Wang
660986353e Fix NetworkScanRequest maxSearchTime
Which should read from resource
R.integer.config_network_scan_helper_max_search_time_sec

Fix: 334814332
Test: manual - with network scan
Change-Id: I4afefe6470d6ef4bf325e83a0decce41b321e201
2024-04-18 05:41:11 +00:00
Roy Chou
39e42bf97a Merge "feat(onefingerpan): hide the one finger pan settings when window mode only" into main 2024-04-18 03:07:04 +00:00
Jason Chiu
8d3d975795 Merge "Remove the package name restriction of ACTION_UNINSTALL_PACKAGE" into main 2024-04-18 01:49:09 +00:00
Amith Yamasani
83da3f0041 Merge "Call noteAppRestrictionChanged when toggling restrictions/exemptions" into main 2024-04-18 01:47:35 +00:00
Edgar Wang
55a27a4160 Merge "Allow dynamic injecting preference into specific preferenceCategory" into main 2024-04-18 01:02:54 +00:00
Meng Wang
63d10cc4ba When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 329202869
Test: manual - see b/329202869#comment41
Merged-In: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
Change-Id: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
(cherry picked from commit f4462ac5c2)
2024-04-17 22:16:46 +00:00
Meng Wang
0f4680e79b Merge "When erasing an eSIM, verify the device screen PIN lock if one is set." into main 2024-04-17 22:15:39 +00:00
Meng Wang
f4462ac5c2 When erasing an eSIM, verify the device screen PIN lock if one is set.
SIM PIN lock existence isn't checked anymore.

Bug: 329202869
Test: manual - see b/329202869#comment41
Change-Id: I2c4d2b7e224973c4afa75573e05afe7607d2ae6b
2024-04-17 22:13:23 +00:00
Treehugger Robot
aafecbef69 [automerger skipped] Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev am: f02cfc9526 -s ours
am skip reason: Merged-In If4e3285b3715e9630d4932d4bf1bcb71e4167cff with SHA-1 33f5050526 is already in history

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

Change-Id: I0517816a66502d454686a71e90af051116068c2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 17:43:45 +00:00
Rafael Higuera Silva
fdb6eb9011 [automerger skipped] Add logic to log interaction of RAC warning dialog. am: 5405aa17a1 -s ours
am skip reason: Merged-In If4e3285b3715e9630d4932d4bf1bcb71e4167cff with SHA-1 33f5050526 is already in history

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

Change-Id: Id7169f6d686e1154e940a92ebdcacb9ca58a6ec2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 17:43:40 +00:00
Treehugger Robot
f02cfc9526 Merge "Add logic to log interaction of RAC warning dialog." into 24D1-dev 2024-04-17 17:30:24 +00:00
SongFerng Wang
9a9b22b3ca Merge "Finish the sims page when airplane mode on" into main 2024-04-17 16:44:44 +00:00
SongFerng Wang
5157e1d35a Merge "Avoid to reset the data" into main 2024-04-17 10:31:32 +00:00
songferngwang
f8a48668b0 Finish the sims page when airplane mode on
Bug: 335392575
Test: verify UI
Change-Id: I9d1e4c243e195abe8c917dc83ffed175f7ef74ec
2024-04-17 10:27:46 +00:00
Matías Hernández
fb0e00e3eb Merge "Introduce ZenModesBackend and ZenMode" into main 2024-04-17 08:59:48 +00:00
SongFerng Wang
27e947f729 Merge "Set Phone number format as LTR" into main 2024-04-17 08:59:26 +00:00
songferngwang
a92051ad07 Avoid to reset the data
Bug: 333646302
Test: verify the data after rotating the device
Change-Id: I8fd74d174792a3a72e1c9e0f4394ad816b37425e
2024-04-17 08:36:29 +00:00
Jason Chiu
5d82f6a648 Remove the package name restriction of ACTION_UNINSTALL_PACKAGE
PackageInstaller has protected the intent action by setting
"android:priority=1".

Test: manual
Fix: 332228634
Change-Id: If0794e5957366d8b26acd0362b59c6c9076a0c4f
2024-04-17 16:26:52 +08:00
Samuel Huang
082303508b [automerger skipped] Merge "Disable SIM On/Off operation when device is in Satellite Enabled Mode" into 24D1-dev am: efe0ce2b2f -s ours
am skip reason: Merged-In I7aaaf43b4c449129197e7cc92565d274ffdd2d8c with SHA-1 cbf5154291 is already in history

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

Change-Id: Ibdd9191d122c8e20513f6a4b80bbda8a383ef102
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 08:02:15 +00:00
Samuel Huang
641976b765 [automerger skipped] Disable SIM On/Off operation when device is in Satellite Enabled Mode am: 316e7bf3e6 -s ours
am skip reason: Merged-In I7aaaf43b4c449129197e7cc92565d274ffdd2d8c with SHA-1 cbf5154291 is already in history

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

Change-Id: I4942a5812efe27c690b7eab69ba73756efa122c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 08:02:12 +00:00
Samuel Huang
efe0ce2b2f Merge "Disable SIM On/Off operation when device is in Satellite Enabled Mode" into 24D1-dev 2024-04-17 07:44:44 +00:00
songferngwang
3219f6da97 Set Phone number format as LTR
Bug: 334339964
Test: verify the phone number format
Change-Id: Ifa5dc394c3d9b8d7565e6200a47b7cb9fb1bba84
2024-04-17 07:10:20 +00:00
SongFerng Wang
15d619f9b4 Merge "Text input in dialog should extend to full width" into main 2024-04-17 06:28:28 +00:00
Chun-Ku Lin
247476bab7 Update footer text whenever the ScreenPinningSettings is shown
Bug: 333029993
Test: atest ScreenPinningSettings
Test: manual
Flag: EXEMPT low risk bug fix
Change-Id: Ia14a50fcc81d672732b78c523968a5921cae65b1
2024-04-17 05:34:59 +00:00
Amith Yamasani
7676217e4d Call noteAppRestrictionChanged when toggling restrictions/exemptions
This is to log the reasons for restriction level change and force stop

Bug: 333882527
Test: statsd_testdrive 863
      Toggle battery restrictions manually for an app and verify logging
      of reason
      atest BatteryOptimizeUtilsTest
Change-Id: Ifcc99efc1b6acc5a992f7d952967210b07319f2e
2024-04-16 21:58:40 -07:00
YK Hung
84050edcdd Merge "Update wireless charging string" into main 2024-04-17 04:47:38 +00:00
Yiling Chuang
37a35d5833 Update wireless charging string
Add a capability to provide different strings during wireless charging.

Bug: 316239566
Test: robotests
Change-Id: Ic7c70ae33ae951dfe931995e5ab0d478222d57c9
2024-04-17 03:22:38 +00:00
Treehugger Robot
18f72bb46f Merge "The editview's inputytype adds textMultiLine" into main 2024-04-17 02:47:21 +00:00
Jason Chiu
fd8c705af9 Merge "Restart or finish HomepageActivity when it's launched unexpectedly" into main 2024-04-17 01:37:23 +00:00
Jason Chiu
b0c011e077 Restart or finish HomepageActivity when it's launched unexpectedly
Settings homepage should be started with the flag FLAG_ACTIVITY_NEW_TASK
to ensure it's the first activity in a task. Otherwise, there will be UI
issues.

When homepage is started with FLAG_ACTIVITY_NEW_TASK but not the first
activity, it means another homepage activity has been started, so
finishing the current invocation will bring up the previous activity in
the task.

On the other hand, when homapage is not started with the flag and not
the first activty, it indicates that the invocation is from another
app. Restarting the homepage activity with FLAG_ACTIVITY_NEW_TASK will
keep the UI behavior consistent.

Fix: 297857732
Fix: 309045575
Test: robotest, manual
  1. Start Settings from QuickSettings, go to any subpage, navigate to
     home, click Settings icon on the launcher, and the previously
     opened page should be kept.
  2. On a LS device, start Settings from another app without
     FLAG_ACTIVITY_NEW_TASK, Settings should be started in dual-pane
     mode.
Change-Id: If1f31e26dc37f681bd97c185cbeac2de06bdd48f
2024-04-17 01:33:04 +00:00
Bill Yi
d1894bd823 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 1b10cde727 -s ours
am skip reason: contains skip directive

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

Change-Id: I072c7a5386644c497aa5b4a5e1325893e6cdf512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 18:46:03 +00:00
Bill Yi
5543d965f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1550742adf -s ours
am skip reason: contains skip directive

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

Change-Id: I77725f4627eef9f510a6dfd2d916ce96493786cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 18:45:46 +00:00
Bill Yi
da5810bf57 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-16 18:24:00 +00:00
Bill Yi
0d88db0110 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-16 18:24:00 +00:00
Bill Yi
0b09c8ab75 Merge "Import translations. DO NOT MERGE ANYWHERE" into main 2024-04-16 18:24:00 +00:00
Bill Yi
1b10cde727 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2024-04-16 18:20:34 +00:00
Treehugger Robot
15952f7af7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 5278c0f83e -s ours
am skip reason: contains skip directive

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

Change-Id: Ia6aa7a98b764b7a5cee4e6b8a5f84372a3d2feb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 17:52:46 +00:00
Bill Yi
e7e5b101f3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 391eb07072 -s ours
am skip reason: contains skip directive

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

Change-Id: I17655e728e6d9cad85d58b66a7425e4fe1b92f0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 17:52:42 +00:00
Treehugger Robot
f6a181896f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 093aa25cf3 -s ours
am skip reason: contains skip directive

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

Change-Id: Idf63e68e6c4d76a10695bd0b2f863eab664bdf61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 17:52:38 +00:00
Bill Yi
61a0d12d98 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 650dc6b4ad -s ours
am skip reason: contains skip directive

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

Change-Id: I92bd0b7400fdcd6b0af26c88806ad276ec4ff425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 17:52:20 +00:00
Treehugger Robot
0a066b29d3 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into 24D1-dev am: 4b86ea2ca3 -s ours
am skip reason: contains skip directive

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

Change-Id: I7c2d276a4f6adb47721e936977c8ec1dc5948c93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 17:52:12 +00:00