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

80020 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
d9b063428e 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: I391dd20f56d11af681a94e5758516f3a54652a09
 2021-03-05 15:04:01 +00:00
TreeHugger Robot
e2410263f2 Merge "Update new consent screen for fingerprint" into sc-dev 2021-03-05 14:29:45 +00:00
TreeHugger Robot
e1dcf60cfd 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: I49319ff9b78c970e2059bf0dcf1f5a703c4c6180
 2021-03-05 14:08:49 +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
892cf9808e 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: Ib43d0b03cf4f9618a45b154eea51d21c0de46227
 2021-03-05 11:55:47 +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
96324ec3a3 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: Iec5873050d56edd21763a467766a80e844ba7dfe
 2021-03-05 10:15:32 +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
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
28b36fcc84 [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: Ifa8680f713dcee23c523c3a00f9d438f823d3bbc
 2021-03-05 07:23:14 +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
Jason Hsu
c022defb32 Merge changes I135e5218,I1efd9760,Ia3d03054,I1fbe3157,Ic206a940, ... 
* changes:
  Add seekBar properties 'tickMark' to LabeledSeekBarPreference
  Add the preference controller to control accessibility button fade preference
  Add the preference controller to control accessibility button preview preference
  Add the preference controller to control accessibility button opacity preference
  Add the preference controller to control accessibility button size preference
  Add the preference controller to control accessibility button location preference
  Setup basic layout and resources for the accessibility button settings page
 2021-03-05 06:40:06 +00:00
TreeHugger Robot
f5e05ae984 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: Id1f33b0b0e432bda8522126d5f2dd84b43228caf
 2021-03-05 06:37:22 +00:00
Weng Su
15a3a7f836 [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: Ic7abf66ac98b800f5d9ea6d7710caebe2e8310a5
 2021-03-05 06:37:16 +00:00
TreeHugger Robot
3141299fe1 [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: Iffedae3a9d19adba5fdb758bd1c9c42043606351
 2021-03-05 06:37:10 +00:00
Weng Su
139995d26f [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: I7c1e3bdfcd8452e64571dff5ae662fb8a37ec36f
 2021-03-05 06:37:03 +00:00
Janis Danisevskis
fa38dc723c [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: I190e05d204b477e1b34f361406679bc042ec073e
 2021-03-05 06:36:21 +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
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
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
5977f708a2 [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: I15661c452dbc2eb7d854a3f408c398f660f7685e
 2021-03-05 05:38:50 +00:00
Treehugger Robot
62fc8f68cd [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: I63295ad558fe195ce466eb16d444ad8f5ee3a25d
 2021-03-05 05:37:16 +00:00
TreeHugger Robot
95e5ab5b1c [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: I5d55b366bb0d2383e5c9730cb731f9fd2c8d54e2
 2021-03-05 05:37:07 +00:00
Weng Su
1c214797f2 [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: Ic6231c7fdf1eb91f4bcfde1505291998d5ee8dd7
 2021-03-05 05:36:58 +00:00
tim peng
40abcd2fa9 [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: I0c6bf103278719e5cef7ac01c7f31f1fb0644164
 2021-03-05 05:36:48 +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
Janis Danisevskis
bae6535b75 Merge "Keystore 2.0: Make Legacy VPN settings ready for Keystore 2.0" am: 3c7b085331 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569702

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0f252dc43dfc8494e7cceb3b559b7252cd99697c
 2021-03-05 05:17:11 +00:00
TreeHugger Robot
df6133e2b9 [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 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: I38a19586d3792946dc61a73315a0affe90b2d787
 2021-03-05 05:16:18 +00:00
Weng Su
2bf462851c [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 -s ours am: 739bf235e5 -s ours am: c271a656a7 -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: Ieab165588cac75977ce1a4737f401e49ff2af825
 2021-03-05 05:14:39 +00:00
tim peng
a79726325b [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 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: I0fd18d47c37238abec9f5f7c3cddf7645242b6ea
 2021-03-05 05:13:09 +00:00
Treehugger Robot
2b35467feb [automerger skipped] Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3 am: c4f1bd9675 -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: I2e09bb1966a414fa31fe3de39be2b945d7e39722
 2021-03-05 05:11:51 +00:00
Weng Su
b2af05bf21 [automerger skipped] [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: faa5f6b5f6 -s ours am: 9da6b6f4ae -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: I909b96de08c455dd659c8cf9fbf19f52722622e7
 2021-03-05 05:07:57 +00:00
SongFerng Wang
29594edb70 Merge "Replace allowedNetworkTypes with allowedNetworkTypesForReason" am: 6775f40664 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1614990

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ieb1dc1653e5d33d4f21760aabb203cf40adcbdba
 2021-03-05 05:00:14 +00:00
Tom Hsu
3bc9bcdae2 Merge "[Provider Model] Fix preference summary not update." into sc-dev am: 1db2d1a25b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13769541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I724225de0d877cf017b289b7a0b9198771b20ba9
 2021-03-05 04:53:46 +00:00
Abel Tesfaye
50e41300a9 Merge "Instrument metrics for smart-auto-rotate and screen timeout" into sc-dev am: 61aa289dac 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13714687

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I70ce193ba057b981dc39ec1b5165fa1afa5ef416
 2021-03-05 04:53:02 +00:00
TreeHugger Robot
ef509128d5 Merge changes from topic "jr_device" into sc-dev am: dd6255a653 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13774765

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I89c3f66711f680ad87fdef74835df607410d2460
 2021-03-05 04:50:43 +00:00
TreeHugger Robot
82d0f7a11b [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -s ours am: 0d290a85c7 -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: Ia9490d4938e188774ad9700518fe7e2ec61b6889
 2021-03-05 04:47:22 +00:00
TreeHugger Robot
f0c01c5368 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -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: Iffb7e0ebc39de25f279ecf75d3eee8491c3f3bbb
 2021-03-05 04:30:53 +00:00
Weng Su
2a0cad3a2a [Security Report] Fix Settings WifiScanModeActivity Overlaid issue am: 05d6fa9bcb am: f71502fb10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13468308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1acaa4a03d9f40baa0a8382e40d31c00b5154465
 2021-03-05 04:30:04 +00:00
Treehugger Robot
c4f1bd9675 Merge "Keystore 2.0: Update Wifi settings to use mostly public keystore API." am: 32d2075fa3 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1569701

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0873d00dc15ffae3ac08ada37986a724bf825780
 2021-03-05 04:26:16 +00:00
TreeHugger Robot
0d290a85c7 [automerger skipped] Merge "[Security Report] Fix Settings WifiScanModeActivity Overlaid issue" into rvc-dev am: e0a922612f -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: I052bc73db19c56eff3cfa7dec4453595c4fe29d3
 2021-03-05 04:26:00 +00:00