Commit Graph

123163 Commits

Author SHA1 Message Date
Peter Zhang
15a11c4123 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev 2023-05-12 12:08:00 +00:00
Oli Thompson
c5d6f00d7c Merge "Update Work profile settings" into udc-dev am: 787a054c93
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I7fb263356e2430ec4aaddf3222c45e1fc9885167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 11:40:19 +00:00
Oli Thompson
787a054c93 Merge "Update Work profile settings" into udc-dev 2023-05-12 11:05:57 +00:00
Wesley Wang
77deb463a0 Update battery settings remaining time format
- Update the remaining time format to align with status bar
 - Remove unused test case since no more less than 7 or 15 remaining time
   case for battery settings
 screenshots:
   https://screenshot.googleplex.com/8jPYPj7yznGFU4b.png
   https://screenshot.googleplex.com/5GYXA2tusSUVmVQ.png
   https://screenshot.googleplex.com/3EnB3ejAxAzP28q.png
   https://screenshot.googleplex.com/5jeUxwBEyHotf9d.png

Bug: 281685505
Test: make SettingsLibRoboTests
Change-Id: If33e1828582845f78d8ef666c2b74ab5bba22357
2023-05-12 11:05:05 +00:00
Chaohui Wang
3988d11ddd Fix Bluetooth tethering toggle status
The mBluetoothPan is updated async, toggle status is set before data
loaded.

Refresh the status after load to fix this issue.

Fix: 272525310
Test: Manually when Bluetooth tethering is on
Change-Id: Ia306f3648ba8d32a63a8ec6c72260f7f43b830bc
2023-05-12 09:47:40 +00:00
SongFerngWang
0faf38eadd The UI does not remove the preference
The LE audio structure have two or more devices, it use CSIP to combine
them with the groupId. It breaks the UI structure, since the UI use the
map to save relationship between the bluetoothDevice and preference.
There are two or more devices using the same UI, it causes UI show the
wrong preference when CSIP do switching of device.
Remove the unuse device when UI refreshing.

Bug: 281697186
Test: Build pass
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaDeviceGroupControllerTest
Change-Id: I798cf9edb590c4a25273913d2f2faf0ed4364ba9
2023-05-12 17:18:37 +08:00
Tom Hsu
d263a5921f Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342 am: 77e126db56
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: Ia012c94bca619f1d2165a89908341b2c9aed98d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:48:00 +00:00
Tom Hsu
77e126db56 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev am: 0af8c60342
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162866

Change-Id: I4c31c0f22b392025b8430d8e9fcc75b0eb2e54d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:04:41 +00:00
jasonwshsu
212470d0a6 Move 'Audio Output' to Accessibility hearing device page
* Extract the common part into HearingAidHelper.
* Remove abstract getHearingDevice(). Change to get the hearing device when needed.
* Move several classes from Bluetooth into Accessibility

Bug: 281783079
Test: make RunSettingsRoboTests ROBOTEST_FILTER="(HearingDeviceAudioRoutingBasePreferenceControllerTest|AccessibilityHearingAidPreferenceControllerTest|HearingAidHelperTest|HearingAidAudioRoutingPreferenceControllerTest|HearingDeviceCallRoutingPreferenceControllerTest)"
Change-Id: I79049107409b7086c6dcc8d48a6323e171ed1535
2023-05-12 13:46:53 +08:00
Tom Hsu
0af8c60342 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev 2023-05-12 05:16:28 +00:00
Zoey Chen
eb5eb22acc Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f am: 7b4f5c8a50
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: Ie28b6c967247bc6206aeac6cb91da9ab216b0a14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 04:38:53 +00:00
Yanting Yang
64c085bd19 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f am: f2c5b7f2e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: Icf34fd8963fb99eb9a5b85c8a14489290bfd7f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 04:38:46 +00:00
Zoey Chen
7b4f5c8a50 Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev am: 4d917d990f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23074017

Change-Id: I5ddea663b4ddb872a91e3e08bc29466fd48f3d0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 03:57:18 +00:00
Yanting Yang
f2c5b7f2e7 Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084

Change-Id: Ia8fc7ff7f82323e2bd55ad023e90bf6e50431197
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 03:57:04 +00:00
Zoey Chen
4d917d990f Merge "[Panlingual] Do not show dialog in recycle. Set LocaleEditor as the parent fragment and control the dialog." into udc-dev 2023-05-12 03:37:37 +00:00
Yanting Yang
f0e440109f Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev 2023-05-12 03:20:14 +00:00
Chris Antol
8e93ac6670 Remove SPA gating from App Cloning click ingress
Bug: 277002988
Test: existing tests. flag on by default, no-op unless disabled, which now has access to this otherwise accessible feature
Change-Id: Ic37e4c76d379133f1dbda3c65930ae44afc24f70
2023-05-12 03:03:12 +00:00
TreeHugger Robot
5f40973695 Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e am: d084c192be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: Idfc911cda3f38c1c5ed8314447f5b6aba2fd74b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:50:33 +00:00
Zoey Chen
fb6b6b0bcc [Panlingual] Do not show dialog in recycle. Set LocaleEditor as the
parent fragment and control the dialog.

Keep the dialog and the locale list after rotation

Bug: 279527362
Change-Id: I349fd9d0fea5b43a8bbb2a23fa60fc4c5436c5cf
Test: make RunSettingsRoboTests -j128 ROBOTEST_FILTER=LocaleListEditorTest
Test: atest LocaleDialogFragmentTest
2023-05-12 02:40:13 +00:00
TreeHugger Robot
d084c192be Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev am: b7b444896e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157345

Change-Id: Ibe181103445c0952373064952dd15d34d37ade9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:09:25 +00:00
TreeHugger Robot
b7b444896e Merge "Fix failing test cases in MobileNetworkSummaryControllerTest" into udc-dev 2023-05-12 01:34:00 +00:00
Tetiana Meronyk
9cc26f4e7b Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 43835107e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I965f03a19b64f5a31b26603f7fb94368230b3695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:43:04 +00:00
Tetiana Meronyk
43835107e7 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I816af33e0e4e6006234f76e58a1dbcf287a45606
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:21:52 +00:00
Tetiana Meronyk
66dba214e6 Merge "Make user creation flow in a single dialog" into udc-dev 2023-05-11 23:43:05 +00:00
Hao Dong
c5b3f62935 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f am: dd373e10e5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Icffc3a12145527dcb8c9873719c1c4a3adc8f1f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:34:09 +00:00
Hao Dong
dd373e10e5 Merge "Hide description text view if there is overlap." into udc-dev am: 1eb3724e1f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23162325

Change-Id: Ie5214e9c1dafbbc9fbadcf1cbbdb653a43afc581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:52:55 +00:00
Yuxin Hu
470d81c0d1 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366 am: 968a865d75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I2499798672736c36d2ce629145813e039c741a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:33:08 +00:00
Hao Dong
1eb3724e1f Merge "Hide description text view if there is overlap." into udc-dev 2023-05-11 22:10:55 +00:00
Yuxin Hu
968a865d75 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev am: 6e3aba5366
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23149451

Change-Id: I50d5b266a28908e44dfc6671d21764be968c09fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:49:21 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Treehugger Robot
2e7fb61869 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours am: ff50032a80 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic07cb19d0e1030e24582eff1faf3452f19c09268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:44:19 +00:00
Treehugger Robot
8f031b5e6a Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11 am: 58c8fae9db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: I05b534977c4c03bf4048f8969d9bc1bbcd0206af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:43:12 +00:00
Bill Yi
177f3dbdaf [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours am: 40d95455c0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7536b55258841a9425bafeaa714a6d3c6074e0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:43:05 +00:00
Treehugger Robot
ec9917069a Merge "Fix string" into udc-dev am: 81ac516705 am: 0b57a35470
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: I6c336bf3632b810a6f6768afa590d8ab85b613d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:42:46 +00:00
Treehugger Robot
ff50032a80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours am: e7d695f07a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib5851dbbfd91b13e24970394f62365881a41dba4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:00:42 +00:00
Treehugger Robot
58c8fae9db Merge changes from topic "tc_change_2305100725_23" into udc-dev am: a5af82be11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121667

Change-Id: If3c8f54780ccd351f3096d65e2e08c04ac2e575f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:00:14 +00:00
Bill Yi
40d95455c0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d am: f637cc7f49 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I09e9852e5d5019401c4b9d17aa1b1ad7fff4eb59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 20:00:06 +00:00
Treehugger Robot
0b57a35470 Merge "Fix string" into udc-dev am: 81ac516705
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199

Change-Id: Ia806f9235c495cd7d97953b5c07b2a66c454a358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:59:03 +00:00
Treehugger Robot
e7d695f07a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: b570c10767 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie8b6175859af028f1341d807fa08567b5dfae1f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 19:56:48 +00:00
Treehugger Robot
b570c10767 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-05-11 19:28:21 +00:00
Treehugger Robot
a5af82be11 Merge changes from topic "tc_change_2305100725_23" into udc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eac02feb2d
  Import translations. DO NOT MERGE ANYWHERE
2023-05-11 19:28:21 +00:00
Treehugger Robot
81ac516705 Merge "Fix string" into udc-dev 2023-05-11 19:21:54 +00:00
Hao Dong
4762df7e21 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf am: 51554eb9a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I8f0423bba882ed4d2ba3c84fb99dbb38aef0683f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:41:24 +00:00
Yuxin Hu
715a70603c Add AndroidJUnitTest for developer option switch
Bug: b/270994705
Test: m -j45
atest SettingsRoboTests:GraphicsDriverEnableAngleAsSystemDriverControllerTest
atest -c GraphicsDriverEnableAngleAsSystemDriverControllerJUnitTest

Change-Id: Idbb93458a64894c3eba78a8f9373c40e3ddf35c5
2023-05-11 17:59:21 +00:00
Hao Dong
51554eb9a1 Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev am: c753221adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121665

Change-Id: I0fe97397b725927263ef4bf4e550199911c64217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:57:59 +00:00
Becca Hughes
f7c4d9c903 Fix string
Test: make
Bug: 281047738
Change-Id: I7f65749cbdee95ab9447dc0b055d66fd962547dc
2023-05-11 17:45:30 +00:00
Hao Dong
cddf296c82 Hide description text view if there is overlap.
1. Includes udfps enroll view in xml files and cleans up FingerprintEnrollEnrolling adding udfps enroll view code.
2. Clean up SETTINGS_SHOW_UDFPS_ENROLL_IN_SETTINGS flag.
3. If description text view has overlap with udfps progress view, hide the description text view.

Test: atest FingerprintEnrollEnrollingTest
Test: manually test by setting both display and text largest size and
start enrolling fingerprint; the description is hidden if it's too long.
Bug: 260970216
Change-Id: I085dc62993ffa22d018dd57517c96d69e9d9cbcb
2023-05-11 17:34:07 +00:00
Hao Dong
c753221adf Merge "Set EXTRA_KEY_FOR_FINGERPRINT for choose lock screen." into udc-dev 2023-05-11 17:17:06 +00:00
tom hsu
5e2862f2e3 [Settings] Avoid to unregister wrong observer
Bug: 262345047
Test: atest passed.
Change-Id: If324e8f35c15053b48320f86ff22759a6a68a62f
2023-05-12 01:10:19 +08:00
Treehugger Robot
90456a7140 Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a am: 9799b0bfdb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342

Change-Id: I75aafba2b90ce316476ae5f6f6603a1a8566fe53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:30:42 +00:00