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
aed1ab9e45
[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: I3ee28caa937081f910aeb361e3dac5a913de74c7
2021-10-06 19:09:37 +00:00
Weng Su
f05b8fbb79
[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: I769f3d5a15c1ee8bf7d4497f46c41e22dc2cc9e1
2021-10-06 19:09:36 +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
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
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
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
6ff60d7771
Merge "Update adaptive preference summary" into sc-v2-dev
2021-10-06 10:03:55 +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
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
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
Sunny Shao
f9beef43c9
Update font/display size pages for support large screen in SuW
...
- Follow the SuW design of the UI guideline.
- Add the footer button for each pages.
- Add a new AccessibilityScreenSizeForSetupWizardActivity for SuW.
- Add suw_font_size_fragment.xml and suw_screen_zoom_fragment.xml
for each fragment.
- Shorten 50% of the preview height.
Bug: 194447311
Fixes: 199369859
Test: manual test
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.accessibility
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Change-Id: I2685e96d37d542490521ec24cfce490f87cbd88d
2021-10-06 11:41:57 +08:00
ykhung
d1dd4cdf2c
Replace the cached MotionEvent with getX() value to improve GC state
...
avoid to cache the whole MotionEvent, since it will clone the whole
instance fields again to cause GC triggering, since we only need the
getX() value in the MotionEvent, rather than the whole data
Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Ic3840b0a4eb6587ec229ba3de2c62ec868d1a535
2021-10-06 10:35:50 +08:00
TreeHugger Robot
64dbb05a69
Merge "Post UI update later a while to avoid screen sluggish as possible" into sc-v2-dev
2021-10-06 01:56:42 +00:00
Diego Vela
04f6a2829f
Merge "Update window aar" into sc-v2-dev
2021-10-06 01:42:44 +00:00
Chen Chen
f8d1ee71bf
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog
...
Bug: 194300867
Test: Build
Change-Id: I5a496df50550ea7ee6986c960e28ae3e4a056b4b
2021-10-05 17:46:15 -07:00
ykhung
33612098b3
Post UI update later a while to avoid screen sluggish as possible
...
When users turned on/off the saver mode, the system is busy in update
configurations and the dark/light theme, we should avoid updating the UI
in the same time to makes users feel the animation is not smooth
Bug: 201752975
Test: make -j64 RunSettingsRoboTests
Change-Id: I4c28af267616f796438a505e84ce376321c74981
2021-10-06 08:43:57 +08:00
Daniel Solomon
71d5798d3e
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev am: 396939a577
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15918324
Change-Id: Iea142d5bec500413df5dd68ee0fc73273130ecdc
2021-10-05 23:01:16 +00:00
Daniel Solomon
396939a577
Merge "Update BrightnessInfo constructor usage" into sc-qpr1-dev
2021-10-05 22:44:19 +00:00
Michael Wachenschwanz
dc150492e1
Update to new method of getting display power profile constants
...
Bug: 200226329
Test: builds and flashes
Change-Id: I4abcb609a383224bba1550cfd3e50bb68f58ba72
2021-10-05 11:32:13 -07:00
Weng Su
ca67955d7d
[RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity"
...
This reverts commit 71e728e934
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I9251eb35ecba9bcc07eb3763c47c3ad7f55897f1
2021-10-05 12:04:33 +00:00
Weng Su
f733da4859
[RESTRICT AUTOMERGE] Revert "Add SafetyNet logging"
...
This reverts commit 199528d460
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: I5ed1782f1a35681ab6be4f74ea3156420b7dad5f
2021-10-05 12:04:14 +00:00
Weng Su
e92d1d1a6b
[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"
...
This reverts commit 56a88885cc
.
Reason for revert: rollback CLs to avoid compatibility risks
Bug: 185126813
Change-Id: Ie9d17faa536186e9787ff17b9bc7f7e30adabd1c
2021-10-05 12:03:07 +00:00
TreeHugger Robot
14a90d0639
Merge "Launch activities in another task if the metadata is set." into sc-v2-dev
2021-10-05 11:45:59 +00:00
Wesley.CW Wang
4137253658
Update adaptive preference summary
...
Bug: 195627250
Test: make RunSettingsRoboTests
Change-Id: I50ed736bbba7ac8d3d6fcf026e9e17e2116f86a7
2021-10-05 17:52:43 +08:00
Jason Chiu
73fa1f8e06
Create a provider for querying if embedding activity is enabled
...
Bug: 202103027
Test: manual
Change-Id: I97bd5fc9d1d6157ff11096678217f44175df0c8d
2021-10-05 17:25:52 +08:00
Bill Yi
e1ab06ff5f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a516da5761
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15976277
Change-Id: Ia11fde412d70521c2955d4355c4c46956137c1ba
2021-10-05 07:49:05 +00:00