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
32a2e30074
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: I80f2e8be3febfbea65c3d653b1d01531f3fcbc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:03:17 +00:00
Avinash Vadlamudi
ee54053ace
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: I9208f1f39cfcdd034968f0fe193e95ef28146c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:02:37 +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
4714fe7a4d
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: Idaf544a6838427ec4974cd8a301a059348b9e745
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:23:27 +00:00
Jason Hsu
3f6e93beea
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: I6d9508e5c6464236eb875942ab8bcf2d3160cead
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:21:28 +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
5685b450b1
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: Id58083eb0c242454d0fdd39399c30ae5762cced6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:12:03 +00:00
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
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
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
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
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
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
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
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
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
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
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