Commit Graph

89221 Commits

Author SHA1 Message Date
Yanting Yang
3e85d80578 Merge "Improve flicker when open app info page" into sc-dev am: 186254c6bc am: ad5fee1c29 am: ac941ca321
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999191

Change-Id: Ib860264ecb37c602833dc296c04174d86df9f5a4
2021-06-17 04:18:53 +00:00
Yanting Yang
ac941ca321 Merge "Improve flicker when open app info page" into sc-dev am: 186254c6bc am: ad5fee1c29
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999191

Change-Id: I85b1cdc16c8e464715143793e37e85a9dc8a70e6
2021-06-17 03:49:57 +00:00
Yanting Yang
d1fa8a332d Merge "Improve flicker when open app info page" into sc-dev am: 186254c6bc am: 9ca4df4047
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999191

Change-Id: I2a1fbe1ab255070be6955e004db4d4cd25956861
2021-06-17 03:49:42 +00:00
Yanting Yang
ad5fee1c29 Merge "Improve flicker when open app info page" into sc-dev am: 186254c6bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999191

Change-Id: I243bb66e7831a4173785c1d8a0ae78e959540584
2021-06-17 03:40:31 +00:00
Yanting Yang
9ca4df4047 Merge "Improve flicker when open app info page" into sc-dev am: 186254c6bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14999191

Change-Id: I0710f16adad1fe798e2b143e7875d5f2cd598eed
2021-06-17 03:39:45 +00:00
Yanting Yang
186254c6bc Merge "Improve flicker when open app info page" into sc-dev 2021-06-17 03:28:22 +00:00
Kevin Chyn
d20c257a16 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: f721b1d9a6 am: b7c1d10c4b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: If4918ddab287936d4663c2d8430c93eb39d313e0
2021-06-17 02:25:32 +00:00
Kevin Chyn
60bf5a6a9a Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 83a8b9141d am: 97be514076
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I23d41eb96ffad2ca086a4c6b59ba12a88231643c
2021-06-17 02:25:10 +00:00
Kevin Chyn
b1a49db7b7 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: e70ec6e388 am: 7f96511fee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I0bce8bc66e7eee520ca8a8e95c4f773bc0a05a0f
2021-06-17 02:25:08 +00:00
Kevin Chyn
b9362cf587 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: 16bd0c2cbd am: 65aa5d7139
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I2f16d3425c97e5c0be44d9978c9738959627d8b5
2021-06-17 02:23:43 +00:00
Kevin Chyn
e3b72ffef2 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 3551588761 am: a5a6b946cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I286818d8fd91d7d43123fafe985d0de22decfe4b
2021-06-17 02:22:48 +00:00
Kevin Chyn
a8ee60bb48 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: da4aff8c65 am: ce05aa8bd4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I1dc38c303426bc96acfd71a3895a88baeac0f35d
2021-06-17 02:22:46 +00:00
Kevin Chyn
39d2a2def1 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: b8486ee467
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: Id1de8f9d9bc4625206f26472ea237ce4392ee037
2021-06-17 02:15:45 +00:00
Kevin Chyn
b7c1d10c4b Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: f721b1d9a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I6bbe93ba8879626cf0e7c075d13151b4cbd45a98
2021-06-17 02:14:42 +00:00
Kevin Chyn
97be514076 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 83a8b9141d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I7d86a089fdb9043de0f2509c62cea73114f6144d
2021-06-17 02:14:08 +00:00
Kevin Chyn
7f96511fee Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: e70ec6e388
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: Ida2ba632f723beb1372322f7393f836dc2918ec0
2021-06-17 02:14:06 +00:00
Kevin Chyn
8979a18492 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 8cf5ca3382
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I20f74bed342e97a22bf1aa5f3e74a70821f86270
2021-06-17 02:13:46 +00:00
Kevin Chyn
e51d57b2c0 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: e9da6b3e58
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I2e349a404656258bbf59370aece87577e90dedd2
2021-06-17 02:13:43 +00:00
Kevin Chyn
65aa5d7139 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709 am: 16bd0c2cbd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I83bfdb503bbc5000b0fa24fa83ba734cdc7537fb
2021-06-17 02:06:35 +00:00
Kevin Chyn
a5a6b946cc Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df am: 3551588761
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I9a8b1389008f5133cdbae6cf752352693e2c7662
2021-06-17 02:05:27 +00:00
Kevin Chyn
ce05aa8bd4 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28 am: da4aff8c65
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I1983108d43a5e46b3a92a829624539b25db86e7a
2021-06-17 02:05:25 +00:00
Kevin Chyn
16bd0c2cbd Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I6bca8ad91ea38037374b9c2eb6468190997e5b88
2021-06-17 02:01:45 +00:00
Kevin Chyn
f721b1d9a6 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I5b7e86c7745b89ec5d1b0ae673a182eca594edc8
2021-06-17 02:01:44 +00:00
Kevin Chyn
b8486ee467 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev am: 5a8476a709
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984578

Change-Id: I5f84a7746e8dffaf49b7b612da2cdcebac01ca00
2021-06-17 02:01:31 +00:00
Kevin Chyn
3551588761 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: Ice19c02714ce776f6bf1cfa5e1a95a6e29ee9375
2021-06-17 02:01:25 +00:00
Kevin Chyn
da4aff8c65 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I52255ec8af862d982b38fecb42aee3aa275b87a4
2021-06-17 02:01:23 +00:00
Kevin Chyn
8cf5ca3382 Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I515247c938ac0f3767c7d0031d3a54bc25d0e0a9
2021-06-17 02:00:44 +00:00
Kevin Chyn
e9da6b3e58 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I37dea094206b11ef2897fac5c9911cc804f4be0d
2021-06-17 02:00:42 +00:00
Kevin Chyn
83a8b9141d Merge changes from topic "kchyn-unicorn4a" into sc-dev am: 678a57b0df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14991599

Change-Id: I216f08fd5182096e96debe88674d466edb93f680
2021-06-17 02:00:40 +00:00
Kevin Chyn
e70ec6e388 Add biometric strings to DeviceAdminStringProviderImpl am: fc19953d28
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14984754

Change-Id: I7ba4cfa16a8154d482f193aa2713b5b06b21e7a4
2021-06-17 02:00:38 +00:00
Kevin Chyn
5a8476a709 Merge "Pass context and enforcedAdmin to onClickListener" into sc-dev 2021-06-17 01:28:17 +00:00
Kevin Chyn
678a57b0df Merge changes from topic "kchyn-unicorn4a" into sc-dev
* changes:
  Show biometric-specific dialog when appropriate
  Add biometric strings to DeviceAdminStringProviderImpl
2021-06-17 01:27:00 +00:00
Abel Tesfaye
011308471a Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: 839f9e6319 am: 0c91452b68
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I8d8f6ffd9792d8a600f17e7a20757f7950905d60
2021-06-16 18:14:03 +00:00
Abel Tesfaye
d01d8b941f Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: 02c941968f am: cc26673d5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I82511d22ca4f979b180bcc62b52f5310ac10ae97
2021-06-16 18:13:49 +00:00
Abel Tesfaye
0c91452b68 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: 839f9e6319
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I94283a39e0fb2d0143122608ffcb343c8176ae4e
2021-06-16 17:56:05 +00:00
Abel Tesfaye
cc26673d5e Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: 02c941968f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I177596b7d596184cbfe700389d2b4dd35b5b003b
2021-06-16 17:55:45 +00:00
Abel Tesfaye
750ca2fc67 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188 am: e8d7346216
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I4bc8555dd7ec1703fa61e8717f075e8d626d6e56
2021-06-16 17:55:15 +00:00
Abel Tesfaye
02c941968f Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: Ib37a1f8280a7cef805545b88f09ea85fde83a076
2021-06-16 17:39:45 +00:00
Abel Tesfaye
839f9e6319 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I57c511d4bbebeb18c57b51009e3e1c7fda232467
2021-06-16 17:39:15 +00:00
Abel Tesfaye
e8d7346216 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev am: b8c610b188
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14923591

Change-Id: I5c465f8c499966f7322600546153974cc0abf54a
2021-06-16 17:38:59 +00:00
Abel Tesfaye
b8c610b188 Merge "Fix battery saver not disabling adaptive sleep switch" into sc-dev 2021-06-16 17:25:48 +00:00
Treehugger Robot
158f4fed78 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e am: b34692c2b5 am: e7e7c33de7 am: d009484a59
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: I4d91c6b6dc2b521dbdfcb99fdae5ef0769b53481
2021-06-16 15:54:13 +00:00
Treehugger Robot
d009484a59 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e am: b34692c2b5 am: e7e7c33de7
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: Ida316fba970e1eb8be6f1d92b14ca9531846baa3
2021-06-16 15:39:31 +00:00
Treehugger Robot
e7e7c33de7 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e am: b34692c2b5
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: I15cef0a16d846f68ea331b550b1926caa952d8f6
2021-06-16 15:29:29 +00:00
Treehugger Robot
b34692c2b5 Merge "Settings: use framework text colors for SwitchBar" am: b09a17bc9e
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1708559

Change-Id: I84406695c1822ccda20b74b35ea18a2d51487119
2021-06-16 15:18:06 +00:00
Treehugger Robot
b09a17bc9e Merge "Settings: use framework text colors for SwitchBar" 2021-06-16 14:59:18 +00:00
Yanting Yang
b492aa369e Improve flicker when open app info page
The Battery item moves down because the summary of Screen time is
loading in the background, we should put a summary placeholder to
avoid item shifting.

Fixes: 191115152
Test: robotests & visual
Change-Id: Iee297a7350726f02c3569231d37112f8911b1b35
2021-06-16 21:03:25 +08:00
Stanley Wang
349168b8b5 Merge "Fix the problem that the "Turn off SIM" dialog will be displayed when the MobileNetwork page is slid to to top." into sc-dev am: d0adfa7b3e am: 2773b42560 am: cf2b8c48dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

Change-Id: Ib98cd0a024b64692ca5b5c2de38976bc0387c539
2021-06-16 11:59:44 +00:00
TreeHugger Robot
ada9c6a563 Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52 am: b48c3f5aa6 am: 0197a01a82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888

Change-Id: Ided85281b0336bf155bea9d1d38aa0c6eb0ae2d1
2021-06-16 11:59:39 +00:00
TreeHugger Robot
44f640b01e Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a am: b848c52f5b am: a720c45bfa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884

Change-Id: I9b4dc15d5e66dc6f2fabf8ea3bb378e80a6606a5
2021-06-16 11:59:34 +00:00