Commit Graph

89196 Commits

Author SHA1 Message Date
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
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
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
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
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
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
TreeHugger Robot
e30cc31374 Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: bf2fae3df5 am: ef95465d2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I422b3fbdaa960e8708deb87fcbbf3bf9d0fe2d35
2021-06-16 11:59:28 +00:00
Stanley Wang
475868b422 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: 6cb273d8c6 am: 7a7b4242de
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

Change-Id: I26a648a651970cccb09843e7b6194a649cabac77
2021-06-16 11:59:22 +00:00
TreeHugger Robot
053c6a9945 Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52 am: f8c5e7357e am: 3cc252d005
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888

Change-Id: I9c980a22288911a41798fa6c765fddb0c4f0b131
2021-06-16 11:59:17 +00:00
TreeHugger Robot
045cf5599b Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a am: 1f0a69cdf2 am: 815ec73249
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884

Change-Id: I220d916f21d74361258e2d68425bb85f3b2b2032
2021-06-16 11:59:10 +00:00
TreeHugger Robot
6f74df1bfe Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: 49d52d14fe am: 4d4105462a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I9b215e243f6c48e4d1b438ff82defe4d719e59e0
2021-06-16 11:58:56 +00:00
Stanley Wang
cf2b8c48dd 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

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

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

Change-Id: I5befa485aa9f7a70f4bbd55afb2be516b62383fa
2021-06-16 11:46:01 +00:00
TreeHugger Robot
ef95465d2e Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: bf2fae3df5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: Ib0ec3fd5d761be15bbe7048d1e33e40fd8746d29
2021-06-16 11:45:57 +00:00
Stanley Wang
7a7b4242de 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: 6cb273d8c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

Change-Id: Id3a3a1ef3cbb15bb06a92bc6bf406b2b723b4351
2021-06-16 11:45:49 +00:00
TreeHugger Robot
3cc252d005 Merge "Fix the issue of permanent loading when Wi-Fi is disabled" into sc-dev am: 1803aead52 am: f8c5e7357e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980888

Change-Id: I6339d4a88eff6e0f219e53933185372a391c9208
2021-06-16 11:45:45 +00:00
TreeHugger Robot
815ec73249 Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a am: 1f0a69cdf2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884

Change-Id: If9b9161efd6e49f0c980c6e54fee70c99133a58c
2021-06-16 11:45:41 +00:00
TreeHugger Robot
4d4105462a Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: 49d52d14fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I6bedc054eb5bbc6c21ee7b3e528c11805db1e944
2021-06-16 11:45:36 +00:00
Stanley Wang
932b4d4505 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: d9f6bf7461
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

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

Change-Id: I209599f5914c59c681ec1de903a8e07636de8e82
2021-06-16 11:45:26 +00:00
Stanley Wang
d9f6bf7461 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

Change-Id: I923a9fefa701ee10b1286b6420bf837169570c62
2021-06-16 11:45:20 +00:00
TreeHugger Robot
2b8161e253 Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a am: 464e12f1fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884

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

Change-Id: I813bda8e3264586c7e5812dbda2739f9abefbd0c
2021-06-16 11:45:15 +00:00
TreeHugger Robot
cbcd1e663e Merge "Fix the toggle button flicker problem when display" into sc-dev am: c0b23b03c3 am: 3ce2aaf7b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14819349

Change-Id: I9180a7d2471436b9619ceaafac0ad945ac4ce16a
2021-06-16 11:45:12 +00:00
TreeHugger Robot
464e12f1fa Merge "Add One-handed mode entry point in a11y system controls" into sc-dev am: 1da2a5390a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14980884

Change-Id: Ie62a92d9b6edde7bd7670a8ffaec1b21f3783274
2021-06-16 11:45:11 +00:00
Stanley Wang
2773b42560 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

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

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

Change-Id: I79f741d31a30c68bdabafee75ff9d10d9ec523d8
2021-06-16 11:44:52 +00:00
Stanley Wang
6cb273d8c6 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
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14964824

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

Change-Id: Ie01368e09f786bee4420d6cf87d0b59cc5420834
2021-06-16 11:42:15 +00:00