PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,073 Commits 1 Branch 0 Tags
2d17c1de222038e43da7d3014558e052c7500edc
Commit Graph

75073 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
2d17c1de22 Merge "Update language to comply with Android's inclusive language guidance" am: e66c8beaa5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248949

Change-Id: Ia5924e549ab2c88d934322f810e547e9c879d0a2
 2020-08-03 02:00:15 +00:00
TreeHugger Robot
e66c8beaa5 Merge "Update language to comply with Android's inclusive language guidance" 2020-08-03 01:44:01 +00:00
Arc Wang
22034b3413 [automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 am: 675894883c -s ours am: 3feacc9bbb -s ours 
am skip reason: Change-Id Icf97199967faa2e359b0120a8c989bd1df2c6cea with SHA-1 21faffa23c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448

Change-Id: I7ee4f4ef2fc657241eb3f6d5ee44002f33387338
 2020-08-02 14:14:14 +00:00
Arc Wang
b072ab54b3 [automerger skipped] Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 am: b049b018d3 -s ours am: 61b043a6dd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953

Change-Id: I7b4c68f4b41721496431f320c2f2e6e0413fd1c8
 2020-08-02 14:14:00 +00:00
Arc Wang
3feacc9bbb [automerger skipped] Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 am: 675894883c -s ours 
am skip reason: Change-Id Icf97199967faa2e359b0120a8c989bd1df2c6cea with SHA-1 21faffa23c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448

Change-Id: I0f81e538d00f7e26b0dedb2cc1faeec223c017d3
 2020-08-02 13:53:24 +00:00
Arc Wang
61b043a6dd [automerger skipped] Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 am: b049b018d3 -s ours 
am skip reason: skipped by user arcwang

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953

Change-Id: Iacf72797b77cc41218e2136e00377fcc15c21981
 2020-08-02 13:52:55 +00:00
Arc Wang
675894883c Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev am: 5d86bebb32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271448

Change-Id: I84f736a1797e9b6b31bc007fc88df912ca9f5eeb
 2020-08-01 02:57:49 +00:00
Arc Wang
b049b018d3 Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev am: f833684e28 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248953

Change-Id: I20946b3619d96eefbb23d48ba4b43b2bc68ed115
 2020-08-01 02:57:37 +00:00
Arc Wang
f99a6355fd Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" am: b3952b0826 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271446

Change-Id: Ib23a2f6acceb63394a654e967e989aa64b05e931
 2020-08-01 02:56:30 +00:00
Arc Wang
5d86bebb32 Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" into rvc-qpr-dev 2020-08-01 02:34:26 +00:00
Arc Wang
f833684e28 Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" into rvc-qpr-dev 2020-08-01 02:34:05 +00:00
Arc Wang
b3952b0826 Merge "[Wi-Fi] Remove 'Do not validate' option in CA certificate spinner" 2020-08-01 02:32:08 +00:00
Betty Chang
3f582f8276 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 am: 481db1eff9 am: 48b44acaa1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445

Change-Id: I6e72d1d7eb4ec6a23c2cd8cf68eedbef39c106e9
 2020-07-31 15:05:49 +00:00
Betty Chang
48b44acaa1 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 am: 481db1eff9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445

Change-Id: I468ea7573857f9ce81a7c029098d0febc4fe2d06
 2020-07-31 14:45:43 +00:00
Betty Chang
481db1eff9 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev am: b8437f1c68 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12271445

Change-Id: I1739c80b479db6be75041e94716babf66d7609d6
 2020-07-31 14:33:16 +00:00
Julia Reynolds
cddb9eef7c Merge "Add 'all apps' to notification filters" am: 184271e7e4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12260966

Change-Id: Ie6fbc0196517e2fb185ada221b4e5e9f4c123951
 2020-07-31 14:15:27 +00:00
Betty Chang
b8437f1c68 Merge "Add setPackage for PendingIntent in SimSelectNotification" into rvc-qpr-dev 2020-07-31 14:11:05 +00:00
Julia Reynolds
184271e7e4 Merge "Add 'all apps' to notification filters" 2020-07-31 14:03:33 +00:00
Al Sutton
131258309b Update OWNERS to reflect current team am: 44dd1aa26e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12282023

Change-Id: I7b7b52ee27ad7dd48b7f8acea8c6189263d8bee5
 2020-07-31 12:14:40 +00:00
Al Sutton
44dd1aa26e Update OWNERS to reflect current team 
Test: CI verifies email addresses
Change-Id: I3da2759a28e715667ce594aea15508522bdd72c6
 2020-07-31 11:54:57 +01:00
TreeHugger Robot
bc3f1bb060 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours am: 873b675292 -s ours am: dcff57ce27 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: If42fae2724ef0aa4a51a1d9d5d51bd8271924212
 2020-07-31 02:42:29 +00:00
TreeHugger Robot
2e383e0c55 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours am: ffb6f25613 -s ours am: b83c7e3014 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: Ic8df6aefe83af9c5343776b6b1b247aa592f4c61
 2020-07-31 02:42:16 +00:00
TreeHugger Robot
008a4f12dc [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours am: 2c6bcf8b89 -s ours am: 18e4e317af -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I5b14a762004e173e88e0ff0f974756e82c5aec1d
 2020-07-31 02:42:01 +00:00
Arc Wang
9af4bcc987 Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" am: 8734b131fb 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12248952

Change-Id: I10e3c3c58554bbd7308a4d38302b8a8ff9f016cd
 2020-07-31 02:41:32 +00:00
Arc Wang
33cde5dbee [Wi-Fi] Remove 'Do not validate' option in CA certificate spinner 
"Do not validate" is not secure and must not be used in any production
network. R Suggestions API already does not allow connections with
no Root CA certificate.

Bug: 162466484
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      Manually add or edit  an EAP method Wi-Fi network and observe CA
      certificate spinner options.
Change-Id: Ica5ecf8805c51d7cdce7b16e02e0dd79d5f64754
Merged-In: Icf97199967faa2e359b0120a8c989bd1df2c6cea
 2020-07-31 10:28:11 +08:00
TreeHugger Robot
dcff57ce27 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours am: 873b675292 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: Ia2c1b4d11087808683fdb7fa8b81aa83a7d4767d
 2020-07-31 02:26:01 +00:00
TreeHugger Robot
b83c7e3014 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours am: ffb6f25613 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I1b65cf1e1f64180d3cce01fed944073579128bad
 2020-07-31 02:25:43 +00:00
TreeHugger Robot
18e4e317af [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours am: 2c6bcf8b89 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: Ie74a91304170da0b93b43c44b2e201fb42f19cdb
 2020-07-31 02:25:17 +00:00
Arc Wang
8734b131fb Merge "[Wi-Fi] Check if domain field is not empty when users choose a ca certificate" 2020-07-31 02:22:02 +00:00
TreeHugger Robot
f10aaacc34 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: 68670e66bb -s ours am: a0b71099a1 -s ours am: bfb77aad73 -s ours am: 26bcb5227a -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288

Change-Id: Ic350f7c9c36d8028e6c3df681b929c844baa4e1e
 2020-07-31 02:09:02 +00:00
TreeHugger Robot
496fd83863 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: dd285067fa -s ours am: 8c2af47193 -s ours am: 35fb5bd2d2 -s ours am: f271d9e28a -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042285

Change-Id: Ib0c3d109ab17a8b6311152809d55ef4ab4a2e821
 2020-07-31 02:08:56 +00:00
TreeHugger Robot
01ee90a581 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: a39609069d -s ours am: 656da9da88 -s ours am: 60fa4115a3 -s ours am: 03c99f4243 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288

Change-Id: Ib942324ce92cfd1fa53ae032f7a8304497764a91
 2020-07-31 02:08:46 +00:00
TreeHugger Robot
2c2d341e81 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: c1c90a2f95 -s ours am: fb020898bb -s ours am: 16f97498c0 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042285

Change-Id: I06acef58d75574c0f75cd8d4b477a6930f4d7887
 2020-07-31 02:08:11 +00:00
Arc Wang
94b8579607 [Wi-Fi] Check if domain field is not empty when users choose a ca certificate 
Domain is required for client to validate server's certificate.
This change disable Save button for a new Wi-Fi network of a
specified CA certificate but empty domain.

Bug: 161378819
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      manual
      1. Install a certificate.
      2. Add a new Wi-Fi network of EAP method PEAP
      3. Set CA certificate to the certificate installed at 1.
      4. Save button should be disabled.
      5. Input something in domain field.
      6. Save button should be enabled.
Change-Id: I65c8b29ec7a03b21403ddbfc087ce48c2a4a69e4
 2020-07-31 10:06:48 +08:00
TreeHugger Robot
873b675292 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 2ce9a48f56 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I220a2a387723eb74e6cdd22c86b6ab2d7a7e0e68
 2020-07-31 02:05:46 +00:00
TreeHugger Robot
ffb6f25613 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours am: 024b5785b2 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I95798437b0a7f1bb33decf85210d008c9e7c49ba
 2020-07-31 02:05:02 +00:00
TreeHugger Robot
2c6bcf8b89 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours am: 352e0cec50 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: Icb046278ddeed700303792caaba38dfe1c66bbc4
 2020-07-31 02:04:35 +00:00
Arc Wang
21faffa23c [Wi-Fi] Remove 'Do not validate' option in CA certificate spinner 
"Do not validate" is not secure and must not be used in any production
network. R Suggestions API already does not allow connections with
no Root CA certificate.

Bug: 162466484
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigControllerTest
      make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
      Manually add or edit  an EAP method Wi-Fi network and observe CA
      certificate spinner options.
Change-Id: Icf97199967faa2e359b0120a8c989bd1df2c6cea
 2020-07-31 09:58:20 +08:00
TreeHugger Robot
3badb66da7 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: a39609069d -s ours am: b6ef1c8a8e -s ours am: a6695c6a6b -s ours am: f8512ccafd -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288

Change-Id: I35e757307e2a59cf8a79b4047c03c3ca6d3e5131
 2020-07-31 01:55:32 +00:00
TreeHugger Robot
c6eaed5ea2 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: 1c64519a1b -s ours am: 83244c0722 -s ours am: 5917f239f6 -s ours am: ab5ba2ac03 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042285

Change-Id: I20a0a9d8e66d17248a85312a00a60a93a94378bf
 2020-07-31 01:48:37 +00:00
TreeHugger Robot
024b5785b2 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: eccf377941 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I8491880cb9ad719a9f4b7507f04932cdd1e391d2
 2020-07-31 01:48:08 +00:00
TreeHugger Robot
2ce9a48f56 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: Id6362bc0a6bc8c81a6618249460e5baa258eda89
 2020-07-31 01:48:06 +00:00
TreeHugger Robot
352e0cec50 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours am: 2c6cc855a4 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I7ef267b59cb7cdc483c51a571e98d90ec37036e5
 2020-07-31 01:46:38 +00:00
TreeHugger Robot
cdb387c879 [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: f3f682446d -s ours am: 08d93061f5 -s ours am: ecb9abf8fc -s ours am: 1229c54068 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013

Change-Id: I81205ce4d6c80e82ef634ce31dc0e9a80dc6d7c5
 2020-07-31 01:45:32 +00:00
TreeHugger Robot
acae9cd7fc [automerger skipped] Merge "Allows to launch only authenticator owned activities" into pi-dev am: d3ab16f1e2 -s ours am: b3448be7c7 -s ours am: 2076a10386 -s ours am: c5cc1c5939 -s ours am: 9a4e24e12e -s ours am: a23d9273aa -s ours am: 75dcf24143 -s ours am: 9d92db27a5 -s ours 
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 e2eab4e258 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802013

Change-Id: Ib3dec45cf0f968ce72856aa1fc251c17e01f44f3
 2020-07-31 01:41:49 +00:00
Arc Wang
d37f61c555 Merge "[Wi-Fi] Support multi-SIM for SIM dependent EAP methods" am: b42d09f885 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12068762

Change-Id: I0797ae43ee48a6baa588c7bcb1f8f85608162451
 2020-07-31 01:30:33 +00:00
TreeHugger Robot
26bcb5227a [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: 68670e66bb -s ours am: a0b71099a1 -s ours am: bfb77aad73 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288

Change-Id: I21d87a2ce7cc863f8e04010365309d3260fb4bf4
 2020-07-31 01:29:11 +00:00
TreeHugger Robot
f271d9e28a [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-qpr1-dev am: 49729c59d9 -s ours am: 8b7cdc3fb3 -s ours am: dd285067fa -s ours am: 8c2af47193 -s ours am: 35fb5bd2d2 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042285

Change-Id: Ic20ba09a83b2a6be9042c72923401786b568b76a
 2020-07-31 01:28:32 +00:00
TreeHugger Robot
03c99f4243 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into qt-dev am: 5894b6fff0 -s ours am: 4de63443e5 -s ours am: 757bb926c4 -s ours am: a39609069d -s ours am: 656da9da88 -s ours am: 60fa4115a3 -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12042288

Change-Id: Idd92f7052a696183bbde5e3de70241535c5b96d3
 2020-07-31 01:27:30 +00:00
TreeHugger Robot
eccf377941 [automerger skipped] Merge "Enable the filterTouchesWhenObscured in Special app access" into pi-dev am: a407682e00 -s ours am: c6d69a8af4 -s ours am: 562c82f107 -s ours am: ed01792e5f -s ours 
am skip reason: Change-Id I011cfe4b7e4e624a8338332ac47a353f7f3ab661 with SHA-1 ee4ec4b33f is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12065562

Change-Id: I61c7eac90eca4440f210da976b3476851ae7720a
 2020-07-31 01:27:07 +00:00