Treehugger Robot
7afb2d4440
Merge "Remove unused MagnificationPreferenceFragment and its related controllers"
2023-04-12 19:33:30 +00:00
Treehugger Robot
ed69cebe02
Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev am: eb3e62f639 am: e1d5cef1a5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22552762
Change-Id: I78e494412b8d83c1c835a0827fc9bfae7d38d346
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:14:41 +00:00
YK Hung
9acd1d242e
Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev am: c89b8e6d78 am: 577619ea3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22525849
Change-Id: I7e149e59fa3413780f4148e3fb28485e7230ef73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:14:13 +00:00
Chris Antol
ec65b5076e
Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev am: 5336f758d2 am: 49da028eb0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22579945
Change-Id: Ie7f7b4f1dc979da58249741fe2cba8ffdf88ca38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:59 +00:00
Quang Luong
7765d8f0e3
Merge "Don't overwrite security params when editing saved config" into udc-dev am: ba74d65523 am: bff112fe67
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22439593
Change-Id: I6712458191ae8651b3a20605876350bf72af7eb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:46 +00:00
Marcello Galhardo
a05861a673
Merge "Add Note Task Shortcut to Settings" into udc-dev am: 211b544ea8 am: e2134a58bd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22252424
Change-Id: I4eda1dfbe9e255f99bd36c6e06fb564290aab166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 08:13:34 +00:00
Treehugger Robot
3a27d850b8
Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev am: d81b473fe0 am: cfcef716f4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22550313
Change-Id: Ic45e3d9f20db9d89a34fc0d053ea48d056d907c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:21:46 +00:00
Daniel Huang
5d0ff56d1b
Merge "The dialog should persist after rotation." into udc-dev am: 74042f59de am: db8da44071
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22568598
Change-Id: Ia45884c4867c0de8d9929a8311b71b0751ae87a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:21:04 +00:00
Edgar Wang
0f6686392d
Disable developer options when development_settings_enabled is disabled am: b5774a8e2e am: 7644d60020
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22562950
Change-Id: I8f2a65836e905616d5c19a7852e5eaf112e61afe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 07:20:28 +00:00
Chaohui Wang
4388e217d8
Merge "Display App installed in other user in All Apps" into udc-dev am: 4c1e924442 am: 03e8ebc4dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22546422
Change-Id: Ifa44a57f688fcbac11a4c77942a74d1cabc395ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-12 06:04:32 +00:00
Treehugger Robot
eb3e62f639
Merge "[BiometricsV2] IconTouchDialog continue enroll" into udc-dev
2023-04-12 03:40:38 +00:00
Chun-Ku Lin
b7d513b84d
Remove unused MagnificationPreferenceFragment and its related controllers
...
Bug: 277258376
Bug: 270481978
Test: manually on Pixel & AOSP
Change-Id: I1e0bbecf78290b85e464a4a5de658184eb91ca2c
2023-04-12 00:51:45 +00:00
YK Hung
c89b8e6d78
Merge "Draw vertical dividers with different colors if it has a timestamp label" into udc-dev
2023-04-12 00:40:43 +00:00
Chris Antol
5336f758d2
Merge "Make Tips & Support page launchable from Settings Search results" into udc-dev
2023-04-12 00:04:36 +00:00
Quang Luong
ba74d65523
Merge "Don't overwrite security params when editing saved config" into udc-dev
2023-04-11 22:45:43 +00:00
Chris Antol
b8ed22bb4e
Make Tips & Support page launchable from Settings Search results
...
Bug: 258315425
Test: Tested on pixel device: in Settings search bar, enter "Tips" then tap the result for Tips & Support -> verify Tips and Support page is launched
Change-Id: I30e52f5498fbeb840e7448fa464c20649f0b1db5
2023-04-11 21:08:05 +00:00
Marcello Galhardo
211b544ea8
Merge "Add Note Task Shortcut to Settings" into udc-dev
2023-04-11 12:57:06 +00:00
Treehugger Robot
d81b473fe0
Merge "[Regional Pref] Add footer in Regional preference page" into udc-dev
2023-04-11 10:57:41 +00:00
Daniel Huang
74042f59de
Merge "The dialog should persist after rotation." into udc-dev
2023-04-11 10:14:39 +00:00
Zoey Chen
5eecd86982
[Regional Pref] Add footer in Regional preference page
...
Bug: 277436632
Test: local test
Change-Id: I596f440696830374225d9b56fb8c4f0d5d5d5d61
2023-04-11 09:28:20 +00:00
danielwbhuang
94d5d00a1a
The dialog should persist after rotation.
...
1. Use DialogFragment
2. Override onSaveInstanceState
3. Refresh the UI after key remapping
Demo: https://screencast.googleplex.com/cast/NjMzMzcxNjc2Mzc3MDg4MHxlMjM0M2FiMi0zOA
Bug: 277148566
Test: manual
Change-Id: I0dc6678bfa45a4f84f38bf810433dd1e4432ba4a
2023-04-11 08:49:26 +00:00
Zaiyue Xue
20944e2028
Draw vertical dividers with different colors if it has a timestamp label
...
https://screenshot.googleplex.com/3pZ4ip96aXzqkZv.png
https://screenshot.googleplex.com/ePpBc8YNhJAsfR5.png
Bug: 265364379
Fix: 265364379
Test: manual
Change-Id: I20b06323db110fe4ab05fb51edcabc3bc2519456
2023-04-11 14:54:54 +08:00
Milton Wu
15267aab1f
[BiometricsV2] IconTouchDialog continue enroll
...
When user clicks "OK" in FingerprintEnrollEnrollingIconTouchDialog,
continue enrolling.
Bug: 276416053
Test: atest FingerprintEnrollEnrollingViewModelTest
FingerprintEnrollmentActivityTest
Test: Manually check enrolling status as clicking "OK" button on
FingerprintEnrollEnrollingIconTouchDialog after enabling
biometrics v2 v2 through feature flag.
Change-Id: I028723acfe35e5119e43b6860022c7432fc2ae0e
2023-04-11 14:39:59 +08:00
Edgar Wang
b5774a8e2e
Disable developer options when development_settings_enabled is disabled
...
Bug: 270966670
Test: manual
Change-Id: If4296c564ee64804b35a3357f40f8d1d49cd284a
2023-04-11 13:44:02 +08:00
Chaohui Wang
4c1e924442
Merge "Display App installed in other user in All Apps" into udc-dev
2023-04-11 04:02:39 +00:00
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
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
Hao Dong
22c608be4d
Merge "Show a dialog preventing face enrollment in split mode." into udc-dev
2023-04-10 18:58:27 +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
YK Hung
c429ca3e2f
Merge "Add manual enabled battery saver reason (2/4)" into udc-dev
2023-04-10 14:03:33 +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
Treehugger Robot
35f9d486a5
Merge "Ignore ActivityNotFoundException from app launch" into udc-dev
2023-04-10 06:48:17 +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
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
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
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
Florian Mayer
f58ea4671e
Merge "Move bootloader_override property" into udc-dev
2023-04-07 20:06:25 +00:00
Zoey Chen
d15fe76759
Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev am: 8cd0c5816c am: 39baaf4353
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22530783
Change-Id: Ib8fabdd09235d300299853300bf7068f68dcc14d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 19:06:16 +00:00
Florian Mayer
1ef1073694
Move bootloader_override property
...
Bug: 274953227
Change-Id: I391329a14a5dda741103bd0097fee65ea97c866a
2023-04-07 18:32:30 +00:00
Pfohl
b094ed8e7d
adding new animation to be used when gesture tutorial package is available
...
test: built and verified animation shows up and is clickable to gesture tutorial menu on handheld devices
bug:248342586
Change-Id: I29a68accf67c4efc6b94058c2702f106edfec0a8
2023-04-07 18:20:15 +00:00
Zoey Chen
8cd0c5816c
Merge "[i18n] Use Framelayout instead of Nest scroll" into udc-dev
2023-04-07 17:57:28 +00:00
Roshan Pius
21f0ad2839
Merge changes I8a6f01ab,I1b8c06a0 into udc-dev am: 7a49bfe6b0 am: 5e7e88a4b6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22482405
Change-Id: I43d03ef8235cfd1ebc2495b6148c97ad2958e92e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 16:52:03 +00:00
Zoey Chen
4800801661
[i18n] Use Framelayout instead of Nest scroll
...
Bug: 274538667
Test: local test
Change-Id: I2a6917a639ac6ba987df425d8974f9d51487a41f
2023-04-07 16:34:47 +00:00
Roshan Pius
7a49bfe6b0
Merge changes I8a6f01ab,I1b8c06a0 into udc-dev
...
* changes:
settings(uwb): Show message when UWB is unavailable due to regulatory
settings(uwb): Refactor UwbPreferenceController
2023-04-07 16:03:48 +00:00
tom hsu
ef595a7915
Make all sim list by ordering with slot id
...
Bug: 271975836
Test: Manual test
Change-Id: Ie568145a978548e4aa3ee80e06b2b75524f8853a
2023-04-07 23:37:18 +08:00
Zaiyue Xue
d45c617b2d
Merge "Refactor function to support slot size not must be two." into udc-dev am: fbe85872b3 am: 581f3e8286
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22414532
Change-Id: I8b3205e91381b33782a041414dbcb79042951a64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-04-07 14:21:43 +00:00
Zaiyue Xue
fbe85872b3
Merge "Refactor function to support slot size not must be two." into udc-dev
2023-04-07 13:09:11 +00:00
Zaiyue Xue
06b8092fdb
Refactor function to support slot size not must be two.
...
The function insertHourlyUsageDiffDataPerSlot() only supports the slot
has two-hour data now. This assumption is not neccessary. Refactor this
so in my next cl ag/22379150, the last-full-charge slot and now slot
could have only one-hour data.
Bug: 271214926
Test: manual
Change-Id: I57f7898ce1c92b8849baf9a44314455adf0098f4
2023-04-07 19:49:52 +08:00