TreeHugger Robot
867b9eb6d1
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 58d95b41c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: I6ae382f07d9b35a36a804a79f4bbb9f664635321
2021-07-02 05:52:33 +00:00
TreeHugger Robot
a60344a35a
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: 33a9e928fb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I4b7aee6791c35a07da6636dc95b6c39b016a2d89
2021-07-02 05:52:21 +00:00
TreeHugger Robot
096f77298b
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
am: 0b95e8c9c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: Ieb069a51f1a5d0f30fa215ec8cbd3a450cc01dfa
2021-07-02 05:52:03 +00:00
TreeHugger Robot
de02870306
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
am: d30e518f0c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I091bedaccfde3ee417d2e9da758583495ce10b1d
2021-07-02 05:51:59 +00:00
TreeHugger Robot
0b95e8c9c7
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: I7970a92d9fcdd207e60487d84acd22177cab4563
2021-07-02 05:39:07 +00:00
TreeHugger Robot
d30e518f0c
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: I98d9a9a04064e9d599f33ee585f020bdd6c248a7
2021-07-02 05:39:01 +00:00
TreeHugger Robot
58d95b41c9
Merge "Correct the choose screen lock page" into sc-dev am: 77f0dbaa26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15171314
Change-Id: If663e6bfecc6c0576c8b619f16223d0fd23229f4
2021-07-02 05:38:18 +00:00
TreeHugger Robot
33a9e928fb
Merge "Fix multiple biometrics enrollment flow" into sc-dev am: 65c9b03fb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15165945
Change-Id: Ie661943ee6352757a03f928c9db6e729927a8b7e
2021-07-02 05:38:12 +00:00
TreeHugger Robot
77f0dbaa26
Merge "Correct the choose screen lock page" into sc-dev
2021-07-02 05:26:38 +00:00
TreeHugger Robot
65c9b03fb5
Merge "Fix multiple biometrics enrollment flow" into sc-dev
2021-07-02 05:26:18 +00:00
Yanting Yang
2a407d98f2
Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
am: e3c1b7ecac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993
Change-Id: I43ce77d4e820780be16e40ac18b311e9f54a15a1
2021-07-02 04:32:34 +00:00
Yanting Yang
b14cde1eb5
Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
am: 9fd3223b5a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993
Change-Id: I1f4583aed0f03527ba6fcc527be21d6b6ba0eaae
2021-07-02 04:19:07 +00:00
Yanting Yang
e3c1b7ecac
Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993
Change-Id: Id60d48a6c76a77e572d1521fd204aa93bd77aa7c
2021-07-02 04:10:41 +00:00
Yanting Yang
9fd3223b5a
Merge "Remove stale search result about "Recent location requests" page" into sc-dev am: 62315005fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172993
Change-Id: I8063aed6ceeaf85500d331ce793f38135abf4a9c
2021-07-02 04:09:17 +00:00
Yanting Yang
62315005fd
Merge "Remove stale search result about "Recent location requests" page" into sc-dev
2021-07-02 03:59:29 +00:00
Stanley Wang
ef3a4cf0b5
Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f
am: 7324a4773e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591
Change-Id: I224a0593908991aac192ee90af427046f5297c39
2021-07-02 02:50:15 +00:00
Stanley Wang
f467fd28c2
Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f
am: 18c5908b51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591
Change-Id: I2c641144560251a61aab3664a4256d3bd48523ec
2021-07-02 02:49:51 +00:00
Stanley Wang
18c5908b51
Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591
Change-Id: I22b64c767fc9b53c4214fb571a87a9490982520d
2021-07-02 02:37:22 +00:00
Stanley Wang
7324a4773e
Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591
Change-Id: I97f1d78f55b8841636a186c9b0bde1c84569218c
2021-07-02 02:36:35 +00:00
Stanley Wang
38f6a9738f
Merge "Update the illustrations of camera gestures." into sc-dev
2021-07-02 02:23:19 +00:00
TreeHugger Robot
618574b2a2
Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d
am: 554a9d39d3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824
Change-Id: I0e83a66a3c5ddf11cae1b5aa51f2feb83a920414
2021-07-01 19:48:25 +00:00
TreeHugger Robot
8331382f8e
Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d
am: 54d7271920
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824
Change-Id: I95ee7a46dc41e412a7f7370fff95d758373e1d14
2021-07-01 19:46:11 +00:00
TreeHugger Robot
554a9d39d3
Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824
Change-Id: I22328129aaf6c992aaf62c662670abe444cb3cc5
2021-07-01 19:30:27 +00:00
TreeHugger Robot
54d7271920
Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824
Change-Id: I0e3a1a5e1a52ca9c4ce20a3cf169263a1c742d5b
2021-07-01 19:29:08 +00:00
TreeHugger Robot
588c13555d
Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev
2021-07-01 19:11:51 +00:00
TreeHugger Robot
41271915c1
Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08
am: 1fe799cb13
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365
Change-Id: If8ccda15e1447fa53a6e6a2bb6ec1cf7f2dc54f3
2021-07-01 17:54:52 +00:00
TreeHugger Robot
351c0b5876
Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08
am: 18f3c51a44
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365
Change-Id: I0c571adb557fd13b433ecf23ffdb68be61df7fe4
2021-07-01 17:50:39 +00:00
TreeHugger Robot
60fa2c0f48
Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7
am: 6b6e438619
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930
Change-Id: Ie1006c4f00a08d37185f03442f96339d89642efa
2021-07-01 17:50:29 +00:00
TreeHugger Robot
1fe799cb13
Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365
Change-Id: I1fa95318e792dbbe4055acf5e096254b2c30610f
2021-07-01 17:49:37 +00:00
TreeHugger Robot
18f3c51a44
Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365
Change-Id: Ife7873e34cb5410a36acb0a95abcd4e183ee12e0
2021-07-01 17:49:36 +00:00
TreeHugger Robot
d098a72c8d
Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7
am: 45a56735d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930
Change-Id: Id82d9e54c2c5a421eb7210ccbf8592994e46235e
2021-07-01 17:49:01 +00:00
Curtis Belmonte
4cf13de04d
Adjust UI of face and fingerprint enroll intro pages
...
Changes the appearance and spacing of the face and fingerprint unlock
intro/consent pages to be consistent with one another and more closely
match the latest mocks.
Test: Manually tested face and fingerprint enrollment
Fixes: 192475206
Change-Id: I4d41ddc15dc1a6be818762a286f06470344cf819
2021-07-01 10:38:25 -07:00
TreeHugger Robot
af63867d08
Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev
2021-07-01 17:35:51 +00:00
Peter Wang
494c68e3cf
Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"
...
This reverts commit eba8857094
.
Reason for revert: Issue not urgent enough to go in S, will resubmit to master
Bug: 185553806
Change-Id: Id7f6042e0f7c70a3a8ca951fb80bb7f30acedcb9
2021-07-01 17:35:43 +00:00
TreeHugger Robot
45a56735d1
Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930
Change-Id: I8c1f907ff8dca2660a6d32371f57dfe31167031e
2021-07-01 17:29:13 +00:00
TreeHugger Robot
6b6e438619
Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930
Change-Id: Ib4810dddb206ac0c4b901924462ee61b11cb832b
2021-07-01 17:28:26 +00:00
TreeHugger Robot
964404b2b7
Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev
2021-07-01 17:17:01 +00:00
Yanting Yang
92a3ef950f
Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754
am: c5f29a8c79
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930
Change-Id: Ie2c8e6fb108d0a46c40dc1e07319bf02079dadbd
2021-07-01 16:52:09 +00:00
Yanting Yang
5d5f002f19
Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754
am: 8236794aa5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930
Change-Id: I3e23528c4fdcc4fd85c5ebaada69cb250eab7a27
2021-07-01 16:43:23 +00:00
Yanting Yang
c5f29a8c79
Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930
Change-Id: I11d4e1a3bb0815a3e3ed43049a01561e7b5b9e89
2021-07-01 16:34:09 +00:00
Yanting Yang
8236794aa5
Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930
Change-Id: I7e8efcf1f75541e303ca8ed57de4fb5eef3fba73
2021-07-01 16:33:12 +00:00
Yanting Yang
fdc7659754
Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev
2021-07-01 16:24:15 +00:00
Alex Johnston
0e898acd4a
Add bottom padding to 'Choose a new lock screen'
...
* Add 24dp padding
Before: https://screenshot.googleplex.com/64sTaMhwqMKQ4CE
After: https://screenshot.googleplex.com/As33LmkLXG7duV5
Bug: 192541032
Test: manual testing (see screenshots)
Change-Id: I4e29e4f776e7be1c42301c39c4844d7ee948eaaa
2021-07-01 16:20:23 +01:00
Tom Hsu
68991eb7e1
[automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37
am: 6ff7306d51
-s ours am: 6e24f125ca
-s ours
...
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980
Change-Id: I625106b3de67c27d0bd11f22cc9f6c17f5e0af36
2021-07-01 12:42:32 +00:00
Yanting Yang
007d1b2a57
Remove stale search result about "Recent location requests" page
...
Based on the new design, RecentLocationRequestSeeAllFragment was no
longer used on Location, but it still implemented the indexable
interface to provide stale search result “Recent location requests”
to Settings Search.
Remove the indexable interface from RecentLocationRequestSeeAllFragment
as a quick fix and also correct the related test method name.
Fixes: 192542283
Test: visual
Change-Id: I1a3df5d7319b8831db2f3d3abba19a11b5a83c81
2021-07-01 20:31:05 +08:00
Tom Hsu
6e24f125ca
[automerger skipped] Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37
am: 6ff7306d51
-s ours
...
am skip reason: Merged-In I179c708debcbc31ba9a93e4e434ae810051f5004 with SHA-1 a2402aba83
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980
Change-Id: I76853bce59f351cec5daa360da0a20fc9bd97e78
2021-07-01 12:27:18 +00:00
Tom Hsu
6ff7306d51
Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page." am: 53f081be37
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1753980
Change-Id: I317a0e09d0d43cdaa96baead76416d09b018a20a
2021-07-01 12:12:33 +00:00
Tom Hsu
53f081be37
Merge "[Settings] Prevent crash from abnormal behavior for ApnSettings page."
2021-07-01 12:00:52 +00:00
Stanley Wang
d7825d3627
Update the illustrations of camera gestures.
...
- Add the new illustrations of quickly open camera.
- Add the new illustrations of flip camera for selfie.
- Remove the old illustration of quickly open camera.
- Remove the old illustration of flip camera for selfie.
Bug: 190807662
Test: robotest and see the UI
Change-Id: I72030731c6d2fe23ff4b21d366151ac4770c656f
2021-07-01 19:59:49 +08:00
Yanting Yang
ed7139fad0
Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning
...
Since the screen title of the Location Services page is not the same
as the preference title on the Location page, it breaked the page
relation between Location and Location services to lead to the broken
breadcrumbs for Wi-Fi scanning and Bluetooth scanning.
Fixes: 192540579
Test: visual
Change-Id: I9fbc4033517a715e97e534991549a1029ca4e5fa
2021-07-01 19:22:02 +08:00