Commit Graph

48392 Commits

Author SHA1 Message Date
Treehugger Robot
c0db5b8c33 Merge "Update battery settings remaining time format" into udc-dev am: e99f757f60 am: a823380436
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199829

Change-Id: I95939e1db59df1e87d9b41aabc6db758903c663f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:21:45 +00:00
Charles Chen
3381df525b Merge "Improve Settings launch performance for normal phones" into udc-dev am: 75e591e413 am: 0e46e04fb5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23123008

Change-Id: If0ba5e55167837372e10f933cfd5fb41ec73dc60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:21:38 +00:00
Treehugger Robot
a823380436 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: I78e897de5a2198f21de61422b88adbc4cf7aa34b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:43:30 +00:00
Charles Chen
0e46e04fb5 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: I18719743b87034ac5fdbdea213f5d70b7a9c1946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:43:15 +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
Peter Zhang
884e3b3ef8 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev am: 5b81bbfd02
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085598

Change-Id: I63d4c2c08447a78ee162a79d26b50ccb074d566f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:19:15 +00:00
Peter Zhang
4b387512f7 Merge "Expand SettingsLib ProviderTile to support non-switch type of Preferences" into udc-d1-dev am: 15a11c4123
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23050050

Change-Id: Ic5635e277a0e0b537f3d5c380926cc5a96467394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:18:55 +00:00
Oli Thompson
82129a404a Merge "Update Work profile settings" into udc-dev am: 787a054c93 am: c5d6f00d7c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252125

Change-Id: I96bebdd1607adc0b1955dbef80001bd1488d1d06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:17:43 +00:00
Peter Zhang
5b81bbfd02 Merge "Render an additional icon to the tappable tiles with pending intents" into udc-d1-dev 2023-05-12 12:12:21 +00:00
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
Tom Hsu
09169f4b1b 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: Ic32dc15740c5295a939c76f67dde7ee77444063d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:44:01 +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
Tom Hsu
0af8c60342 Merge "[Settings] Avoid to unregister wrong observer" into udc-dev 2023-05-12 05:16:28 +00:00
Zoey Chen
dea9562e08 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: I3e70cc01ec8c768f93f01030b4b06b94381c235b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 04:34:49 +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
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
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
Tetiana Meronyk
683d219f70 Merge "Make user creation flow in a single dialog" into udc-dev am: 66dba214e6 am: 53d32efa48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22849656

Change-Id: I5105c8b7b683d83ad2f7287bac1e1aed2868200d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:42:44 +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
53d32efa48 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: Ica48008946e313cf559f08fd1c4a79ebaf29c0a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:16: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
6832a32430 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: I1da1719b323d55674ed01bfe12e9afa52e62075a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:31:44 +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
Hao Dong
2386847a2f 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: Ibbea1584e774a5249bfb73d8f3e98b175b963225
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:51:36 +00:00
Yuxin Hu
2c1cbacb84 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: If6fa7f6813163fc7f96b15c553cc680be580e08b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:28:28 +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
37dc9f703c 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: I17ef944bc6163feee27ea59fcde09f9d65bbd37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 21:43:22 +00:00
Yuxin Hu
6e3aba5366 Merge "Add AndroidJUnitTest for developer option switch" into udc-dev 2023-05-11 20:48:57 +00:00
Hao Dong
3d52ce0a95 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: I6436874a454da9870a6e872e67334a5432c77635
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 18:39:04 +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
Hao Dong
0ff2d2b2af 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: Iaaab846636e37e82b01d0a11881083be760a482a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:54:13 +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
3a788f845e 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: Id4948f9511ce543ccad9256c20a58f9d4f9e9603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:25:45 +00:00
Treehugger Robot
ce0a356845 Merge "[Settings] Remove redundant code." into udc-dev am: 643b51c42e am: 0acfbaefbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157343

Change-Id: Icf3daafbfbc03063ef2ff6474373e826e5b48590
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:25:37 +00:00
Treehugger Robot
e2ff838b0c 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: I2b2bbe36980949ff99d36f18013c2be2d3767e5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:25:02 +00:00
Treehugger Robot
9799b0bfdb 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: I6ca26dce7454098b492e6016936c6091e89106f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 15:07:08 +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
0acfbaefbd 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: Ia20f150e902d55ca403c1d2a5ff424f17e69cb70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:48:46 +00:00
Treehugger Robot
1fa9e9fac5 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: Ic40b7e453eab49009aa6be24f39fef3e4641c393
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 14:43:41 +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
52e2ee66ac Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a am: 921b1f6a6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I7004df1ab07821273a6bf459528cac71450951e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 13:39:24 +00:00