Jack Yu
2479c8815d
[automerger skipped] Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
am: 8716ebc4d4
-s ours
...
am skip reason: Merged-In I945490ef1e62af479a732c9a260ed94bdd8bc313 with SHA-1 f8b664e31f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ibb779034ce7f49a26a84989e6e59600bf35ac905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 14:16:34 +00:00
Jack Yu
8716ebc4d4
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
am: 34ce0e2c3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I68d9f6e174a3d9100b2ea3094d527da4c92cc760
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:48:53 +00:00
Jack Yu
34ce0e2c3a
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
am: 4745a591c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: Ia0803da9acf81da41d5ffd289b705eb3e7128547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 13:16:57 +00:00
Oli Thompson
08c0e13ece
Merge "Add emergency call buttons to the work challenge screens in the case of managed subscription for work telephony"
2023-02-03 13:00:58 +00:00
Jack Yu
4745a591c5
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
am: 9d643d3042
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I3099c3e158aaf0a99a8fa3d894b0c5dc1713e2b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 12:22:41 +00:00
Vania Januar
ecd670bac4
Update ic_edit icon with correct path.
...
Test: just icon change
Bug: 262375818
Change-Id: Ifcde294d63e740d64ab3a31c18eea09bea9e46de
2023-02-03 11:28:16 +00:00
Jack Yu
9d643d3042
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
am: 3ccadd2c97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I763baefc5b94776c0583273fe9ab47ae99e6a57c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 11:27:23 +00:00
Vania Januar
5df2107fde
Merge "Replace circle icon on stylus settings to ic_edit."
2023-02-03 10:19:28 +00:00
Neil Fuller
4550e939bb
Merge "(Re)Introduce "enabled by admin" UI state"
2023-02-03 10:14:03 +00:00
Jack Yu
3ccadd2c97
Only primary user is allowed to control secure nfc am: 0e57ff90cd
am: c098bdcad0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I5690485d1cacd39b5b74316f561691bc68d48787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 10:10:20 +00:00
Jack Yu
c098bdcad0
Only primary user is allowed to control secure nfc am: 0e57ff90cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21154458
Change-Id: I35c94f779d47e27c170ec3b4becafc563f077a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-03 09:21:04 +00:00
Zaiyue Xue
2b66ff613d
Remove the comma between hour and minutes in app list.
...
Bug: 267184192
Fix: 267184192
Test: presubmit
Change-Id: Ic37046218ffe501600d5d247a10d3f091acf131b
2023-02-03 16:06:14 +08:00
Hao Dong
1d45f7f6ed
Merge "Add udfps/ and support a11y for the udfps enroll view."
2023-02-03 00:30:03 +00:00
Kweku Adams
2d2db1f711
Use updated flag.
...
Link to the main TARE flag and default value instead of the Settings
default.
Bug: 158300259
Test: atest CtsAlarmManagerTestCases
Test: atest CtsBatterySavingTestCases
Test: atest CtsJobSchedulerTestCases
Test: atest SettingsBackupTest
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/alarm
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/mockingservicestests/src/com/android/server/tare
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/job
Test: atest frameworks/base/services/tests/servicestests/src/com/android/server/tare
Test: Interact with UI and check settings via adb
Change-Id: I6afd0bdf56f39758076b6182fc4893a37760428b
2023-02-02 17:38:13 +00:00
Prabal Singh
e312ffa512
Merge "Add support for Biometrics for work Source for SC"
2023-02-02 10:59:13 +00:00
TreeHugger Robot
2174e45c73
Merge "Only log the names of the app packages which are installed from Google Play Store in battery usage app optimization page"
2023-02-02 09:55:17 +00:00
Chaohui Wang
cd6946ca5b
Merge "Always use Spp to generate SettingsPage in Settings"
2023-02-02 09:11:45 +00:00
Bonian Chen
27e9ddb5f1
Merge "[Settings] Fix about phone crash no leave"
2023-02-02 09:06:36 +00:00
George Chang
31cc68454e
Merge "Update strings for Nfc Tag App Preference"
2023-02-02 08:57:50 +00:00
Zaiyue Xue
65cfcbe486
Only log the names of the app packages which are installed from Google Play Store in battery usage app optimization page
...
This is to meet the Guidelines for Logging Package Names: go/package-name-logging-guidance
Bug: 267430574
Fix: 267430574
Test: presubmit
Change-Id: Icf10000f5dcf87e45175d4005af8365191ad444d
2023-02-02 16:51:13 +08:00
Thomas Lin
ecc61d0e22
Merge "Add thomasli to a11y settings OWNERS"
2023-02-02 08:41:44 +00:00
TreeHugger Robot
4227a44067
Merge "Integrate UI with APIs for physical keyboard settgins."
2023-02-02 08:12:37 +00:00
Chaohui Wang
3658a0616c
Merge "Move product specific strings to res-product"
2023-02-02 07:57:10 +00:00
Chaohui Wang
8fcf4d0715
Always use Spp to generate SettingsPage in Settings
...
Bug: 244122804
Test: Manually with Settings
Change-Id: I3625d34abcdfd3f7264e20e94043769f1f9ed699
2023-02-02 15:21:03 +08:00
Chaohui Wang
8e403533ad
Merge "Add AppPermissionPreferenceTest"
2023-02-02 07:06:36 +00:00
danielwbhuang
f43c358b50
Integrate UI with APIs for physical keyboard settgins.
...
Integrate UI with these APIs.
1. getKeyboardLayoutListForInputDevice
2. getKeyboardLayoutForInputDevice
3. setKeyboardLayoutForInputDevice
Demo: go/pk_with_final_api_demo
Bug: 247079681
Test: local test
Change-Id: I5478e2c344a47e692e7c524f8c1e96d9dda52796
2023-02-02 14:52:38 +08:00
Chaohui Wang
87257eccac
Move product specific strings to res-product
...
Move the followings,
- lockpassword_confirm_your_pattern_details_frp
- lockpassword_confirm_your_pin_details_frp
- lockpassword_confirm_your_password_details_frp
Product specific strings need to be put in res-product.
Bug: 250807976
Test: Make Settings
Change-Id: I5916a254a9e42ed365f6d26deedd9879636606f7
2023-02-02 14:15:05 +08:00
Bonian Chen
211920bc7c
[Settings] Fix about phone crash no leave
...
Avoid from crash when LifecycleOwnerLiveData reports null during
destroy.
Bug: 267513122
Test: local
Change-Id: Ie541b0e5b81aa14bd064087c5343716b6bc066a3
2023-02-02 06:10:55 +00:00
George
abe460f88b
Update strings for Nfc Tag App Preference
...
Bug: 244272155
Test: manual
Change-Id: I82d5c89d1b2e4dd611d512b21d192ad8a8d0220b
2023-02-02 14:05:40 +08:00
Chaohui Wang
e4c9959fd7
Add AppPermissionPreferenceTest
...
Unit test for AppPermissionPreference.
Bug: 236346018
Test: Unit test
Change-Id: I83e19bd8d4d667fb6cb2be8aed85ba7f0a8f149e
2023-02-02 13:34:09 +08:00
TreeHugger Robot
6ef43a4c2c
Merge "Update illustration for tablet" into tm-qpr-dev am: a50ca10f33
am: 8d75b9c6d4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21187563
Change-Id: If9b5c5fe4814ab8cf46c754884c2b261378b0c7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 04:42:53 +00:00
TreeHugger Robot
8d75b9c6d4
Merge "Update illustration for tablet" into tm-qpr-dev am: a50ca10f33
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21187563
Change-Id: Iecd7bf4950b5ea60d0abc648fe7df7ab790ebd3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 03:45:23 +00:00
Hao Dong
24f8463af4
Add udfps/ and support a11y for the udfps enroll view.
...
This CL calls methods in UdfpsEnrollUtils.java to announce a11y
message. Besides, scale factor calculation and UdfpsOverlayParams.java
are removed since they are added in settingslib/.
Test: manually tested on device:
Turn on talkback and turn this flag on via adb command
adb shell setprop
sys.fflag.override.settings_show_udfps_enroll_in_settings true
Bug: 186873966, 260617060
Change-Id: I408ac6a36352aa4bfd4ac1374e3922163dbc2199
2023-02-02 11:25:14 +08:00
TreeHugger Robot
a50ca10f33
Merge "Update illustration for tablet" into tm-qpr-dev
2023-02-02 03:09:34 +00:00
Josh Hou
6bbe735831
[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 406abc4d62
-s ours am: 576564873f
-s ours am: 0333fd29a5
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 5d7d1665fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I6026bbef3f00a9adff5b7f0b566fb707116a5584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 02:58:04 +00:00
Victor Truong
71fd373fd0
Merge "Replace SystemUser checks with MainUser."
2023-02-02 02:51:26 +00:00
TreeHugger Robot
376bb8d606
Merge "No screen lock notification"
2023-02-02 02:23:16 +00:00
Josh Hou
0333fd29a5
[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 406abc4d62
-s ours am: 576564873f
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 5d7d1665fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I0d19fee172000f2be5a0eae55d63d26ec5267f1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 02:02:51 +00:00
Daniel Huang
d0e737cf86
Merge "Add Trackpad settings tests"
2023-02-02 01:45:26 +00:00
Automerger Merge Worker
87bd497510
Merge "[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 30c88f6ff3
-s ours"
2023-02-02 01:33:48 +00:00
Edgar Wang
296f4c4a6f
Update illustration for tablet
...
Fixes: 244271773
Test: visual
Change-Id: Ic8968a951fc6c9b8023aa522aabdac3f1bcb84d3
2023-02-02 01:33:06 +00:00
Josh Hou
7d33817ae2
[automerger skipped] Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev am: 1739114d44
am: 3f4d63b943
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 ed9cbdea18
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21052003
Change-Id: I737a086ecc2474da9550690c66d7b523dfdae2ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 01:29:46 +00:00
Josh Hou
576564873f
[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 406abc4d62
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 5d7d1665fe
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I19bad7bb7aa3f25ecc76494082a4a725c690a039
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 01:28:45 +00:00
Josh Hou
d5c65e7ef1
[automerger skipped] Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
am: 30c88f6ff3
-s ours
...
am skip reason: Merged-In I2e25a308bcba6ea0edee89c7a78465f766bdbeac with SHA-1 ed9cbdea18
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I5d7d6fd19f153baf3b4a62ccc04906fc20b35d96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 01:28:41 +00:00
Josh Hou
406abc4d62
Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: Ic0ff8ade7897052d04c118dc0a8f67312f5d0ebf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:50:59 +00:00
Josh Hou
3f4d63b943
Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev am: 1739114d44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21052003
Change-Id: Iab6296f2dcdef8a25c0cb514bce478afcc70d67d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:50:04 +00:00
Josh Hou
30c88f6ff3
Fix the security vulnerability issue in AppLocalePickerActivity am: 33ef83795e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21152842
Change-Id: I53a4279eb0dc9044a97fd15e193e95fd0c16ec9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:49:52 +00:00
Diya Bera
55dd3a4f6d
Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d
am: 4d67530e85
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465
Change-Id: Ib6259a7897a43bc326410c17c4baa5f681edc7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-02 00:33:16 +00:00
Josh Hou
1739114d44
Merge "Fix the security vulnerability issue in AppLocalePickerActivity" into tm-qpr-dev
2023-02-02 00:15:12 +00:00
Diya Bera
4d67530e85
Merge "Tests for SUW in work mode" into tm-qpr-dev am: 31406c042d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20505465
Change-Id: Ida39801c898a529725f3fc7484e8907a2591e348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-01 23:59:37 +00:00