Commit Graph

91267 Commits

Author SHA1 Message Date
Stanley Wang
e08f1f71c6 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 7324a4773e am: ef3a4cf0b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: I4374e6cf6b8755a34fef013cd020797e14f73b9d
2021-07-02 03:03:23 +00:00
Stanley Wang
916b86e6c8 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 18c5908b51 am: f467fd28c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: I09ad4826790463528238d0ff110cc9d27b741bdd
2021-07-02 03:03:11 +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
278e468255 Merge "Update the illustrations of camera gestures." into sc-dev am: 38f6a9738f am: 392d0b7581
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15151591

Change-Id: Icad351419dbd83b4d9d476b27e868a08daa27249
2021-07-02 02:49:23 +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
392d0b7581 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: Id6491bd488ce7d8d1d279160743425b7baf5bbee
2021-07-02 02:36:36 +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
Jeremy Goldman
cfb194d605 ManageablePreferenceTest created for VpnSettings
Creating unit tests for VPN settings to increase the reliability of that
settings component.

Note that because S build is locked down but the T sdk has not been
started, the test suite was seeing the following error:

java.lang.IllegalArgumentException: Error: Failed to parse APK file: /data/local/tmp/SettingsUnitTests.apk: Requires development platform T but this is a release platform

In order to resolve this error, specifically set the SDK as android
S in the manifest. When the SDK transitions to android T, this may need
to be updated.

Test: atest -c tests/unit/src/com/android/settings/vpn2/ManageablePreferenceTest.java
Bug: 187245804
Change-Id: Ifa1450c23b1ade46809541252e22950b76b4faa5
2021-07-02 09:47:28 +08:00
TreeHugger Robot
be88ef3fda Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d am: 554a9d39d3 am: 618574b2a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824

Change-Id: I46a19b92781b6e3c209ff419f35e12bcda5678d4
2021-07-01 20:12:33 +00:00
TreeHugger Robot
89e67de7d3 Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d am: 54d7271920 am: 8331382f8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824

Change-Id: I83649ebb75c370b12209b9808535a2c873fa6fd1
2021-07-01 20:11:16 +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
74b25978ac Merge "Adjust UI of face and fingerprint enroll intro pages" into sc-dev am: 588c13555d am: 7bc93a4d5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15175824

Change-Id: I21924526a85c7d9dae60f5267d1bfd0affd9cac1
2021-07-01 19:46:58 +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
7bc93a4d5c 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: Ib0a2b59ef13e991a17b63ba899d9d4dd94fa991c
2021-07-01 19:28:29 +00:00
Abel Tesfaye
f60885a040 Hide battery saver warning and camera privacy lock on devices that do not support smart-auto-rotate
Bug: 191924078

Test: locally on crosshatch
Change-Id: I8464860c3d1d59c5d4549e7c488457e92054dbba
2021-07-01 19:17:37 +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
a596cdccb6 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 am: 1fe799cb13 am: 41271915c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: Ia479ce7c72b4f0d33f83ff2ed8a9c886c2e6a787
2021-07-01 18:12:35 +00:00
Julia Reynolds
94ffc288bd Move selectability to switch from container
To better work with SwitchAcccess

Test: manual with Switch Access (with labels on) and Talkback
Fixes: 189074205
Change-Id: Iafbc4eca9bce8c979ec16a743509b46727cd9eb6
2021-07-01 14:08:39 -04:00
TreeHugger Robot
283c0f5c67 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 am: 18f3c51a44 am: 351c0b5876
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I9d44097910e0d8c12a67a649f04957a3892cbd74
2021-07-01 18:06:06 +00:00
TreeHugger Robot
5a84359cca Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 am: 6b6e438619 am: 60fa2c0f48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: Icc51148d549fa2fb9174f4ab559dba2898efc1ab
2021-07-01 18:04:59 +00:00
TreeHugger Robot
387a8f4485 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 am: 45a56735d1 am: d098a72c8d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: I408167f007368d940dcf99e00ab547fa7237e5db
2021-07-01 18:01:54 +00:00
Yanting Yang
d5e7b0e7a5 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: c5f29a8c79 am: 92a3ef950f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I8af7c72b68e3ebecf081109f20550ae3a75ffb9c
2021-07-01 17:56:28 +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
62f574b502 Merge "Revert "Add a cancel string for ToggleSubscriptionDialog to handle Tamil"" into sc-dev am: af63867d08 am: 96cb752b6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15167365

Change-Id: I7a1fccdb9b5e61623fa4c59c068d9613e16f0095
2021-07-01 17:49:43 +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
96cb752b6f 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: I0b542f1b56142d9331dadfacc749769ee6d5c542
2021-07-01 17:49:33 +00:00
Yanting Yang
33834ab6a7 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: 8236794aa5 am: 5d5f002f19
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I26f8cf4bdff4b1b2eb767cecf72d9c36e344b3f7
2021-07-01 17:49:30 +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
TreeHugger Robot
fe4dac1cb8 Merge "Add bottom padding to 'Choose a new lock screen'" into sc-dev am: 964404b2b7 am: de5043c516
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15174930

Change-Id: If484870dec81abe5b65346840a99e4b53848a2bc
2021-07-01 17:48:33 +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
de5043c516 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: Idc31df33e3049dbdc1c76aee1ccfc40a9668ce58
2021-07-01 17:28:17 +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
29d6a13c58 Merge "Correct breadcrumbs of Wi-Fi scanning and Bluetooth scanning" into sc-dev am: fdc7659754 am: afd19d5310
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15172930

Change-Id: I158505cd98c0765162d17771e91d0926c67e2887
2021-07-01 16:42:34 +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
afd19d5310 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: I1f889aa1f72b79e23b7b7e7a2e954a055baa35d8
2021-07-01 16:33:16 +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