Commit Graph

48293 Commits

Author SHA1 Message Date
Jason Hsu
c504d93894 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346

Change-Id: I122a929ee4ddfc9981dc492a4b209b78422c5bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:51:26 +00:00
Jason Hsu
4ea92477bb Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344

Change-Id: I4032413c971afa68b665e3cc1448dafad0bfcb67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 14:45:18 +00:00
Jason Hsu
0c57f69f60 Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev 2023-05-12 14:20:54 +00:00
Jason Hsu
181cfa3aa5 Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev 2023-05-12 14:20:23 +00:00
SongFerng Wang
599fc1a314 Merge "The UI does not remove the preference" into udc-dev am: 2821342259
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828

Change-Id: Ic93b7fb046f2c91ae594b61ad395679f86901925
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:48:45 +00:00
Chaohui Wang
a896e1f3e9 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: I9fab4b8455e745f2feda97c2485eb247bd1adb68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 13:47:57 +00:00
SongFerng Wang
2821342259 Merge "The UI does not remove the preference" into udc-dev 2023-05-12 13:39:40 +00:00
Chaohui Wang
74e1412f8e Merge "Fix Bluetooth tethering toggle status" into udc-dev 2023-05-12 13:32:04 +00:00
Treehugger Robot
2318405bcb 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: I5ec64979638d3764a69c8a08f9c8916be7c0598b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:39:22 +00:00
Charles Chen
ebecdcf563 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: I46cc89165bca38fdc61baff236853ca494df9c44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 12:39:11 +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
Oli Thompson
ef25255311 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: Ida56d040d8ea5361f3aa57dd8fecd62124a438d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 11:36:03 +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
db6119e840 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: I968669dafda341eb56e4f8d43fd4c51854595b7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:00:22 +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
6d57de3418 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: I7b86992ad5572b2c4bd86b1c5935839bceaa1186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 03:54:12 +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
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
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
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
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
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
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
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
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
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
jasonwshsu
5656caecd0 Correct shortcut summary to have different software types of shortcut result
Root Cause: Did not consider different software types shortcut in AccessibilityShortcutPreferenceFragment

Solution: Add support for different software shortcut types

Bug: 263451053
Test: manual change shortcut type and check
Change-Id: Ic425fdab790d4bbf1de6418ada382e420a9860fc
2023-05-11 22:23:16 +08: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
tom hsu
75b24e421e [Settings] Remove redundant code.
Bug: 280236099
Test: make passed
Change-Id: I34e0632887ac38658761abd7d6a7e9f1e0f84bf1
2023-05-11 21:12:29 +08:00
Treehugger Robot
a0c32784ea Merge "Avoid showing "0 minute" in the charge time label" into udc-dev am: 86f145d22a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157339

Change-Id: I8305321fbd714d439171437c8500f063ee01d8a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 12:58:03 +00:00
Treehugger Robot
86f145d22a Merge "Avoid showing "0 minute" in the charge time label" into udc-dev 2023-05-11 12:54:55 +00:00
tom hsu
50dc4e857b Ordering the SIM display name by slot ID to the preference summary.
Bug: 271975836
Test: Manual Test
Change-Id: Ib28062c8d0f1299cf30d494561c161fc4532dbc9
2023-05-11 20:48:09 +08:00
Treehugger Robot
cb9d74cea2 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev am: 1b91f61633
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23124522

Change-Id: Ia53318c8bf1dcd32af55934506a2ea0d15250e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 11:33:42 +00:00
ykhung
7fdd0e9ef9 Avoid showing "0 minute" in the charge time label
Remove the charge to full time label if its value is invalid
https://screenshot.googleplex.com/5psbvFpcm2CFdRB

Test: make test RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.fuelgauge.*
Fix: 278740808
Change-Id: I765cdcdee8525adb2583d5950bc646c604c744de
2023-05-11 19:13:38 +08:00
Treehugger Robot
1b91f61633 Merge "Record app optimization mode backup into BatteryHistoricalLog" into udc-dev 2023-05-11 10:54:55 +00:00
Treehugger Robot
4d61561fa3 Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081

Change-Id: I94f33e7f52875dbccbf6327430a6192ce01a4ff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 10:10:41 +00:00
Treehugger Robot
59fa9de0cf Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev 2023-05-11 09:42:23 +00:00
TreeHugger Robot
402ffdeaf6 Merge "Remove search entries from old pages when SC is on." into udc-dev am: d2e8495f4c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23122025

Change-Id: Iacfe9bbe1a258baac3e48c24e283b1ed3954cf2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 08:44:49 +00:00