Jason Chiu
594eb43159
Support slice deep links highlighting menu entries
...
- Add an interface to get highlight menu key resource in Sliceable
- Force implementing the new interface in TogglePreferenceController and
CustomSliceable at syntax level
- Update the slice index db schema
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: I0b5068bccd04f1590023de7f3385bc0a4c6fa47b
2021-11-01 14:27:34 +08:00
TreeHugger Robot
cb81759d15
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f
-s ours am: 803a4a84a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Ibc2d803fd864d33e0e0a0c9c8a7d7a5e1dbf2d46
2021-11-01 06:16:50 +00:00
TreeHugger Robot
fe2a7627dc
[automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I68302835fcfada607ef1cf80f4c679c65699d0ee
2021-11-01 06:16:34 +00:00
TreeHugger Robot
5a64962814
Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: I3175b04e7b6c59b7a675512be558b4870d32ab68
2021-11-01 06:16:33 +00:00
Bill Yi
de92464a0c
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
am: 88711716d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Id4a6047e56b639be353cb14b19adfd63bf40f1f5
2021-11-01 06:16:32 +00:00
TreeHugger Robot
0f8deae0af
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155721
Change-Id: Ide5328620945f0989b8aacf67e250e73a1acfdb5
2021-11-01 06:15:54 +00:00
TreeHugger Robot
c2041123e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155722
Change-Id: Ib2b5ae5a0ee45eac93c237309dc30d40ee4ae6b4
2021-11-01 06:10:53 +00:00
Bill Yi
c7d8d778f6
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a
am: c0eaec8037
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16156271
Change-Id: I0b1933d93a4d2387bfc4ac4707acccaf60f28727
2021-11-01 06:09:26 +00:00
TreeHugger Robot
803a4a84a8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720
Change-Id: Ic300b54ea954c625fcd08a35b286ecf9d043aa50
2021-11-01 06:08:42 +00:00
TreeHugger Robot
b450a4518e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-01 05:50:09 +00:00
TreeHugger Robot
1cc1696a72
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2021-11-01 05:50:07 +00:00
TreeHugger Robot
33b0ddcb9f
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-11-01 05:46:15 +00:00
TreeHugger Robot
15e9a44b45
Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev
2021-11-01 05:46:15 +00:00
TreeHugger Robot
49400133f1
Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d
Import translations. DO NOT MERGE ANYWHERE
2021-11-01 05:46:15 +00:00
TreeHugger Robot
07709bfd9e
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-01 05:45:59 +00:00
TreeHugger Robot
b41f6a01a3
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-11-01 05:45:56 +00:00
TreeHugger Robot
17df1ff01f
Merge "Fix alignment issue between Vision Settings and Font/Display" into sc-v2-dev
2021-11-01 02:41:30 +00:00
Jason Chiu
e1ec69fa1a
Merge "[Large screen] Make slice deep linking to Settings show in 2-pane" into sc-v2-dev
2021-11-01 02:10:21 +00:00
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
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
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
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
29063a7981
Merge "Register the rule for injected apps" into sc-v2-dev
2021-10-29 09:31:11 +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
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
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
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
9b325cd54f
[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: I3d7ff4a2ccb00a5e9f8a8488051f4d464efc986a
2021-10-27 02:11:09 +00:00
TreeHugger Robot
700fe7493b
[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: I2575e86ccc14baf32e0424a3e936d0a1b00cad4d
2021-10-27 02:11:04 +00:00
TreeHugger Robot
9f6ae4ff97
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575
Change-Id: I6ee98b123204aa1c83b18409bdb12e1e46f568f4
2021-10-27 02:11:01 +00:00
Bill Yi
39e322145f
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
am: 8c035094b8
-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: Id35f11c2ecea70a0b98a0479a62e5f10d361f915
2021-10-27 02:11:00 +00:00
TreeHugger Robot
034ff149d1
Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588
Change-Id: Ia522af0c4e271be71c76a52b4b8497311950fcc7
2021-10-27 02:10:52 +00:00
Bill Yi
80ff342b4a
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8
am: f7af4b6fb0
-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: I548359fef73f55692e18df0a511c932ae0b7e9b1
2021-10-27 02:10:51 +00:00
TreeHugger Robot
48b79c4f7d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 9bd68e3a97
-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: If077afe3d023be33c98959da914fff0e3a59b0e5
2021-10-27 02:10:44 +00:00
Bill Yi
9153fc1720
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8
-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: Ifd794d4c6533dd6ed2b188d115fd044a512c8068
2021-10-27 02:10:44 +00:00
TreeHugger Robot
778ae33620
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev
2021-10-27 01:50:53 +00:00
TreeHugger Robot
9bd68e3a97
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-10-27 01:50:49 +00:00
TreeHugger Robot
5416ffde47
Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa
Import translations. DO NOT MERGE ANYWHERE
2021-10-27 01:50:49 +00:00