Weng Su
499e526da1
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours am: 504af9e6cd
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: Ic02c7e10aa692466389a1610ed8843690fc2b827
2021-10-08 07:39:01 +00:00
Weng Su
1c6bdf023f
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours am: b885452051
-s ours am: 5c878f37a6
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I20853bdff515a8de7515498c929ab204c3fb8f78
2021-10-08 07:39:00 +00:00
Weng Su
e579105a14
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add permission checking to WifiDialogActivity" am: ca67955d7d
am: 973211dba5
-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: I06ef5c77f0b7eca0f15b78f83b8fd2db3fb29351
2021-10-08 07:38:55 +00:00
Weng Su
bcd7792138
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours am: 77d30c4d0c
-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: Ia0c535eff0c406c9b5e52e541a9d75b16e703f29
2021-10-08 07:38:54 +00:00
Weng Su
ca90ea9e47
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest" am: e92d1d1a6b
am: 1400ff3139
-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: Iffd455b9592dc57114e8bab3d2a5b7a0f7e197a7
2021-10-08 07:38:53 +00:00
Weng Su
504af9e6cd
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours am: 374ef0012a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I305b55c515a15900ed007c56cb6f5362b3b09c6e
2021-10-08 07:22:28 +00:00
Weng Su
5c878f37a6
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours am: b885452051
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: I578872acacdb22c11ef08b1ebb33311d05664475
2021-10-08 07:22:28 +00:00
Weng Su
973211dba5
[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: Ib42cd4909a5d6265ee2a3181df4c34b0c32a79bb
2021-10-08 07:22:21 +00:00
Weng Su
77d30c4d0c
[automerger skipped] [RESTRICT AUTOMERGE] Revert "Add SafetyNet logging" am: f733da4859
-s ours
...
am skip reason: skipped by user wengsu
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15951620
Change-Id: I5d0fa94c0b09106bb65764ffbd4636209f685c35
2021-10-08 07:22:20 +00:00
Weng Su
1400ff3139
[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: Ie039408dcee182693303390eca26386ff6c546d2
2021-10-08 07:22:20 +00:00
TreeHugger Robot
d754409050
Merge "Update to new method of getting display power profile constants" into sc-v2-dev
2021-10-08 02:28:51 +00:00
Bonian Chen
c915df88b7
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev am: 78c18a1b45
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15993432
Change-Id: I295924575236c7101f3784f8c9f102d2f5dc49a5
2021-10-08 00:01:14 +00:00
Bonian Chen
78c18a1b45
Merge "[Settings] Adopt comfirm SIM deletion to euicc reset UI" into sc-qpr1-dev
2021-10-07 23:42:43 +00:00
Arc Wang
d2cb885c32
Merge "[Large screen] Fix SplitPaitRule not match for deep link problem" into sc-v2-dev
2021-10-07 10:25:37 +00:00
Arc Wang
dcc46cf136
[Large screen] Fix SplitPaitRule not match for deep link problem
...
- Set both secondary ComponentName and secondary Intent action
in SplitPairFilter when registering SplitPairRule for deep link.
- Set ComponentName to the Intent which DeepLinkHomepageActivity
uses to start the deep link page.
This change setup Intent and SplitPairRule to have both
Intent action and ComponentName. It fixes matching problem.
Bug: 201627196
Bug: 199888089
Test: manual
[Unfolded] Long press home (workspace) -> Pop-up menu ->
Tap 'Wallpaper & style' -> Launch Settings in the left as
list and 'Wallpaper & style' in the right as detail.
Change-Id: I8cc8cef911ce0d7d05f332eb86f77f8d2543827f
2021-10-07 17:44:24 +08:00
TreeHugger Robot
69c9e424e8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 57e7d9c4b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16000259
Change-Id: Ia8eba6d2c5e57bb52b4a5f35b954fb01e0714161
2021-10-07 08:51:58 +00:00
TreeHugger Robot
dd3651cc5e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-10-07 08:40:55 +00:00
TreeHugger Robot
57e7d9c4b3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-07 08:40:47 +00:00
Bill Yi
c18019db27
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idb42ad66d7b7212c8f9c131f939a08b674f3c640
2021-10-07 02:41:09 +00:00
Bill Yi
98f9ed5934
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ia9a8641798558c7df5e1d65aadaf5ca9f15fc080
2021-10-07 02:37:16 +00:00
Chen Chen
4f2a6225c9
BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog am: 2b7a6c4407
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15995345
Change-Id: Iad645cc93ddf67fa9cd96b2813f0a4a10f48b007
2021-10-07 00:44:33 +00:00
TreeHugger Robot
7d4dd26362
Merge "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" into sc-v2-dev
2021-10-06 22:45:23 +00:00
Weng Su
374ef0012a
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Revert "Add comment to AndroidManifest"" into rvc-dev am: ed4abe8483
-s ours am: 395ac6073c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958167
Change-Id: I0ab1dd93cd1fcbf872606ebf61477675f9d53d42
2021-10-06 19:20:31 +00:00
Weng Su
b885452051
[automerger skipped] Merge changes from topic "revert-15207347-add_permission_wifidialog-BFHPHFKILC" into rvc-dev am: 259742ebb2
-s ours am: d5ff68889c
-s ours
...
am skip reason: Merged-In If7ca069c842ed2bd1aed23f9d4041473c68a4dad with SHA-1 8800cdf527
is already in history. Merged-In was found from reverted change.
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15958166
Change-Id: Id84f09761990be63f9aee395c1e5d33bd55450d4
2021-10-06 19:20:30 +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
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
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
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
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