Bill Yi
1f9dab1c8c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 13c4c2accb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121671
Change-Id: I6985ef37fb219639b4b32a8767908285219a6f87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 22:57:10 +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
a7dbd023ae
Merge "Add extra null checks" into udc-dev am: 598ff21b78
am: 93c340780f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23214089
Change-Id: Icf6feffecedf230863f4762957888000859acf3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 21:54:31 +00:00
Becca Hughes
93c340780f
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: I5081a13eed1790c1093348faf06a7d311e4e0da3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 21:13:35 +00:00
Becca Hughes
598ff21b78
Merge "Add extra null checks" into udc-dev
2023-05-12 20:40:56 +00:00
Chris Antol
8c4f831cda
Merge "Remove SPA gating from App Cloning click ingress" into udc-dev am: 9567bd4a50
am: 701babd574
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23197464
Change-Id: I51f78328b5c0527018c07588f90641d4556493c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 19:25:44 +00:00
Chris Antol
701babd574
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: Ib283b390ae0fa591fa8c97d550731464b3d9ab3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 18:42:20 +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
3a5ffceddf
Merge "chore(#AlwaysOnMagnification): hardcode the feature flag default true" into udc-dev am: 412c248c10
am: f482ff63b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199816
Change-Id: I16c524b23639c8a1aec9c1b0f543a9c76f8d4288
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:39:46 +00:00
Avinash Vadlamudi
49e574dd25
Merge "[Auto Pin Confirmation]: Fix the color token for the checkbox fill icon" into udc-dev am: 28cf617ca2
am: 071db861a2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23154172
Change-Id: I684472f3563dc61c70f7b90cec0bb26acf30a317
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:39:39 +00:00
Roy Chou
f482ff63b9
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: I23d2fec9ab12741fd35ca1ff130e8ec8a97f58e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:23:24 +00:00
Avinash Vadlamudi
071db861a2
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: I293ee9f3f23ac0a49cce228e3febf3475f86282e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 17:22:44 +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
Peter Zhang
ed0af59d60
Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev am: 60069d3039
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23121951
Change-Id: I7b99683979a3f0ba992d4a19534e265dc9facb9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 16:55:46 +00:00
Becca Hughes
400e5491a3
Add extra null checks
...
Test: ondevice
Bug: 281047738
Change-Id: I07ced78af5da086433aa4288949673161bfe4f20
2023-05-12 16:46:30 +00:00
Peter Zhang
79a76c9b5f
Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev am: 04545138c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23085599
Change-Id: I53645ee6b0356cb623e2e55a69b0f42d960bd751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 16:39:45 +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
Peter Zhang
60069d3039
Merge "Add logging when a group tile with PreferenceCategory widget is added to the screen" into udc-d1-dev
2023-05-12 16:22:38 +00:00
Peter Zhang
04545138c7
Merge "Add the support of preference group / category to the Settings Tile API" into udc-d1-dev
2023-05-12 16:09:34 +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
264071adcf
Merge "Correct shortcut summary to have different software types of shortcut result" into udc-dev am: 0c57f69f60
am: c77fb81017
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157346
Change-Id: Ia30bcbd9e95ead6660ff3102a81ceaba1ece48a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:56:18 +00:00
Jason Hsu
c783497e05
Merge "Move 'Audio Output' to Accessibility hearing device page" into udc-dev am: 181cfa3aa5
am: 782ad66ab1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157344
Change-Id: I5e0c136a30d4d4d948bcda0bc7885ba8c808aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:55:44 +00:00
SongFerng Wang
857464e9d5
Merge "The UI does not remove the preference" into udc-dev am: 2821342259
am: 5c64b78f4d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199828
Change-Id: I1b5290b2618c7ab438b1ff69e45e42427817b13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:50:27 +00:00
Chaohui Wang
e7ef6d181b
Merge "Fix Bluetooth tethering toggle status" into udc-dev am: 74e1412f8e
am: 45c2a27149
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23199826
Change-Id: I97ae3a4cca6c312813baf30dc26819ef86db90fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:50:20 +00:00
Jason Hsu
c77fb81017
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: I5ec6ad97a9a479fa5299f664c2ce29ac5578bbfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:23:35 +00:00
Jason Hsu
782ad66ab1
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: I1abbb60af43135718426d349427738d95808ff50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:23:10 +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
5c64b78f4d
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: I6e3a673682128ed250e4d2daec9b8e39c5ef8cbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:02:45 +00:00
Chaohui Wang
45c2a27149
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: Icbbd7022386db16e71927f869598beeaf77ea000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 14:01:59 +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
13d2882385
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: I3226b3667702f3f012d7fded5989ec0591e16aab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:25:48 +00:00
Charles Chen
0341754c8d
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: Ie1e68f359c6fc129759c367db4f393aa30897114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:25:42 +00:00
TreeHugger Robot
3181169bdb
Merge "Update string for touch sounds" into udc-dev am: fd9ca0eae7
am: e64a1b4992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23157337
Change-Id: I1f8b3127c7c15c108ffe183d71d740e0473be636
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 13:25:30 +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
e64a1b4992
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: I12e3afcddba6810e81a2e93d27a540b03358ec72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:43:06 +00:00
Peter Zhang
f6a267bd36
Add logging when a group tile with PreferenceCategory widget is added to
...
the screen
Test: robotest, manual
Bug: 281517110
Change-Id: I4de1938bdeea003c70e5c554e988a97b762f7f81
2023-05-12 14:41:32 +02:00
Peter Zhang
baeca6fb53
Add the support of preference group / category to the Settings Tile API
...
Test: robotest, manual
Bug: 281517110
Change-Id: Ie36b0b3eb8ed80766efa050f1f0aee1f784a5949
2023-05-12 14:40:41 +02:00
Treehugger Robot
e99f757f60
Merge "Update battery settings remaining time format" into udc-dev
2023-05-12 12:29:14 +00:00
Peter Zhang
08e762c056
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: Idd783b4f20b0b4ae5d6053f0713fd98cc4af789c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:23:01 +00:00
Peter Zhang
bc462205ed
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: I5144e7a7eb1d3c5be55aa880334d3a11f2fc74a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:22:50 +00:00
Oli Thompson
b3fbb562de
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: I594b2a7ae97a6bb00c3b83b56bc8115bcb03c34f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-12 12:21:49 +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
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
TreeHugger Robot
fd9ca0eae7
Merge "Update string for touch sounds" into udc-dev
2023-05-12 12:08:32 +00:00