Commit Graph

97552 Commits

Author SHA1 Message Date
Weng Su
5598ec1d23 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620

Change-Id: I2c0700185c68242c201cb52ea581221ce39ae52f
2021-10-06 19:08:58 +00:00
Weng Su
1b0f409000 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: Iab725f5469eb82e7b61cf2570edc0d8e7df46ea8
2021-10-06 19:08:57 +00:00
Weng Su
ed73503009 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev am: fb7d6f3918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657

Change-Id: I21ed5cf8b5b3326295af2947f8c620826505f441
2021-10-06 19:08:55 +00:00
Weng Su
d537fa10e9 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 5cbaa375cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959657

Change-Id: I2c471e927ba5b5fa42099f9adaaf6a3f612a82f6
2021-10-06 19:08:53 +00:00
Weng Su
9e5308a998 Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev am: 1c15ca32c2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646

Change-Id: I8d36653e74adbb13144b2d65a58e124983b5e615
2021-10-06 19:08:51 +00:00
Weng Su
395ac6073c [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483 -s ours
am skip reason: Merged-In I81c4d801c4ee211f43a1688a62daaff3b47eae1a with SHA-1 4fb84a3737 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: Ie68ac2947f392a8046c2f62d9c357c852493eb2b
2021-10-06 19:08:50 +00:00
Weng Su
d5ff68889c [automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2 -s ours
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527 is already in history. Merged-In was found from reverted change.

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

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

Change-Id: I18755f444c82aa7f3241812a1f51e0e06c009c07
2021-10-06 19:08:49 +00:00
Weng Su
6662a94c23 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 34b571612f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959646

Change-Id: Ica11fe7e996e2e7ddf20572b4d84f1e5637a846c
2021-10-06 19:08:49 +00:00
Weng Su
1b732ee4cb [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958174

Change-Id: Ibe7ee7e46ef2568608ab98781b2795d8b6216bbb
2021-10-06 19:08:27 +00:00
Weng Su
36558d2c6c [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620

Change-Id: I2328f01474382bf74a445cddf8d110bb4ce7ac58
2021-10-06 19:08:25 +00:00
Weng Su
372e90064b [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958170

Change-Id: I671a389457ed8500ebe4aa41fbbda42b6604094c
2021-10-06 19:08:22 +00:00
Weng Su
2fe0d45ab8 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev am: 3678155f90
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I82807875c1087f54e7c6701ea3cb7e73af9b0352
2021-10-06 19:05:00 +00:00
Weng Su
0fe85baf93 [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 153b0f03f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958164

Change-Id: I1060479460cccc4e5e827b3687d3aaa214311ea5
2021-10-06 19:04:59 +00:00
Weng Su
cbd0883356 [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 6a2624e500
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958163

Change-Id: I74316633648d6a5002433440358b9a0a443b3cf8
2021-10-06 19:04:58 +00:00
Weng Su
457a63ce84 [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: d05686b431
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958162

Change-Id: I90af118b9033a7ee53b35aa2b435d2ba95281181
2021-10-06 19:04:56 +00:00
Chen Chen
ee0f42ec6c BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:55:19 +00:00
Chen Chen
2b7a6c4407 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:54:38 +00:00
Chen Chen
31b15330c4 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:53:07 +00:00
Chen Chen
e5ccfba996 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:52:44 +00:00
Chen Chen
65a63e76b1 BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:52:10 +00:00
Chen Chen
aebca7f35b BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
Bug: 194300867
Test: Build

Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-06 18:50:23 +00:00
Weng Su
fb7d6f3918 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev 2021-10-06 18:48:54 +00:00
Weng Su
1c15ca32c2 Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev-sc-v2-dev" into sc-v2-dev
* changes:
  [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
  [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:54 +00:00
Weng Su
d408d7c408 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev 2021-10-06 18:48:39 +00:00
Weng Su
e736eff6db Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev
* changes:
  [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
  [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
2021-10-06 18:48:39 +00:00
Weng Su
ed4abe8483 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev 2021-10-06 18:47:52 +00:00
Weng Su
259742ebb2 Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev
* changes:
  [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add permission checking to WifiDialogActivity"
  [RESTRICT AUTOMERGE] Revert "[DO NOT MERGE] Add SafetyNet logging"
2021-10-06 18:47:52 +00:00
Weng Su
3678155f90 Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into qt-dev 2021-10-06 18:47:29 +00:00
Bonian Chen
71818bdf15 [Settings] Adopt comfirm SIM deletion to euicc reset UI
There's an "Erase downloaded SIMs" option within reset options UI.
When reset EUICC, eSIM profile might get removed.
There's a security feature "Confirm SIM deletion" need to be applied in
this case.

Bug: 194145231
Test: local
Change-Id: I1798dfe347be7d0610a12fb79f103efece2ab240
(cherry picked from commit ebca15a861)
2021-10-06 16:58:07 +00:00
Kunhung Li
068b235c12 Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev am: f83531e0b3 am: 4e77f2d62c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938355

Change-Id: I87c801dbd33fba3a851090ca91eae6bcc81aa1a5
2021-10-06 14:38:36 +00:00
Kunhung Li
4e77f2d62c Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev am: f83531e0b3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15938355

Change-Id: I04034e2b77306d8494f496851af02f3d4e666e77
2021-10-06 14:19:12 +00:00
Kunhung Li
f83531e0b3 Merge "Not use NEW_TASKS for Wallpaper & style's 2-pane UX" into sc-v2-dev 2021-10-06 14:05:10 +00:00
Kunhung Li
c692af2a76 Not use NEW_TASKS for Wallpaper & style's 2-pane UX
Refine launch mode to support 2-pane UX for Settings.

Bug: 197609643
Test: make RunSettingsRoboTests
Change-Id: I5212bbcf8c512fac571284379a29cf487f387c5a
2021-10-06 14:04:08 +00:00
Menghan Li
21eb4d80f4 Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev am: 9441d2b289 am: ebdfd05c67
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15773283

Change-Id: Ie70c92947bcff341fe7040e8ce5d2046eea0643d
2021-10-06 11:18:43 +00:00
Menghan Li
ebdfd05c67 Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev am: 9441d2b289
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15773283

Change-Id: Icfd8f891f85dc2a179770592fc1168eab2a501b0
2021-10-06 11:00:39 +00:00
Menghan Li
9441d2b289 Merge "Apply GlifPreferenceLayout for accessibility service Setup Wizard two-panel styles" into sc-v2-dev 2021-10-06 10:46:37 +00:00
TreeHugger Robot
bf19d369a0 Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771 am: e6a10f3487
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706

Change-Id: If760aaa0006cadb1f5cbb999b977ffe719dfb6d7
2021-10-06 10:19:36 +00:00
TreeHugger Robot
e6a10f3487 Merge "Update adaptive preference summary" into sc-v2-dev am: 6ff60d7771
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981706

Change-Id: I33990898878a7f3a451667827936503f707f09f7
2021-10-06 10:14:33 +00:00
YUKAI HUNG
6fc7e95f81 Merge "Support mouse hover event for BatteryChartView to highlight slot" into sc-v2-dev am: 14139de0cf am: e1d45963a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15988049

Change-Id: I634f692a0706cf710571c58c6c7d4970effa7f5a
2021-10-06 10:14:07 +00:00
TreeHugger Robot
6ff60d7771 Merge "Update adaptive preference summary" into sc-v2-dev 2021-10-06 10:03:55 +00:00
YUKAI HUNG
e1d45963a6 Merge "Support mouse hover event for BatteryChartView to highlight slot" into sc-v2-dev am: 14139de0cf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15988049

Change-Id: Ib86f5075fecd5d03a9832dba5a5cd454700ee5cd
2021-10-06 09:58:05 +00:00
YUKAI HUNG
14139de0cf Merge "Support mouse hover event for BatteryChartView to highlight slot" into sc-v2-dev 2021-10-06 09:41:59 +00:00
ykhung
8eff5cc17e Support mouse hover event for BatteryChartView to highlight slot
https://drive.google.com/file/d/19Ms4JOPVfQ6rfXr71vTeXJLSvJqJtRfw/

Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I2c03585163ddb7809a09944aec326a41f6bd4758
2021-10-06 08:24:52 +00:00
Jason Chiu
b4fef16d94 Merge "Create a provider for querying if embedding activity is enabled" into sc-v2-dev am: 93494cd39b am: 328c184c3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981705

Change-Id: I64efb38494d12028eb87771dd1b6b516a6f0f201
2021-10-06 07:00:38 +00:00
Jason Chiu
328c184c3c Merge "Create a provider for querying if embedding activity is enabled" into sc-v2-dev am: 93494cd39b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15981705

Change-Id: Id4d336ed87c3373a34d72a237cc8d36163ce4870
2021-10-06 06:49:25 +00:00
YUKAI HUNG
0cb11a1f91 Merge "Replace the cached MotionEvent with getX() value to improve GC state" into sc-v2-dev am: f110e8a28c am: 4bc427ece3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15989087

Change-Id: Ief75f6bdc4ba97b4ad7ecbbbff5a7bbfd67b2452
2021-10-06 06:42:43 +00:00
TreeHugger Robot
fe13cd070d Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev am: 9ade901dd7 am: 87895d0893
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895175

Change-Id: Icb7de5c7fc4bd8f89f7ef04b0cd9e8eb36a1c882
2021-10-06 06:42:34 +00:00
Jason Chiu
93494cd39b Merge "Create a provider for querying if embedding activity is enabled" into sc-v2-dev 2021-10-06 06:29:46 +00:00
YUKAI HUNG
4bc427ece3 Merge "Replace the cached MotionEvent with getX() value to improve GC state" into sc-v2-dev am: f110e8a28c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15989087

Change-Id: Ia1aea017c08ac60c7fb451b3ae967c1c21d45303
2021-10-06 06:25:14 +00:00
TreeHugger Robot
87895d0893 Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev am: 9ade901dd7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15895175

Change-Id: Iba75d65a5e896774bfa512831412ee47aaf91139
2021-10-06 06:25:04 +00:00