Commit Graph

123546 Commits

Author SHA1 Message Date
Randy Pfohl
701fb33e84 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22 am: 44d9d4d396
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: Ief4f67edd4b8fd9124a5908cdff1f433639a4049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:19:30 +00:00
Randy Pfohl
44d9d4d396 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: Ia44f66ff64c04d4666938fa4bec16c753a716fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:07:57 +00:00
Randy Pfohl
dbf2c7c3e5 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev am: 00d12bbe22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22387145

Change-Id: I970939b9d01cc93482704443877952b00deeca82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 20:07:35 +00:00
Randy Pfohl
00d12bbe22 Merge "adding new animation to be used when gesture tutorial package is available" into udc-dev 2023-04-10 19:47:27 +00:00
Hao Dong
40d69e3ce5 Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d am: a27d94d75d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I25f7d00d306b00b1c144d4f1e12478d3276f379d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:45:32 +00:00
Kweku Adams
d6409c4ee1 Hide TARE page when disabled.
Hide the TARE page option when TARE is disabled or the page is
explicitly flagged to be shown.

Bug: 270498386
Bug: 270964794
Test: manually modify flags and check if TARE option shows
Change-Id: Icc23a34ff1b9af5f1ddb649c4aefbea22a123498
2023-04-10 19:44:59 +00:00
Hao Dong
a27d94d75d Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I2c0b2bf9d57fbe518e14f2a9b30e3044be89011f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:38:02 +00:00
Hao Dong
dbbc97700e Merge "Show a dialog preventing face enrollment in split mode." into udc-dev am: 22c608be4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22460413

Change-Id: I751be0db204e733bc6bbe7fab7ef38d193351fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 19:36:03 +00:00
Hao Dong
22c608be4d Merge "Show a dialog preventing face enrollment in split mode." into udc-dev 2023-04-10 18:58:27 +00:00
Becca Hughes
20cb8478d4 Fix broken settings intent CTS test
We originally added this data field to the SYNC_SETTINGS intent as a backup but since we have our own and this is breaking CTS. This reverts that change.

Test: make & CTS
Bug: 275385380
Change-Id: I0da949e4adea9c3c8dfdb61017afe6908e72147c
2023-04-10 16:03:27 +00:00
Automerger Merge Worker
5041611155 Merge "Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 9dd71326dd" 2023-04-10 15:10:53 +00:00
YK Hung
ae6a08b176 Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 9dd71326dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: I32193af52903475dcf7f93f2cc6e4e82ca791707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 15:10:26 +00:00
YK Hung
f04643899b Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f am: 1b6cc404ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If95959e18a99f846a44ed2996aa3f31ac979ceba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 15:10:14 +00:00
Zoey Chen
795d2574fc [Regional Pref] Fix the line break in the temperature
Bug: 276023859
Test: local test
Change-Id: Ib2c454cbf301295ef4baf423d2aae618742a0438
2023-04-10 14:53:16 +00:00
YK Hung
1b6cc404ad Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: Ibe9bb0e826c0dc55e260b8068237c7ea2b32b19c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 14:42:10 +00:00
YK Hung
9dd71326dd Merge "Add manual enabled battery saver reason (2/4)" into udc-dev am: c429ca3e2f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22504367

Change-Id: If863d983c5f72cca4ae6a4c7c6afb47239f3be3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 14:41:50 +00:00
YK Hung
c429ca3e2f Merge "Add manual enabled battery saver reason (2/4)" into udc-dev 2023-04-10 14:03:33 +00:00
Angela Wang
0eeae4f8d0 Fixes Flash Notification preview button alignment issue in RTL layout
The preview button text is left-aligned in right to left language. Makes
it to be right-aligned with adding layout_gravity=start on the view.

Bug: 276608857
Test: checks the UI manually
Change-Id: I1322c1fcc433670863603c2d0b5438f39ecef998
2023-04-10 08:48:03 +00:00
Daniel Huang
446ddf0e9e Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 am: 2c2e65bd1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I8a1102b3b9b95f513e86cb629d08d43609eed7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:57 +00:00
Daniel Huang
efeacacc7a Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86 am: 4e0371303b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: If30278d699e731f502ee9379e032b1640e6c9f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:52 +00:00
Treehugger Robot
deb61df42d Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 am: 8b3797727f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I8ee77e14c956f424ec710fc71c5d225485bce9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:42 +00:00
Treehugger Robot
825450f1b8 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5 am: 227b55d8c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I442e08f1badd0ff0570df968a683c0b2228bb177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 08:04:09 +00:00
Daniel Huang
4e0371303b Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I27db019a7dbf1a237969a92969848d6ec13acd93
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:38:04 +00:00
Daniel Huang
2c2e65bd1d Merge "Touchpad settings' icons update" into udc-dev am: 3f16621b86
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525947

Change-Id: I5687f6c9827a34405ca1be4b5fdb452596e4e372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:38:02 +00:00
Treehugger Robot
227b55d8c1 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I74fb50dc30c19c233c68856f65c248f5ed7cc552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:37:21 +00:00
Treehugger Robot
8b3797727f Merge "Ignore ActivityNotFoundException from app launch" into udc-dev am: 35f9d486a5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22347563

Change-Id: I812e4a865730a1d45bde9ae9f500b990e0d0c6d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 07:37:18 +00:00
Daniel Huang
3f16621b86 Merge "Touchpad settings' icons update" into udc-dev 2023-04-10 06:49:06 +00:00
Treehugger Robot
35f9d486a5 Merge "Ignore ActivityNotFoundException from app launch" into udc-dev 2023-04-10 06:48:17 +00:00
danielwbhuang
eaa6a03d65 Touchpad settings' icons update
Two icons need to be updated:
1. The touchpad speed setting inside of the touchpad settings
2. The bottom right tap setting inside of the touchpad settings

https://screenshot.googleplex.com/5QKLTwX8qNrnRsj.png
https://screenshot.googleplex.com/7iHNKwzwAZm5h8N.png

Bug: 269100659
Test: manual
Change-Id: I776e94325b1f54475f406a2fe11c4db4a0205f40
2023-04-10 06:35:24 +00:00
Chaohui Wang
9661f163c3 Fix App languages for work profile
Use the correct work profile context to fix.

Fix: 277536202
Test: Manually with App languages when work profile is installed
Change-Id: Ibc3bb47127228c8dc6ebf073cd7881727321d5c8
2023-04-10 13:32:24 +08:00
Automerger Merge Worker
9c9c55d24d Merge "Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: f1a1637563" 2023-04-10 05:09:28 +00:00
Tom Hsu
19e2638508 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: f1a1637563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I747487bb847adc2919093a454878e8cbf7309d72
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 05:07:30 +00:00
Tom Hsu
da4c334402 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1 am: 09238601fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: Ic5172c0baf7e91ebcbcbea5bfeb5ffce457a7e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 05:07:22 +00:00
Tom Hsu
09238601fa Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: I6892186990d8ec5676759a6f073357d446b0c533
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 04:39:34 +00:00
Tom Hsu
f1a1637563 Merge "Make all sim list by ordering with slot id" into udc-dev am: 5240d251e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530782

Change-Id: Ia369cf03f64b2614875fc013f663930894714a0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-10 04:39:31 +00:00
Tom Hsu
5240d251e1 Merge "Make all sim list by ordering with slot id" into udc-dev 2023-04-10 04:13:55 +00:00
Chaohui Wang
c688f93ed9 Display App installed in other user in All Apps
Only for admin user.

Also clean up unused getInstallationStatus().

Fix: 277299765
Test: Manually with All Apps when multiple users is on
Test: Unit test
Change-Id: I4de681c101a605e3517dcd8765bf7a95d1b76417
2023-04-10 03:06:01 +08:00
Automerger Merge Worker
ee3135f92f Merge "Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 996851e310" 2023-04-08 21:54:19 +00:00
Elliot Sisteron
50af67d891 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 1b14767540
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ibecdb7dedf2dd056216859f4d52831ca1e365cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 21:54:08 +00:00
Elliot Sisteron
a6bd172d0b Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b am: 996851e310
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ibfb4d9b634b655fa7b41290dd3dac13ecd3a0f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 21:54:06 +00:00
Elliot Sisteron
1b14767540 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ib50b4fb7f91dabab3f947b8481e91430d5472076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 21:26:36 +00:00
Elliot Sisteron
996851e310 Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev am: bc1ee1264b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22507344

Change-Id: Ic26d725919b349c1959149b1229effac7ae2fbba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-08 21:26:31 +00:00
Elliot Sisteron
bc1ee1264b Merge "Change the label of CombinedBiometricProfileSettingsActivity." into udc-dev 2023-04-08 21:06:55 +00:00
Hao Dong
64277a23bb Show a dialog preventing face enrollment in split mode.
Test: atest CombinedBiometricProfileSettingsTest
Test: atest FingerprintSettingsFragmentTest
Test: manaul test- go to split screen mode and try to enroll
face
Bug: 276938441

Change-Id: I45e859b453700aa79f7774fb5deda81b1f30e5a5
2023-04-07 21:53:52 +00:00
Hao Dong
0100948ac8 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 am: 1599bc7b91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I92bfc5bc0c396ba8515184b0ee2324dfa1057d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:39:13 +00:00
Florian Mayer
7e0596214b Merge "Move bootloader_override property" into udc-dev am: f58ea4671e am: e405f55e32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: Idc3104355448c0b67e5a25719fc6ad58240354f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:37:26 +00:00
Hao Dong
be28cf536f Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87 am: e7edbd3543
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I0559df3f928c43b149443858f41e8f24d870caa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:27:38 +00:00
Florian Mayer
fd9c686cd9 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e am: ab14241e64
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: I8c841b5198babacd18ca85c581992ff89e3600a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:25:50 +00:00
Hao Dong
1599bc7b91 Merge "Update the limit of split screen dialog strings." into udc-dev am: 8930e6ea87
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22532887

Change-Id: I0ec50ae9cb9fe08639ad870d0fd6681466f8edc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:12:43 +00:00
Florian Mayer
e405f55e32 Merge "Move bootloader_override property" into udc-dev am: f58ea4671e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22234234

Change-Id: I6d40815fcc55d6e5d7aa2587b98e6dbcef77f9de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-07 21:09:29 +00:00