PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,036 Commits 1 Branch 0 Tags
8fda5e167bf07b1fa05c66c5cc24b85f4b208d7c
Commit Graph

80036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Weng Su
01961e9e11 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 422280c10d -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8ba00bfb17a2256c08a88356337dccfa58e4f651
 2021-03-05 20:58:49 +00:00
Weng Su
354bdce86b [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours am: 1f234b3791 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib60fc2fd5e2e16815f0aa60e6b542867855f2996
 2021-03-05 20:54:51 +00:00
Weng Su
422280c10d [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idad0d4683f21d80027e0891b1d14c1dd6b71245f
 2021-03-05 20:19:15 +00:00
Ahaan Ugale
1d1f3ea85f Merge "AF: Show passwords settings for available autofill service." into sc-dev 2021-03-05 20:16:53 +00:00
Weng Su
1f234b3791 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours am: 8aa56318f8 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic08627d137adc378004da05adf8945c9f7b38b0a
 2021-03-05 20:14:51 +00:00
TreeHugger Robot
cf06dfaf7a Merge "NLS settings polish" into sc-dev am: 78e8175479 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13787325

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id33ed2d21873e0057ff29ed3a41b1bfe5ef66de0
 2021-03-05 20:00:03 +00:00
Weng Su
8aa56318f8 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours am: 385b5cafd2 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7896b97e36005b6f3b28f448a2e2ede6d373259f
 2021-03-05 19:39:23 +00:00
TreeHugger Robot
78e8175479 Merge "NLS settings polish" into sc-dev 2021-03-05 19:11:47 +00:00
Weng Su
385b5cafd2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours am: efb2543e93 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9ae7ce98bd42db5528d78be0e8a72b86a5de9ee9
 2021-03-05 18:44:22 +00:00
Weng Su
efb2543e93 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 32d5d3a3a3 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 faa5f6b5f6 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d012e372d801b90f303a5138eed04d13dd1300a
 2021-03-05 18:12:04 +00:00
Zoey Chen
98a2018ad1 Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev am: d841a36c6f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13660509

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I07b655fb9287472d9c3d6e9e38a153380b33c232
 2021-03-05 15:05:32 +00:00
TreeHugger Robot
dba88408a6 Merge "Update new consent screen for fingerprint" into sc-dev am: e2410263f2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774726

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I25ced7b5b6e0d3a92422fb559b80ef899fb89dc0
 2021-03-05 15:04:24 +00:00
Mill Chen
256c8501c0 Change ScrollView to NestedScrollView for language list 
After enabling collapsing toolbar, ScrollView is not working with
CoordinatorLayout. So we need to update it to NestedScrollView to make
it work with CoordinatorLayout.

Bug: 181737215
Test: visual verified
1) Settings -> System -> Languages & input -> Languages
2) Add 6-8 languages to the list
3) Scrolling the list to see if it's smooth

Change-Id: Id47dfc225585ddd4469838ff0898495cda3f6c44
 2021-03-05 22:52:55 +08:00
Zoey Chen
d841a36c6f Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" into sc-dev 2021-03-05 14:43:52 +00:00
TreeHugger Robot
e2410263f2 Merge "Update new consent screen for fingerprint" into sc-dev 2021-03-05 14:29:45 +00:00
Julia Reynolds
8aaa9b1b24 NLS settings polish 
- Update strings
- Link to NLS page from notifications
- And fix an ordering issue on that page

Test: manual
Fixes: 181855978
Fixes: 181125178
Change-Id: I93d975763326d1e6d0cd02887abc515ad55329d0
 2021-03-05 14:27:51 +00:00
TreeHugger Robot
48cb098576 Merge "wifi: add WPA3 Enterprise entry in "Add network"" into sc-dev am: 8c96038584 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769530

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia93bc91846fc3cd5e6db77b9e35f26f2cdd06be6
 2021-03-05 14:09:00 +00:00
TreeHugger Robot
8c96038584 Merge "wifi: add WPA3 Enterprise entry in "Add network"" into sc-dev 2021-03-05 13:58:28 +00:00
Wesley Wang
a3b0bf6612 Merge "Update Battery Settings main page (1/2)" into sc-dev am: 783f1b1b56 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13698745

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84bd637ad484cff14bf411c5453c839859911faa
 2021-03-05 11:56:16 +00:00
Wesley Wang
783f1b1b56 Merge "Update Battery Settings main page (1/2)" into sc-dev 2021-03-05 11:23:39 +00:00
TreeHugger Robot
1ce08cbe8f Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev am: 2aa8d2b437 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769527

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I256fd63330ba547cdd280ce6423c72a282253e9a
 2021-03-05 10:15:58 +00:00
TreeHugger Robot
2aa8d2b437 Merge "Fix "USB tethering" doesn't work after reconnecting USB" into sc-dev 2021-03-05 09:53:05 +00:00
Weng Su
edebd02b0a [Provider Model] Add Wi-Fi toggle 
- Network & internet Settings
  - Remove “Show airplane mode networks"

- Internet Settings
  - Add “Wi-Fi” switch preference
    - Show “Find and connect to Wi-Fi networks” in summary

- Screenshot:
  https://screenshot.googleplex.com/AnoXf4qDe2jPirP

Bug: 181858434
Test: manual test
atest -c NetworkDashboardFragmentTest \
         WifiSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Ic420ff40cfdfb3ae29ee6f754ce139cb54651bda
 2021-03-05 16:32:06 +08:00
Mill Chen
c2be31a7d3 Update new consent screen for fingerprint 
- Move top description into subtitle for landscape mode
- Update the button text

Bug: 177591560
Test: robotest and visual verified
1) Settings -> Security -> Fingerprint
2) Rotate the device and check if the description is on the right side

Change-Id: Ie20597fce48f73aa83c5d637682db1860c384a7a
 2021-03-05 15:53:01 +08:00
Weng Su
72b8284ced [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours am: 5fe3617755 -s ours am: 6887ea151a -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ida1fd1547a60cbcbd2e9a3e4bcc5a2ed0901ea1f
 2021-03-05 07:23:17 +00:00
Weng Su
6887ea151a [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours am: 5fe3617755 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I915bbd72bc7737c9bd53fac1bca98f18fc61fe8a
 2021-03-05 07:08:25 +00:00
TreeHugger Robot
e55293815e Merge "Add strings for new Intent Picker" into sc-dev am: 0a6a65d8d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769535

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia2e8d583e39dafcee7ed61d31a2291c3b1dcefd2
 2021-03-05 06:36:44 +00:00
Weng Su
fb6947cdf7 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 66be7c55a2 -s ours am: 3fb9083a66 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I66ef1a439a271ce64d7900fd4aa73a4d9fa37e42
 2021-03-05 06:36:38 +00:00
TreeHugger Robot
baf7af921c [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: f0c01c5368 -s ours am: 3f925449c7 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4c0529724710cafae0fa9976bf90d90879d5cd89
 2021-03-05 06:36:31 +00:00
Weng Su
91127f65cd [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 am: 2a0cad3a2a -s ours am: e82b74e43c -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0e3c2662337821bc8b86eb5aaa73860a65a9dda4
 2021-03-05 06:36:17 +00:00
TreeHugger Robot
0a6a65d8d0 Merge "Add strings for new Intent Picker" into sc-dev 2021-03-05 06:31:27 +00:00
Weng Su
3fb9083a66 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 66be7c55a2 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iad2b19c3cc801589f4e5067ad6383415219b0d3b
 2021-03-05 06:20:28 +00:00
TreeHugger Robot
3f925449c7 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: f0c01c5368 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib0cd261a7dba74f3e079654358a048f3d062fbda
 2021-03-05 06:20:07 +00:00
Weng Su
e82b74e43c [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 am: 2a0cad3a2a -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I772b4de954c55d1f9d8a18e4386b74477a6c8c7e
 2021-03-05 06:19:21 +00:00
Janis Danisevskis
35d64764c7 [automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75 am: bb5ebce8a0 -s ours am: e0a303f6b6 -s ours 
am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf84154 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7889d901b8442414952c1bf3a6cfff33c92a9490
 2021-03-05 06:17:23 +00:00
Weng Su
5fe3617755 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours am: 0dfeac5326 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd1840366161db05f9ca1c772ea2b2b866fb4efa
 2021-03-05 06:15:42 +00:00
Wesley.CW Wang
280e3639cd Update Battery Settings main page (1/2) 
- Rollback ag/13413813 to meet the design change
 - Regrouping the index
 Screenshots:
   https://screenshot.googleplex.com/85aPq9ArJMWjJV2.png
   https://screenshot.googleplex.com/8uiZ9KLKAHoJyrP.png

Bug: 177407113
Test: make RunSettingsRoboTests -j40
Change-Id: Ic3c16d985b7c5e98e6d1bbe4481c48eadd3e4078
 2021-03-05 06:03:42 +00:00
Janis Danisevskis
e0a303f6b6 [automerger skipped] Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75 am: bb5ebce8a0 -s ours 
am skip reason: Change-Id I40dea0b9c3824b56814ae4c2fb6c7663c7d97af5 with SHA-1 b5caf84154 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ide6d1137c16bc0772e15fcccf8fd35b5d4da806f
 2021-03-05 05:59:24 +00:00
Weng Su
66be7c55a2 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic21478386815ca5cd2f7513faf586d42963506e3
 2021-03-05 05:59:16 +00:00
Weng Su
0dfeac5326 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -s ours am: b2af05bf21 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 58b0f2d5b3 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia6fd81b8b5e62d1814025fde12010f158268cac8
 2021-03-05 05:54:38 +00:00
Ahaan Ugale
a5571da12b AF: Show passwords settings for available autofill service. 
Separates autofill preferences into 2 categories - one for the passwords
settings and one for the existing default service preference.

The passwords preference controller dynamically creates preferences for
each autofill service.

Bug: 169455298
Test: manual
Test: TODO new test for controller
Change-Id: I369b5db00be75957c869df4d960595e9e1d9772c
 2021-03-04 21:49:42 -08:00
SongFerng Wang
82026f206e [automerger skipped] Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70 am: cc1715e2c0 -s ours am: ccadb9e31d -s ours 
am skip reason: Change-Id I2b981569ad11cf70a558c1952cc2e077464328d8 with SHA-1 60c4163244 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I69ad6c6575866d1b999059846fbc3b5d84bd83d0
 2021-03-05 05:47:54 +00:00
Treehugger Robot
d6cf7ea77a [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3 am: c4f1bd9675 -s ours am: 2b35467feb -s ours am: 86b03a2578 -s ours 
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I357e1e8cd9c55fbba94a64ddf2dcbba4fc6ad1cb
 2021-03-05 05:45:50 +00:00
TreeHugger Robot
51c5a0e12b [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -s ours am: 82d0f7a11b -s ours am: df6133e2b9 -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 05d6fa9bcb is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieda4bc613b771ccee56223fde31bf244e114b5b6
 2021-03-05 05:45:43 +00:00
Weng Su
5b50cb54ee [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours am: c271a656a7 -s ours am: 2bf462851c -s ours 
am skip reason: Change-Id Ia7acad6d456ce5ebea2d982d4cb063d4f28cbfff with SHA-1 eaeb50271e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia46be5e25bce804399b2962f7d02fc8c75b616cf
 2021-03-05 05:45:35 +00:00
tim peng
cf3e201e12 [automerger skipped] Merge "Add the explicitly mutable flag for creating a PendingIntent in MediaOutputSlice" into rvc-qpr-dev am: d082221652 am: cd4df5a1d3 -s ours am: a79726325b -s ours 
am skip reason: Change-Id Ic37b37bdbe6de6bdbad741985d3a920334240d80 with SHA-1 40d4e47b05 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id116a731af809a04d509b7b6b8a0982fdfd4fe8b
 2021-03-05 05:45:26 +00:00
Janis Danisevskis
bb5ebce8a0 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 am: bae6535b75 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4395ebf453fd712d9870580a90c370b42a770d7a
 2021-03-05 05:41:50 +00:00
SongFerng Wang
ccadb9e31d [automerger skipped] Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70 am: cc1715e2c0 -s ours 
am skip reason: Change-Id I2b981569ad11cf70a558c1952cc2e077464328d8 with SHA-1 60c4163244 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If823671f456d27da7f701ca93e2f86fcf74a13bd
 2021-03-05 05:22:05 +00:00
SongFerng Wang
cc1715e2c0 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 am: 29594edb70 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8cde83c4699a3859c3a0748688ab0c0dc0fd5a04
 2021-03-05 05:17:42 +00:00
Treehugger Robot
86b03a2578 [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3 am: c4f1bd9675 -s ours am: 2b35467feb -s ours 
am skip reason: Change-Id Ib794c5f2d904c2b187d7d5fd00b81afc852d0052 with SHA-1 2c74864579 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcea8bb13a8605130991784226cab7f909dedda4
 2021-03-05 05:17:13 +00:00