Commit Graph

96487 Commits

Author SHA1 Message Date
Weng Su
820a18fbbd [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 -s ours am: 8c636a5cb5 -s ours am: 4d19eb8efc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic91d6d87b4da8e4d391786b7312677f3caf66323
2021-10-06 19:21:13 +00:00
Weng Su
58ca73f4f3 Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db am: a444b37de0 am: 1b293a76c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642

Change-Id: I28592f403ad51cc4b86b1fc50370f25773c4fd0c
2021-10-06 19:21:12 +00:00
Weng Su
79b429380b [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 -s ours am: 11f05bfec4 -s ours am: 098a8d13da -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2870e1c8b33c28e9d859922761f7232efb9aaf15
2021-10-06 19:21:11 +00:00
Weng Su
d86d17c620 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d am: eb871f3164 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf1fcb1e313464e9fd1b2b1b80e3d41db0409e08
2021-10-06 19:20:21 +00:00
Weng Su
0b80680303 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859 am: 5598ec1d23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifc03e6e2c418ba43a0fef7eb674fbc43ef9dd603
2021-10-06 19:20:19 +00:00
Weng Su
48a68e11f8 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b am: 1b0f409000 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I192913971c337ef831953833cb082d939f08d0a6
2021-10-06 19:20:17 +00:00
Weng Su
9b2d53dbad [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-v2-dev am: fb7d6f3918 am: ed73503009 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id032f7f8703e9091d7a634a8ef83f4a6be404d70
2021-10-06 19:20:08 +00:00
Weng Su
1f17d00fc2 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: 5cbaa375cd am: d537fa10e9 -s ours
am skip reason: subject contains skip directive

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

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

Change-Id: I241d0be3660aa203625a4570e4328eb5fdc25169
2021-10-06 19:20:06 +00:00
Weng Su
fe8c04d952 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: 34b571612f am: 6662a94c23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94b7d92891cc565d51b3ae6b54e0178b085fc136
2021-10-06 19:20:05 +00:00
Weng Su
4d19eb8efc [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 -s ours am: 8c636a5cb5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6df64e1d195771a60ef0dfd38a36e437bbf1c9b6
2021-10-06 19:15:05 +00:00
Weng Su
1b293a76c1 Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db am: a444b37de0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642

Change-Id: I841cfec11bfb2e90ddcb26dde095dd71da235b87
2021-10-06 19:15:04 +00:00
Weng Su
098a8d13da [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 -s ours am: 11f05bfec4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I809ef788ce02ba1f16cb6415760b553fd11fbb3d
2021-10-06 19:15:02 +00:00
Weng Su
8c636a5cb5 [automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into sc-qpr1-dev am: d408d7c408 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaafa6731520c51d731d07474855c2a5d4cb9ade
2021-10-06 19:09:42 +00:00
Weng Su
a444b37de0 Merge changes from topic "sc-dev_WifiDialogActivity_permission-sc-qpr1-dev" into sc-qpr1-dev am: e736eff6db
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15959642

Change-Id: Ifea597474df5643dd61145c0e2e60c49280c4d9d
2021-10-06 19:09:41 +00:00
Weng Su
11f05bfec4 [automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: f603e671e7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8545fa6f77e9f20953c839313d8e418d1a07baf9
2021-10-06 19:09:41 +00:00
Weng Su
eb871f3164 [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: I31e0d830de9a64550de5150f344f4424cf73a06c
2021-10-06 19:08:59 +00:00
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
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
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
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
YUKAI HUNG
f110e8a28c Merge "Replace the cached MotionEvent with getX() value to improve GC state" into sc-v2-dev 2021-10-06 06:14:28 +00:00
TreeHugger Robot
9ade901dd7 Merge "Update font/display size pages for support large screen in SuW" into sc-v2-dev 2021-10-06 06:09:38 +00:00