Chaohui Wang
8badf64092
Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826
Change-Id: I741fa8c4179c8d6f962b97a5a9146baf08a44cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:08:47 +00:00
Chaohui Wang
74e1412f8e
Merge "Fix Bluetooth tethering toggle status" into udc-dev
2023-05-12 13:32:04 +00:00
Treehugger Robot
e9091d1d7c
Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829
Change-Id: Id733fb05ab32151cfeae5cfe7c86daa9c9a63277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:44:41 +00:00
Charles Chen
3dfdf0dd85
Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008
Change-Id: I65c041ecbe99ad70e3348ded7d76b71ac445ca3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:28 +00:00
TreeHugger Robot
a102821490
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: Ib04d55ce7a2d5a840e6f8fc9758eaab6b60374c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:16 +00:00
Treehugger Robot
e99f757f60
Merge "Update battery settings remaining time format" into udc-dev
2023-05-12 12:29:14 +00:00
Charles Chen
75e591e413
Merge "Improve Settings launch performance for normal phones" into udc-dev
2023-05-12 12:21:00 +00:00
Charles Chen
8524048094
Improve Settings launch performance for normal phones
...
1. Initialize ActivitEmbedding component only if necessary
2. Early return to avoid executing long execution time operations
ex: initialize ActivityEmbedding component, feature flag operations
Test: manual - launch settings and profile
Test: run
v2/android-crystalball-eng/health/microbench/startup/firstparty/open-settings
on affacted devices
Test: atest SettingsHomepageActivityTest TopLevelWallpaperPreferenceControllerTest DashboardFeatureProviderImplTest TopLevelSettingsTest TopLevelWallpaperPreferenceControllerTest SearchResultTrampolineTest
Test: atest CtsSettingsTestCases
Fixes: 281505190
Change-Id: I0c1a1dc50f26c4ded02de82190dd7aad59c20c01
2023-05-12 12:20:40 +00:00
TreeHugger Robot
fd9ca0eae7
Merge "Update string for touch sounds" into udc-dev
2023-05-12 12:08:32 +00:00
Oli Thompson
6ea5106ae6
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: I6bc4625b6cdf79aa437d525aff8778b553ed2c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 11:40:18 +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
Tom Hsu
2dfa7516f0
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: I7f0712c0b0da36e8b81ebe6a425bb1f6fa352fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 06:04:38 +00:00
Tom Hsu
0af8c60342
Merge "[Settings] Avoid to unregister wrong observer" into udc-dev
2023-05-12 05:16:28 +00:00
Zoey Chen
34911e336c
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: Iad371a6c3dcd90fcf260acb3a5162eea8620c19a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:57:12 +00:00
Yanting Yang
76d3a97aa9
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: I5bd7d6ec4d0f5685a3d629722cc40d8794b378e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:57:02 +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
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
8fa511ea87
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: I5154c4cb123dd15a2c58a006a690b616de40adf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:09:43 +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
0967e63d43
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: Ic50866d1ba9461a805a93a39770cab85dda8ffdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 00:21:30 +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
771df2f4a6
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: I2a41cd67710f34cd74123e6979806a15d07783b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 22:56:23 +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
e58d73a958
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: I0e42e030b582577d8becbd3b7b48068643cfd090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 21:27:17 +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
755bff2524
[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: I7f3db47edd99a6e7a05a5b3daccd9d7062b9ab4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:03:44 +00:00
Treehugger Robot
3dd5923ee6
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: I900808f14cb432a54401379725ac7f29cb9c344a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:02:31 +00:00
Bill Yi
fdb5379a3e
[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: I65abe33b0e180253fc49c79ab457aedb8f659c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 20:02:23 +00:00
Treehugger Robot
6dd1415360
Merge "Fix string" into udc-dev am: 81ac516705
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23175199
Change-Id: I0920365fe3dd0e9ee7958ac82fbeb6f8359c6f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 19:58:53 +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
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
b570c10767
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
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
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
a17d706d89
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: Iedba9fd97c7657ac860276f7a0a19e0a89c4541b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:56:56 +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
b55a258d8f
Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev am: 59ec10b05a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157342
Change-Id: Ib9a230f8ce28b728f4d060eb0fcd8b98259ad436
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 15:07:11 +00:00
Treehugger Robot
59ec10b05a
Merge "Ordering the SIM display name by slot ID to the preference summary." into udc-dev
2023-05-11 14:52:04 +00:00
Treehugger Robot
4a0370c783
Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343
Change-Id: I949b2253f091d0cbb1797572a9f9d34ece27e9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:48:19 +00:00
TreeHugger Robot
341ec2f35f
Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev am: c271732a85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157341
Change-Id: I7784288b2466ef9b428ea7d3b55c16147268a289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 14:46:20 +00:00
Treehugger Robot
643b51c42e
Merge "[Settings] Remove redundant code." into udc-dev
2023-05-11 14:28:30 +00:00
Weng Su
e485615662
Fix failing test cases in MobileNetworkSummaryControllerTest
...
- Remove obsolete test items
- Update the new callback interface
Bug: 280044539
Bug: 280044731
Test: Manual test
atest -c MobileNetworkSummaryControllerTest
Change-Id: I8460c620c62981dd5ee3b280c1a7467c43dbceb1
2023-05-11 14:15:07 +00:00
Oli Thompson
08b4973f8e
Update Work profile settings
...
Change work apps toggle to a primary toggle
make Xprofile contact search toggle disable/enable when work profile is turned off
Add footer and change strings
Add tests
Test: atest ContactSearchPreferenceControllerTest, atest WorkModePreferenceControllerTest
Bug: 253009702 275538029
Change-Id: I3b2044a5fe3f2aff0748d66e701a3f0d7667ab7a
2023-05-11 14:02:27 +00:00
TreeHugger Robot
c271732a85
Merge "Fix failing test case in AllInOneTetherSettingsTest" into udc-dev
2023-05-11 14:01:25 +00:00