PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,177 Commits 1 Branch 0 Tags
dbe73f6603c46f71afba91c3d493e09bae0510c6
Commit Graph

117177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chaohui Wang
dbe73f6603 Fix some lint for Settings 
Bug: 234570979
Test: Manually with Settings App
Change-Id: I4cd66be1df5499c070fd7f80caf9a5ab2873b93d
 2022-11-04 11:01:41 +08:00
Joshua Mccloskey
eeb92a8cab Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev am: c4e603688e am: 6a5d3528d6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378667

Change-Id: Ia88b3045e75f31e0a4590a085bf0b5436dfe7a15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 01:57:21 +00:00
Joshua McCloskey
218bd88376 Updated sfps screen auth toggle. am: 7b58cadcfc am: e3162c2a6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378668

Change-Id: If15331d2536b92da0bdb71cb405462dbd8257df4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 01:57:10 +00:00
Joshua Mccloskey
6a5d3528d6 Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev am: c4e603688e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378667

Change-Id: Ia13069fcb0141a4f92fff8c1fd203302c059063f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 01:24:54 +00:00
Joshua McCloskey
e3162c2a6b Updated sfps screen auth toggle. am: 7b58cadcfc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20378668

Change-Id: I5df9568f472562bdb2f80c36eb777913ce31323f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-04 01:24:43 +00:00
Joshua Mccloskey
c4e603688e Merge "Remove "require screen on to auth" preference for Udfps" into tm-qpr-dev 2022-11-04 01:01:26 +00:00
Diya Bera
1181760b86 Remove "require screen on to auth" preference for Udfps 
Fixes: 257272989
Test: N/A
Change-Id: Ic10bd02c7a26e58abcb471c3f495d65247f29edc
 2022-11-03 22:29:10 +00:00
Joshua McCloskey
7b58cadcfc Updated sfps screen auth toggle. 
Test: Verified toggle is on top of icon during fingerprint setup.
Fixes: 254923267
Change-Id: Id2f6444646201b6e4eca0c563984527776227ebb
 2022-11-03 22:22:09 +00:00
Automerger Merge Worker
a2f95445dd Merge "Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280" 2022-11-03 18:34:23 +00:00
Behnam Heydarshahi
7a4f5b3216 Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: I627b34d216c6e5139d49bc44830b36c3927eb502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 18:33:45 +00:00
Behnam Heydarshahi
bff773b41b Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae am: 6b156be280 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: If6e7bd4facd8a3bea6528b25767aed45e7175f7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 18:33:40 +00:00
Behnam Heydarshahi
6b156be280 Merge "Read flag to show/hide notification slider" into tm-qpr-dev am: 2552ae08ae 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20180104

Change-Id: I7321b1bfe1e7d89924b38cd6adf2853d336740d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 16:15:00 +00:00
Behnam Heydarshahi
2552ae08ae Merge "Read flag to show/hide notification slider" into tm-qpr-dev 2022-11-03 15:57:37 +00:00
TreeHugger Robot
4216bb90d7 Merge "Fix app battery usage list launch incorrect works app" 2022-11-03 14:02:34 +00:00
Wesley Wang
eda172ce2c Fix app battery usage list launch incorrect works app 
- App usage page only use package name to launch the page, it can not
   identify the different userId between normal app and work profile
   app, add extra userId info into launch args
 - Remove no battery usage state/string if usage time is empty

Bug: 251471047
Test: make SettingsRoboTests
Change-Id: Id06ebb0f0fcd863e423acd7839f89bc0ae2444c1
 2022-11-03 11:32:30 +00:00
Chaohui Wang
33033fe755 Add InstantAppDomainsPreference for Spa 
To try:
1. adb shell am start -n com.android.settings/.spa.SpaActivity
2. Go to Apps -> All apps -> [One Instant App] -> Supported links

Bug: 236346018
Test: Unit test
Test: Manually with Settings App
Change-Id: I344ddb9c2f3dbc47d38554bf45f04ca7c26c0e5f
 2022-11-03 16:27:42 +08:00
Shaowei Shen
dba9928a7e Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b14 am: bae059a834 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323

Change-Id: I76a7f481afc0cc3b2e8ec035ac6442ad5fb78545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 03:30:36 +00:00
Joshua Mccloskey
83307c935e [automerger skipped] Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2 am: 4033cc7d0e -s ours 
am skip reason: Merged-In Ia44604b059c4847c40608419b2e16219976ced3e with SHA-1 73bf45ee4b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190

Change-Id: Ia988b3cd1f05732c5a76be35503b11c3c14de84a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 03:07:39 +00:00
Shaowei Shen
bae059a834 Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev am: 7ebdcf7b14 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20288323

Change-Id: Ie07cd8e98461f59d1b9541591ee6f638f8579661
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 02:42:26 +00:00
Joshua Mccloskey
4033cc7d0e Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190

Change-Id: I7f485c93b429fc2d2f75b1fc3e46d82a47e31c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-03 02:39:08 +00:00
Shaowei Shen
7ebdcf7b14 Merge "[Sound Panel] Set inset for button background" into tm-qpr-dev 2022-11-03 02:18:52 +00:00
Joshua Mccloskey
db266ca6b2 Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev 2022-11-03 01:56:52 +00:00
Grace Cheng
13d3bdc4c0 Implement SFPS “require screen on to auth” 
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.

Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
Merged-In: Ia44604b059c4847c40608419b2e16219976ced3e
 2022-11-02 14:34:59 +00:00
Joshua Mccloskey
1cda0a8418 Merge "Revert^2 "Implement SFPS “require screen on to auth”"" 2022-11-02 14:33:18 +00:00
Arc Wang
9f10021cd2 Merge "Remove Intent selector from 2-pane deep link Intent" 2022-11-02 12:13:36 +00:00
TreeHugger Robot
f1aa26be3d Merge "App language migration" 2022-11-02 10:17:03 +00:00
Arc Wang
12d4b78473 Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5 am: 4cfe8b8204 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665

Change-Id: I7a3bdcfa520fe402da940e426a89b3ffd2c2b1e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 08:41:11 +00:00
Arc Wang
e9fe1b848d Merge "Fix Storage Settings summary jank" 2022-11-02 08:18:33 +00:00
Arc Wang
4cfe8b8204 Merge "Extend SearchView width" into tm-qpr-dev am: 049deec9b5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20337665

Change-Id: I2f7807561257dc18be802f0acc90cce56ca71b98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 08:07:13 +00:00
Arc Wang
3b1587d6b2 Remove Intent selector from 2-pane deep link Intent 
To guard against the arbitrary Intent injection through Selector.

Bug: 246300272
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsActivityTest
Change-Id: I8b3b936de490f09f4be960fdafc6e66a1d858ee2
 2022-11-02 07:37:45 +00:00
Arc Wang
049deec9b5 Merge "Extend SearchView width" into tm-qpr-dev 2022-11-02 07:22:13 +00:00
Xuanang Zhao
0cc0149f18 Fix an untranslated text in the settings shortcut 
Test: manual
Change-Id: I6211d2e7d14386771e85291b79c8140a320fd5ba
 2022-11-02 13:55:21 +08:00
Mill Chen
0ee710cddd App language migration 
Implement current app language page using spa arch.

Bug: 236346018
Test: manual test with Settings app

Change-Id: I3d3c97304a381acec9d9ef0c27bd047a40ffc4a8
 2022-11-02 13:29:15 +08:00
TreeHugger Robot
bcd7e55ffa [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 9e3d69188f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308751

Change-Id: Iaed50871fba41c290a050f2e4ded6ede45b6fc42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:49:36 +00:00
TreeHugger Robot
8b23aa2c16 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb am: 34471a7160 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: I27396019f31117f69f9088174ed52c6ce3526556
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:35:02 +00:00
TreeHugger Robot
9e3d69188f Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2022-11-02 00:09:27 +00:00
TreeHugger Robot
0c688c9e7c Merge changes from topic "tc_change_22102807_16" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 4f45cf9218
  Import translations. DO NOT MERGE ANYWHERE
 2022-11-02 00:09:27 +00:00
TreeHugger Robot
9289b73a87 Merge changes from topic "tc_change_22102807_16" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: da6968cf02
  Import translations. DO NOT MERGE ANYWHERE
 2022-11-02 00:09:27 +00:00
TreeHugger Robot
34471a7160 Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev am: d2635580fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309947

Change-Id: Id9e378514d71beef1a4dcb9ab0c96053dabe254f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-02 00:03:28 +00:00
TreeHugger Robot
d2635580fb Merge "Disallow screenshot on Wi-Fi QR code settings" into tm-qpr-dev 2022-11-01 23:21:35 +00:00
Behnam Heydarshahi
2ac6fc5709 Read flag to show/hide notification slider 
Replace the build-time boolean resource with a run time device config flag that
signals whether the ring notification slider should be displayed or not

Bug: b/38477228
Test: make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=NotificationVolumePreferenceControllerTest RunSettingsRoboTests -j40
      make DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER=RingVolumePreferenceControllerTest RunSettingsRoboTests -j40
Change-Id: I8b9a2cbd5af7fa1bba56ff9ba62771d677d4a932
 2022-11-01 20:31:38 +00:00
Joshua Mccloskey
73bf45ee4b Revert^2 "Implement SFPS “require screen on to auth”" 
e62d37bad6

Change-Id: Ia44604b059c4847c40608419b2e16219976ced3e
 2022-11-01 16:45:31 +00:00
TreeHugger Robot
71b556ed0d Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-01 16:37:52 +00:00
TreeHugger Robot
ac95c4363a Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-11-01 16:37:52 +00:00
Bill Yi
84eb33a039 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1fa98709be -s ours am: 4335d93892 -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767

Change-Id: I40cb80edcc05e7f1018bb80e4fae8c76a1fc25e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:41:55 +00:00
Bill Yi
eee2a78531 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4782603e13 -s ours am: 11b74c81fb -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767

Change-Id: I58b9b06670c1d583c3aa741f5480c243e4c2e88d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:41:47 +00:00
Bill Yi
882dce18b1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 6f153936fd -s ours am: d67c9cae5b -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754

Change-Id: Ibbd3b9429d88299fd7de83cc5a73c8ebfd235395
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:41:35 +00:00
Bill Yi
7c23ff546b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c959a23a41 -s ours am: 436cfce33f -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308754

Change-Id: Ie8b086591dc13e172e741775c20ac51d5b1fa798
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:41:22 +00:00
Gil Cukierman
a69fc1784c Merge "Honor DISALLOW_CELLULAR_2G User Restriction in Enable2gPreferenceController" am: 08d03390ae am: 27217b87a9 am: 58d85e3383 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2229917

Change-Id: Ieb4b28cde2ec4b747ac55e57f4908c1cbf4ce340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:38:21 +00:00
Bill Yi
4335d93892 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 1fa98709be -s ours 
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20308767

Change-Id: I31e950b25b477b81ed5d510597b06bd335dd3054
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-01 15:10:47 +00:00