PETER LIANG
aea8f1aeb2
Merge "Fix the inconsistent alignment of the main switch preference." into tm-qpr-dev
2022-07-25 12:05:17 +00:00
lbill
07b149ec51
Fix incorrect SetupChooseLockPattern layout
...
Root cause:
- The new added description TextView is too large
- sud_layout_description was add in sud_layout_content
instead of sud_layout_header.
Solution:
- Set string lockpassword_choose_your_pattern_description
to GlifLayout as it's description.(Header description)
Bug: 233666752
Fixes 239892091
Test: manual in setup flow, check choose lock pattern layouts
showing expectedly on both phone & tablet
Test: make RunSettingsRoboTests
Change-Id: Iabe503066434f8983dffb88d1c93f2bbf773b860
2022-07-25 12:01:46 +00:00
Android Build Coastguard Worker
ed6e1508a1
Snap for 8864221 from 037cf476e7
to tm-qpr1-release
...
Change-Id: Ie15bd27784bfd27eaa6e3b24286a7e1ca311fa23
2022-07-23 23:25:04 +00:00
TreeHugger Robot
037cf476e7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-23 05:32:42 +00:00
Android Build Coastguard Worker
554e579323
Snap for 8862780 from d478bb07d2
to tm-qpr1-release
...
Change-Id: Ifcc9a7fa9c923db6254105ba604f2748a120dd72
2022-07-23 03:25:34 +00:00
TreeHugger Robot
0e6b0ba8cb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196
-s ours am: c79be68440
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: Iaf373f97f40d7843265f975b6bf02e9e38bf3b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:37:27 +00:00
Bill Yi
6654c69877
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours am: 9dd5145c74
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I11c1fb356da657a90a63fa99f33cc45d2621da02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:37:07 +00:00
TreeHugger Robot
4fe83b61ff
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1ea00326ca
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235
Change-Id: Icc4d112b712ae5ba0b1a150ff4bff1cb84b26ed3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:35:21 +00:00
Bill Yi
9d76bd7a1f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1e9765bba2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392235
Change-Id: I8fe8a6b565eaa8500f2404d446ac3c9d230f0d9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:34:57 +00:00
TreeHugger Robot
c79be68440
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I9adde2ee67544bbe9efc248a08a048eb8b65785a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:30:03 +00:00
Bill Yi
9dd5145c74
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19392234
Change-Id: I96d8a1c29cb04a5dc84d871d9d58593f18233991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:42 +00:00
Bill Yi
f97e8519cf
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours am: 002496b1e1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: Ic1c09df378ccae0e9bd3c8a5555205498010f272
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 02:29:13 +00:00
TreeHugger Robot
1ea00326ca
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-07-23 02:03:07 +00:00
TreeHugger Robot
96bc6ca196
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-07-23 01:56:10 +00:00
Bill Yi
002496b1e1
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558
am: 011d462ac4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19391530
Change-Id: I1d9d706614d5157df413756a19ce0a45276aee33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-23 01:35:38 +00:00
TreeHugger Robot
d478bb07d2
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-22 22:42:33 +00:00
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
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
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
Android Build Coastguard Worker
f7d36b53f5
Snap for 8852680 from 9f2d455437
to tm-qpr1-release
...
Change-Id: I570a3fc0f6c865cd3198eded25a838560484ef3a
2022-07-20 23:25:38 +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
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
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
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
Android Build Coastguard Worker
e27edbc029
Snap for 8847022 from bd41fe5a5b
to tm-qpr1-release
...
Change-Id: Ib09b5e698bad0911f48ee4ffeab681f9c5b51653
2022-07-19 23:24:56 +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
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
bd41fe5a5b
Merge "Prevent leaking Wi-Fi dialog on lock screen" into tm-qpr-dev
2022-07-19 17:02: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
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
Android Build Coastguard Worker
c9f129a1b6
Snap for 8843235 from 25686219d3
to tm-qpr1-release
...
Change-Id: I0409382a10a057a39968eccb5361d8b4f38c04e4
2022-07-18 23:25: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
25686219d3
Distinguish multiple PendingIntents via requestCode
...
Settings uses a system of intent extras to open subsettings pages. When
PendingIntents are created from these Intents, the system does not think
they are unique as extras are not included in this equality check. So
only one of them is likely to work.
A unique request code can be used to distinguish between them.
Bug: 238605613
Test: atest LockScreenSafetySourceTest
Merged-In: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
Change-Id: Ia59197eeb86e988d9ffbb86caff4bbda7b30f059
(cherry picked from commit f2b0cedcd0
)
2022-07-18 11:18:28 +00:00
Android Build Coastguard Worker
0d58124b37
Snap for 8839047 from 7afae4bac1
to tm-qpr1-release
...
Change-Id: I91eb44a1364057b09137047bec00d2b177529bb9
2022-07-16 23:24:52 +00:00
TreeHugger Robot
7afae4bac1
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-16 06:32:58 +00:00
TreeHugger Robot
9e97c811a8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-07-16 06:32:58 +00:00
Android Build Coastguard Worker
89ff4ef315
Snap for 8837442 from d0695e781f
to tm-qpr1-release
...
Change-Id: I8043a440e50921c09675434ed88050f5b9a34f9e
2022-07-16 03:25:41 +00:00
Grace Cheng
fd63a0aef0
Add missing description to SUW set pattern lock UI
...
Updates Setup Wizard set pattern lock UI to include a description
Fixes: 233666752
Test: Observe description on "Set pattern lock" setup wizard UI
Change-Id: I5199eca42ac17886fa200d5abdd41e61f4030950
2022-07-15 22:16:43 +00:00
TreeHugger Robot
d0695e781f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod am: 8359385233
-s ours am: f20ec29820
-s ours am: 8a300a43df
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I757e5ee6c17971a4062188180abe60e76f4509ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:32:56 +00:00
Bill Yi
d8f919c239
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 415f1b8706
-s ours am: 6aa3b0a3a9
-s ours am: 617be8295c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19287433
Change-Id: I4ee1e7ab780dc181753b98182397dab315739314
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-07-15 18:32:41 +00:00