Bill Yi
325045641d
Merge changes from topic "tc_change_2305100725_44" into udc-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
2p: 7e3f3fd34d
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
2023-05-12 22:29:01 +00:00
Bill Yi
a27aa2d884
Merge changes from topic "tc_change_2305100725_44" into tm-qpr-dev-plus-aosp
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 13c4c2accb
Import translations. DO NOT MERGE ANYWHERE
2023-05-12 22:29:01 +00:00
Bill Yi
efe3ce5660
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-05-12 22:29:00 +00:00
Becca Hughes
75466c4eb1
Merge "Add extra null checks" into udc-dev am: 598ff21b78
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089
Change-Id: I9946b03d5a92b8a8328c4ffd3bb9d78eebbd81d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 21:07:53 +00:00
Becca Hughes
598ff21b78
Merge "Add extra null checks" into udc-dev
2023-05-12 20:40:56 +00:00
Chris Antol
8a7fdc628f
Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464
Change-Id: I0a8ec6179e87ca56765103df17df03f9438b90c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 18:39:28 +00:00
Chris Antol
9567bd4a50
Merge "Remove SPA gating from App Cloning click ingress" into udc-dev
2023-05-12 17:56:05 +00:00
Roy Chou
0bdc6ad2a3
Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816
Change-Id: I5da848212d422435a6976798d203fc03ee3eb620
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:16:25 +00:00
Avinash Vadlamudi
0cf38ac8e0
Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172
Change-Id: I6d9a618e64a45b1c1fb203a92b7867349a7ca9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:12:52 +00:00
Roy Chou
412c248c10
Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev
2023-05-12 16:59:26 +00:00
Becca Hughes
400e5491a3
Add extra null checks
...
Test: ondevice
Bug: 281047738
Change-Id: I07ced78af5da086433aa4288949673161bfe4f20
2023-05-12 16:46:30 +00:00
Avinash Vadlamudi
28cf617ca2
Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev
2023-05-12 16:34:26 +00:00
Roy Chou
0aa67ede68
chore(#AlwaysOnMagnification): hardcode the feature flag default true
...
Set the feature flag getter default return value to be true to rollout to public. We keep the checking code so that it's still remote controllable.
Bug: 281788002
Test: manually test with adb command
Change-Id: Ie7f32721cf99d8a97c11f0f9c6d0d466c083d668
2023-05-12 15:57:56 +00:00
Rubin Xu
5b42447d29
work challenge: allow backgroud biometric auth
...
We observed a race condition that when work challenge is launched from
notification, the biometric prompt quickly dismisses itself because
it detects the launcher is now the foreground app. This change attempts
to workaround the issue by enabling the setAllowBackgroundAuthentication
optin in BiometricPrompt so it no longer dismisses itself even if the
foreground app is different.
Bug: 279766640
Test: manual
Change-Id: I453b7d603c6eb65f329afb38d8a190e21a7e4c01
2023-05-12 16:35:15 +01:00
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
499dc2c2b3
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: I13c85961b123dadc3688f0e922994c54e9394a21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:38:38 +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
Avinash Vadlamudi
6968e32ed9
[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon
...
Bug: 281946128
Test: Manual test by flashing and testing on device
Change-Id: I182e530bc39620582a0c228ab3d5934638474da2
2023-05-12 12:18:03 +00:00
TreeHugger Robot
fd9ca0eae7
Merge "Update string for touch sounds" into udc-dev
2023-05-12 12:08:32 +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
Yanting Yang
eb028da005
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: I6d727ab9e5e30f1db9a3b6eb9f0ea63ea44c664d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 03:52:46 +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
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
d1d6fd9d9d
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: I2c3a7b4b301c24dea7eb94115e47c5ec6185ccac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 02:05:56 +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
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