Arc Wang
c1b5f7883c
Merge "[Large screen] Fix searched Subsettings back navigation bug" into sc-v2-dev
2021-11-01 01:27:37 +00:00
Arc Wang
a63e9c625d
[Large screen] Make slice deep linking to Settings show in 2-pane
...
- add a standalone home activity for slice deep link.
- add EXTRA_IS_FROM_SLICE to control the slice deep link flow.
- Intent#parseUri fails if the intent data schema is set.
Add EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA to relay the
data schema.
Bug: 201397123
Test: manual, robotest
1. Say 'Enable NFC'/'Enable Bluetooth'to Google assistant.
2. Click the the NFC/BT Slice.
Change-Id: Ia3216956328c32b2109cb2d70ad1105327661f26
2021-10-31 20:12:27 +08:00
Bill Yi
09c3e9d968
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Idaaac25178500ad4fe455421d80cda021d31a7bd
2021-10-31 02:35:13 +00:00
Bill Yi
2225c633ba
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I2cf4ffb1e23f9c01b186dd8c65988da06d008c5b
2021-10-31 02:31:38 +00:00
Bill Yi
c0eaec8037
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271
Change-Id: I424e234e0577d940e6da8a625b4797a292a759c6
2021-10-31 02:28:09 +00:00
Bill Yi
eb45210f6a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I78c311e7d058b10e7b00112ceda5e3ed03381370
2021-10-31 02:28:03 +00:00
Bill Yi
6347c41779
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9f6487847b7169e47594ce435ca5eb59b6ecfde3
2021-10-31 02:20:16 +00:00
Bill Yi
3931bcc9cb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I698355eed5bae2d3d247b65f0b41caefbd821d3a
2021-10-31 02:18:46 +00:00
Bill Yi
afcfca4582
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Iaf86f2c81249458d953ebae715c53b83f8570dbe
2021-10-31 02:17:25 +00:00
Bill Yi
7e2d3bd5ff
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I78ebb7336ae52609b9372f4659b6a8cf4483e942
2021-10-31 02:17:25 +00:00
Bill Yi
88711716d8
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Id2247aaee46863a606dad86c2cc62ca2bd4c6592
2021-10-31 02:17:24 +00:00
Bill Yi
4f200606a9
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I15b4087acf755a12fda81f4de18caf0f532165fa
2021-10-31 02:17:24 +00:00
Bill Yi
6ac425087d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7cf4620b089df8bac86ad67c4efffe0ae3f5ad95
2021-10-31 02:17:16 +00:00
TreeHugger Robot
c5230ce87e
Merge "Update animation for fingerprint edu page" into sc-v2-dev am: 4b40fa5016
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16091075
Change-Id: I177a51b2c06b2cf4c8a385016b3b091a73a1c357
2021-10-29 18:42:32 +00:00
TreeHugger Robot
4b40fa5016
Merge "Update animation for fingerprint edu page" into sc-v2-dev
2021-10-29 18:24:18 +00:00
Arc Wang
54998b7bfe
[Large screen] Fix searched Subsettings back navigation bug
...
Settings app registers SubSettings SplitPairRule with clearTop
true, it will finish Settings app if users click back button on
a SubSettings page.
This change registers SubSettings SplitPairRule with clearTop
true when users click a SubSettings item in Settings home menu.
And this change registers SubSettings SplitPairRule with clearTop
false when users click a SubSettings item in search result.
Bug: 204501750
Test: manual
1. Settings -> Search settings -> search a SubSettings item
(e.g., Battery)
2. Click the searched item.
3. Click back button.
Change-Id: I6e1862de528e971137ae7087de608bbdd79096b2
2021-10-29 17:45:40 +08:00
Tsung-Mao Fang
04c7515603
Merge "Register the rule for injected apps" into sc-v2-dev am: 29063a7981
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138631
Change-Id: I8665e1e055bf237b7d1a1f261b8eb7a3a9cf19cf
2021-10-29 09:45:24 +00:00
Tsung-Mao Fang
29063a7981
Merge "Register the rule for injected apps" into sc-v2-dev
2021-10-29 09:31:11 +00:00
Weng Su
1fe930bd06
[automerger skipped] Keep compatibility for old WiFi shortcut am: e739b3c99b
-s ours
...
am skip reason: Merged-In Idb08b9650e7c5efce4ab40eb949ccab0e5949333 with SHA-1 8cf3250517
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16130954
Change-Id: Ie03d0dd37944c85fe919cf0cb3e85e6828a010d4
2021-10-29 07:24:44 +00:00
Tim Peng
07b3675717
Phone fails to switch channel mode from stereo to mono
...
-Set codec to SBC when HD audio is off
Bug: 194349060
Test: make -j50 RunSettingsRoboTests
Change-Id: Iae4aa3f1d77350f5b4d91e7a687e048091c1daea
2021-10-29 03:28:14 +00:00
Tsung-Mao Fang
bb24a2f63b
Register the rule for injected apps
...
We should align behavior between injected apps and in-app entries.
Test: Open the Google/DW page and click back key. Then, app is closed
directly.
Fix: 204406425
Change-Id: I57831c4df78b502b3998b3f7384df2900dbfe56f
2021-10-28 18:27:12 +08:00
Weng Su
e739b3c99b
Keep compatibility for old WiFi shortcut
...
- WifiSettings2Activity has been replaced by WifiSettingsActivity
Test: Create a shortcut to WifiSettings in R, update to S and test it
Bug: 199033769
Change-Id: I735106578cd11a15ffef1fd4d8e9703ae781db6c
Merged-In: Idb08b9650e7c5efce4ab40eb949ccab0e5949333
2021-10-28 07:27:06 +00:00
TreeHugger Robot
7272c9d036
Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944
Change-Id: Icbecef23b576b84f0d1a30fe8c294e81a1f12a45
2021-10-28 00:49:08 +00:00
TreeHugger Robot
929e577e1b
Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev
2021-10-28 00:35:01 +00:00
TreeHugger Robot
e66bcb7884
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
am: 3d353e63e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I941bc47a6914c606b26c6f68f383791f6635c34b
2021-10-27 19:31:46 +00:00
TreeHugger Robot
babbff7b82
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
am: c26248da5b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: Ib6922d82c5c6d7a059b8c43beefb12d554c3f3c0
2021-10-27 19:28:38 +00:00
TreeHugger Robot
c26248da5b
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I60a0411bb2b21ff8dc9fac37692ddf482ce2e6ab
2021-10-27 18:52:28 +00:00
TreeHugger Robot
3d353e63e2
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937
Change-Id: I6057ce7a0de2ff19f662564a538a891d9c37c553
2021-10-27 18:52:19 +00:00
TreeHugger Robot
649135c11c
Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev
2021-10-27 18:24:26 +00:00
Arc Wang
369884106e
Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev am: 527667b375
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16123443
Change-Id: Ic97c1ecba5d4502f97ab0972cd0042f8dfaf9e58
2021-10-27 06:16:16 +00:00
Arc Wang
527667b375
Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev
2021-10-27 05:56:04 +00:00
Arc Wang
3ff6f14f43
[Large screen] Shows SearchActivity at right pane
...
This change removes alwaysExpand ActivityRule registration
for SearchActivity.
Bug: 204260066
Test: manual
Settings -> Click 'Search settings'
Change-Id: I4625756bf89568fcdf690e5930b76c3e2ece5043
2021-10-27 11:45:59 +08:00
TreeHugger Robot
fb86b8e360
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97
-s ours am: 48b79c4f7d
-s ours am: 0d439097e7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I48277524f64727519a9401514ee71a48ec1011de
2021-10-27 02:29:17 +00:00
TreeHugger Robot
98c574d941
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620
-s ours am: 2f0041e4d6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572
Change-Id: I5dc416b59fbe4f40a6ddf8cd9157e6b06b0670ff
2021-10-27 02:29:13 +00:00
TreeHugger Robot
ceaf6bb673
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47
am: 9106e9620f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I7b567381812a904c13644a182997d428e268bb9e
2021-10-27 02:29:07 +00:00
Bill Yi
0094791de5
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
am: 8c035094b8
-s ours am: d781548aa6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I40f6723f7a8cebdaa5d55b53d39456b2b10d48a1
2021-10-27 02:29:04 +00:00
TreeHugger Robot
6c86ad64e1
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac
am: 751b27ec19
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Iea1b629535115e9af10be3697023f8c0233a40e1
2021-10-27 02:28:58 +00:00
Bill Yi
fc23b06b55
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
am: f7af4b6fb0
-s ours am: d26d1fcb48
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Id7a9f33545f770d6e5648b69d76e12276c190c13
2021-10-27 02:28:56 +00:00
Bill Yi
743886b300
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8
-s ours am: dc38186e69
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705
Change-Id: I91b32b7c5651e54c0229614f4074e8e4331e6c9d
2021-10-27 02:28:50 +00:00
TreeHugger Robot
9b72863bfa
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97
-s ours am: 06cca879db
-s ours am: d0240c3795
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I17759d8c7828756ee47e14a7b7b18346b96c6a2f
2021-10-27 02:28:46 +00:00
Bill Yi
9029e0204e
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
am: 8e49756934
-s ours am: 5e70ebba87
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Ie05ad586b56df2f883f8b1d22d05440b7d41e199
2021-10-27 02:28:41 +00:00
TreeHugger Robot
4d9b03d408
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97
-s ours am: 48b79c4f7d
-s ours am: 9b325cd54f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Id12eca443f44ac31b1a2017c19122883d1fe530a
2021-10-27 02:18:44 +00:00
TreeHugger Robot
e19e9e08dc
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620
-s ours am: 700fe7493b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572
Change-Id: Id66cc4f8b535680a76e586bf091fd5e309c84dcf
2021-10-27 02:18:39 +00:00
TreeHugger Robot
714f01e724
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47
am: 9f6ae4ff97
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Ie6301ded1ea2c787f66a72a5f876c83bee990519
2021-10-27 02:18:30 +00:00
Bill Yi
3424128189
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
am: 8c035094b8
-s ours am: 39e322145f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: Ifdd66f33b7e50367a83b0bd84e20ac2cd482e014
2021-10-27 02:18:28 +00:00
TreeHugger Robot
888fb7ca36
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac
am: 034ff149d1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I4708e2611d93fafd79a6d205b96b6a8fa637afd6
2021-10-27 02:18:05 +00:00
Bill Yi
3334d7154c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
am: f7af4b6fb0
-s ours am: 80ff342b4a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: I7e57f11e0000be29218170ce3932e558796b3fe5
2021-10-27 02:18:03 +00:00
Bill Yi
574609641b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8
-s ours am: 9153fc1720
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124705
Change-Id: Ibff4043394fcf17bfb35e0e67752b5dfe859811e
2021-10-27 02:17:49 +00:00
TreeHugger Robot
0d439097e7
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97
-s ours am: 48b79c4f7d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I0056b7b04e308d6bdeb2533c97fad53d21697f31
2021-10-27 02:11:16 +00:00
TreeHugger Robot
2f0041e4d6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124572
Change-Id: I47a21aefaf98b243da8b0e5e582b446e06cf1d38
2021-10-27 02:11:11 +00:00