PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,784 Commits 1 Branch 0 Tags
79eeb708435ac5e1008375c84d032039a38ad9cc
Commit Graph

108784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
d20855f6fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8a3edb5f1bfb14b2c87c0d39e703337ea2f97a18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 21:31:51 +00:00
Bill Yi
45569adeed [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 04531538c2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I048a1c220b7c758c8eb1c7a43fbeb1f8be41833d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-22 21:31:16 +00:00
Bill Yi
011d462ac4 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 
Blank merge reason: commit message contains skip directive

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

Change-Id: I0f062cb7d34bab7dafe000abdd96d50e7acd1db4
 2022-07-22 16:58:27 +00:00
Peter Zhang
f0013da134 Improve the UI of Press & hold power button settings 
The following changes has been made:
- The on/off toggle for Assistant now becomes two radio selectors ("Power Menu" and "Digital Assistant"). This is to make things clearer that Press & hold power button can be configured to power menu.
- The corresponding power menu animation will be shown when "Power Menu" is selected.
- The Assistant specific sensitivity settings and the foot notes are hidden when "Power Menu" is selected.
- Some minor wording updates according to the requests from Assistant / Settings UXW.

Bug: 229722937
Test: robotest, manual
Change-Id: Ib356fba861ad8c4a2626a0e0bd8cf3e4d90ce9a6
 2022-07-22 16:07:52 +02:00
Milton Wu
68247caafc Send metric intent back to SUW 
Add metric intent if ChooseLockGeneric is triggered in SUW.
1. Save the result bundle data from ChooseLockGeneric to cache inside
   BiometricEnrollActivity and pass back to SUW after all finished.
2. Since fingerprint enrollment trigger points in SUW for
   fingerprint-only or fingerprint + faceAuth devices are all moved
   from SetupFingerprintEnrollIntroduction to BiometricEnrollActivity,
   remove deprecated code from SetupFingerprintEnrollIntroduction.

Bug: 235458700
Test: Manually test fingerprint enroll with SUW or w/o SUW
Test: Manually test fingerprint enroll with unicorn SUW
Test: atest BiometricEnrollActivityTest
Test: robo tests FingerprintEnrollIntroductionTest
Change-Id: I34b2884ab4c2c65d464d91eaef0f58c72dad438b
 2022-07-22 08:53:48 +00:00
Bill Yi
1e9765bba2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib8c45dd3a435a2e409918b578428fdb7dd131243
 2022-07-21 23:17:43 -07:00
Bill Yi
b99222d2b8 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id0ce4d8486c79d82581c85ef17655d076052e0cc
 2022-07-21 23:13:46 -07:00
Bill Yi
babd7f1cc6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8836b6918c0c9a9527bb6a95a1abb9ab53a54e9c
 2022-07-21 23:10:10 -07:00
Bill Yi
04531538c2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic6afe4d66b49f6e961977912550f1f3f724f816f
 2022-07-21 23:02:36 -07:00
Bill Yi
d34c775b59 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib1f37eb6e359d977359e2fd67f60ffe03ef28896
 2022-07-21 23:01:08 -07:00
Bill Yi
2d0fd7f558 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I893779ffabea7e7f41c1ecdf3e0f21c5f3183f2b
 2022-07-21 20:01:30 -07:00
Julia Reynolds
6292d9ff8c Merge "Improve App notification loading" into tm-qpr-dev am: 4ab5255893 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19290333

Change-Id: Iac930f653c146436863978c1c98439d2e63a6837
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-21 20:48:46 +00:00
Julia Reynolds
4ab5255893 Merge "Improve App notification loading" into tm-qpr-dev 2022-07-21 20:30:21 +00:00
Julia Reynolds
f3b9bf55a9 Move zen rule deletion 
To a non-exported component

Test: manually delete a rule in Settings
Fixes: 233607507
Change-Id: I6c4ac930eb62a2068582021d0ad16b93fbc9bdd3
 2022-07-21 14:54:42 -04:00
Simon Wingrove
f952e89d4b Bool to note Pending Intent bug fixed 
A workaround can be used to cover for the fact that PendingIntents sent
by Settings might differ only by Intent extras (and thus be wrong). This
bool notes that the issue is fixed so the workaround code can be
dropped.

Bug: 238605613
Test: manually
Merged-In: I478dd5fbd53d1dafd049e392a186d9796dd179cb
Change-Id: Ife355166df080ce7371a95b5cea28575227153f0
 2022-07-21 11:01:15 +00:00
Peter_Liang
e1c4901ce8 Fix the inconsistent alignment of the main switch preference. 
Remove the redundant function.

Bug: 232494666
Test: manual test
Change-Id: I1827d39b194048452b71c680e2bbf94e43bfcac5
 2022-07-21 00:56:07 +08:00
Bill Yi
ba0a0c61fb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 69dee8d4a8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I220740fab54098c73118a4c3f5edbcd871593274
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:54:53 +00:00
Bill Yi
b393114b83 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours am: 9f2d455437 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7779d4f4cdb32e775152de3da0a5479fc03ac389
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:40:51 +00:00
Bill Yi
9f2d455437 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9b6741a081ae169312a2a340b65637951abc96e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:33:30 +00:00
Bill Yi
69dee8d4a8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: db7f7b6d31 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Icc93244f4cce2e97f1698939779b6e693e478f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 16:32:49 +00:00
Julia Reynolds
e90507373c Improve App notification loading 
1) Use UiBlocker, for better animations for apps with a lot of channels
2) Only load data in onResume, because the data loading step in some
of the controllers is expensive

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Test: load small channel and large (6000ish) channel app pages
Test: load individual channel pages
Test: load in-app channel shelf UI
Fixes: 215072888
Change-Id: I9a1c96f75b02f94b3ffc529d17d9c0cad7752de1
 2022-07-20 15:27:52 +00:00
Sorin Basca
fec750d98f [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours am: b9cd87f468 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Ic024b1ae2cd93580472f9da586881df044d8b5bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:11:20 +00:00
Sorin Basca
d07b2242fa [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours am: 9cef5199a5 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Iefd343d353203140d856945fb504bbe9ca93d02c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 07:11:06 +00:00
Sorin Basca
b9cd87f468 [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours am: 0085dcc80c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Ia3ec9464567b759ab02b1231af36ae78da7799a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:47:13 +00:00
Sorin Basca
9cef5199a5 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours am: b3fb29a4e3 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Idb5adda6eb8b19760fb1a335ee4d3fd8cdde6bf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:47:07 +00:00
Sorin Basca
0085dcc80c [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours am: 5781b7ab3a -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I01c4d0a739da9f35f0c45561a04cc8273969bb78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:16 +00:00
Sorin Basca
b3fb29a4e3 [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours am: ea4c4757bb -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I8cdf0303f4a286ebc74bcb2af74aac2598075805
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 06:26:05 +00:00
Sorin Basca
5781b7ab3a [automerger skipped] Merge "Use Mockito 4.6.1 API" am: 6a043ec5dc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: I9f616094bf9b1e54edd58918e6504885207f04e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:36 +00:00
Sorin Basca
ea4c4757bb [automerger skipped] Use Mockito 4.6.1 API am: b9503775c0 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 e2b0873f9c is already in history

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

Change-Id: Id9c27926a1f4cf518aa4c9b0ba69ed51f7dda310
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 05:55:23 +00:00
Sorin Basca
6a043ec5dc Merge "Use Mockito 4.6.1 API" 2022-07-20 05:32:35 +00:00
Himanshu Rawat
aa1950fd80 Don't cancel passkey entry pairing autonomously 
Bluetooth pairing is cancelled if the pairing popup is closed without
explicitly accepting the pairing. However there is no way to
explicitly accept the pairing when the local device displays for the
passkey entry or pin key entry pairing method.
As a result all passkey entry and pin key entry pairings, where the
local device is displaying the value, are cancelled after the pairing
is successful. If the BT stack has not completed the SDP search when
the pairing is cancelled after successful pairing, it may result in
removal of the bond information.

Bug: 237757124
Test: Pair with BT HID keyboard; adb logcat | grep "BTPairingController:
Pairing dialog canceled"

Change-Id: Ifdb98c16084dd811eed68469e7df5d1913c6ace8
 2022-07-20 03:33:55 +00:00
TreeHugger Robot
b47e7b4248 Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev am: 6e14ff02e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19192851

Change-Id: I832dcbc2fa78a81f9d64169d80cdc5a9aed5df4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-20 02:48:33 +00:00
TreeHugger Robot
6e14ff02e8 Merge "Update all preferences when the account preference updates UI" into tm-qpr-dev 2022-07-20 02:22:44 +00:00
Bill Yi
db7f7b6d31 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I2ca813a72a28c275eacf6dda32ad36d491aa48b9
 2022-07-19 13:59:24 -07:00
Grace Cheng
5aff3d9de6 Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev am: 66625c9c7b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19303032

Change-Id: Iaaef33597b7a6c79deb5154bc9b7841af8f5e48f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 19:42:56 +00:00
Grace Cheng
66625c9c7b Merge "Add missing description to SUW set pattern lock UI" into tm-qpr-dev 2022-07-19 19:31:06 +00:00
TreeHugger Robot
3d6b632232 Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev am: bd41fe5a5b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19207636

Change-Id: I8ea19a4c48286a2185450116f06a3314087c5be8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 17:21:39 +00:00
TreeHugger Robot
bd41fe5a5b Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev 2022-07-19 17:02:10 +00:00
Sorin Basca
5b0b7de3d5 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours am: 522bcbd7fc -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: I6bc4f9e950642a51e6b3158b4168826521ed3d56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:51:33 +00:00
Julia Reynolds
bfe54c8ad0 Update strings am: 21744cf2d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19325246

Change-Id: I163c8692eb166b134cf7cabb8434429be43f3911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:41:07 +00:00
Sorin Basca
522bcbd7fc [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours am: dd00927d16 -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: Ic39e47f5cdbd5ab6bd6377d14bd8bf2661ebcb22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:33:47 +00:00
Sorin Basca
dd00927d16 [automerger skipped] Use Mockito 4.6.1 API am: e2b0873f9c -s ours 
am skip reason: Merged-In I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b with SHA-1 61e0bcd194 is already in history

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

Change-Id: I4a89e9c7a5009f1bf6041589bd43b09d0f6f81b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 12:08:10 +00:00
Jason Chiu
c89755525f Update all preferences when the account preference updates UI 
When an account is added or removed, the account preference controller
just updates the account list, whereas there's no trigger point for the
account data sync preferences to refresh.

Add an API to update all preferences in DashboardFragment, so we can
refresh the account sync preferences whenever the account list is
updated.

Bug: 185479221
Test: robotest, manual
Change-Id: Ide3d972abae09ce0175e3bafbb1f4a5e307d20c8
 2022-07-19 10:32:23 +00:00
Sorin Basca
e2b0873f9c Use Mockito 4.6.1 API 
Bug: 236636175
Test: m RunSettingsRoboTests
Change-Id: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit c1c3a84fdc)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
(cherry picked from commit 61e0bcd194)
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-19 09:07:28 +00:00
wesleycwwang
97b5163651 Add dock charging state into stay awake feature (1/2) 
Bug: 233704731
Test: make RunSettingsRoboTests
Change-Id: I48e5279f24f7252c6bf7433a598df796942ed756
 2022-07-19 08:19:26 +00:00
Treehugger Robot
3ce3686836 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 am: cb4de95600 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: I1bf71a120f7db3f388a5e279a7e13ece80eef571
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-19 01:06:43 +00:00
TreeHugger Robot
91aec69fdc [conflict] [conflict] Merge "Use Mockito 4.6.1 API" into tm-dev-plus-aosp am: ac6af411ed am: 326c0ea30c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19305127

Change-Id: I52547d10f0579fddb21091b641925910db17ef38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Merged-In: I2cfda684059520f6ddd1e72c55f1ab1ec9c99e8b
 2022-07-18 22:39:07 +00:00
Treehugger Robot
cb4de95600 Merge "Fix incorrect storage calculation when SD card is inserted" am: e705fcd7c3 am: 2a0a88af4d am: dad4720a31 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147780

Change-Id: Ia8f4762a938a8b4dc2b8ac503b42792cc3cd882a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 20:43:47 +00:00
Julia Reynolds
21744cf2d1 Update strings 
Test: view notification settings on device
Fixes: 231232522
Change-Id: I04e236df65c89737a99e37ab818ec330629a942f
 2022-07-18 20:11:46 +00:00
Simon Wingrove
ef498ef53d Distinguish multiple PendingIntents via requestCode am: 25686219d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19289844

Change-Id: Id8509feac060578cf8d7ffb4d7a7b9def221f029
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-18 19:19:15 +00:00