Commit Graph

97424 Commits

Author SHA1 Message Date
TreeHugger Robot
663e79cd94 Merge "Move android.settings.WIFI_SETTINGS action to Internet Settings" into sc-v2-dev am: 929e577e1b am: 7272c9d036
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16115944

Change-Id: Ic8f685b0fb1ba4c1c2d2570b4a2a52288d087d95
2021-10-28 01:08:28 +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
977ae95131 Merge "Fix usages of renamed Association class" 2021-10-27 21:18:22 +00:00
TreeHugger Robot
9f54b6f578 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: 3d353e63e2 am: e66bcb7884
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I9a039b1e7b13090c897fc8645822e709910d9026
2021-10-27 19:52:52 +00:00
TreeHugger Robot
0e97ec6ac8 Merge "Add location check for Wifi Scanning notify message" into sc-qpr1-dev am: 649135c11c am: c26248da5b am: babbff7b82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16093937

Change-Id: I5186454ec25051276f1b0583b7d203314143f59d
2021-10-27 19:52:38 +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
Jernej Virag
27850e9e9e Merge "Add setting to allow configuration of long press home gesture" 2021-10-27 09:59:31 +00:00
Sergey Nikolaienkov
0a319ece22 Fix usages of renamed Association class
Fix use of the Assocition class, which has been renamed AssociationInfo.

Bug: 194301022
Test: make SettingsRoboTests
Change-Id: I00e3c76c219c36bc8da0dadfb8727d1c217bba18
2021-10-27 09:05:34 +02:00
Arc Wang
1607221483 Merge "[Large screen] Shows SearchActivity at right pane" into sc-v2-dev am: 527667b375 am: 369884106e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16123443

Change-Id: I3d1b6de91c559af2aa73355c4a8ae430975b5463
2021-10-27 06:35:28 +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
80e8d2b2d0 [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: fb86b8e360 -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: Ica8084c4408c3b19b986be811e7b509a9aaefa8e
2021-10-27 02:30:22 +00:00
TreeHugger Robot
6b9767cb21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours am: 2f0041e4d6 -s ours am: 98c574d941 -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: I68ceae33180048e4930b49e2ccb979da2a5d2553
2021-10-27 02:30:16 +00:00
TreeHugger Robot
ac98462ff6 Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 am: 9106e9620f am: ceaf6bb673
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Iaeeca8bdcdc10efda537090243f34dc7caa670bf
2021-10-27 02:30:09 +00:00
Bill Yi
749baddd34 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours am: d781548aa6 -s ours am: 0094791de5 -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: Ia1953ad842e438f2d4becf25a132f993ca7e21e1
2021-10-27 02:30:08 +00:00
TreeHugger Robot
0da52b9f05 Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac am: 751b27ec19 am: 6c86ad64e1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: I7ab455ca8ae4e0edf5a1a4373eb943b36a624fa6
2021-10-27 02:29:59 +00:00
Bill Yi
147011f704 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours am: d26d1fcb48 -s ours am: fc23b06b55 -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: I1fd227611b7ede60bf9ee421af90f4894a75a4bc
2021-10-27 02:29:57 +00:00
Bill Yi
62d7d920fe [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours am: dc38186e69 -s ours am: 743886b300 -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: I09538ad08f1922a70c745658553e6ce347dcae7b
2021-10-27 02:29:48 +00:00
TreeHugger Robot
324e27e0f3 [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: 9b72863bfa -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: Ib95ced4ad8a587f18e886f22091f715ff92c2af2
2021-10-27 02:29:42 +00:00
Bill Yi
6b38d3ceb5 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: 8e49756934 -s ours am: 5e70ebba87 -s ours am: 9029e0204e -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: I039c0cee33b029a6e8b6895cfce2d387717dcf72
2021-10-27 02:29:35 +00:00
TreeHugger Robot
bacd8e41d2 [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: 4d9b03d408 -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: If2a2b3e53d2de92ff3937ecec4a0595337806752
2021-10-27 02:29:29 +00:00
TreeHugger Robot
5a6b8f9fa5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 778ae33620 -s ours am: 700fe7493b -s ours am: e19e9e08dc -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: Idbc3797ca6fa0ae614a142c483d4c9815393443e
2021-10-27 02:29:23 +00: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
211eb206ea Merge changes from topic "presubmit-am-f7e2d7690cb64ba69fa70ad2f36b25c8" into sc-qpr1-dev am: 5416ffde47 am: 9f6ae4ff97 am: 714f01e724
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124575

Change-Id: Id9661ed0f33b44bb821174e79df20f217c616bd1
2021-10-27 02:29:14 +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
Bill Yi
af4a23eff0 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 49389665fa am: 8c035094b8 -s ours am: 39e322145f -s ours am: 3424128189 -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: I13d1996958539241e3a1d624bbd4de9b49d71759
2021-10-27 02:29:10 +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
d7f91db63b Merge changes from topic "presubmit-am-a315f0d4e64641909b988a2be8c6ed66" into sc-qpr1-dev am: 7b45d4a7ac am: 034ff149d1 am: 888fb7ca36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16124588

Change-Id: Iab924b36e324163e486da4e56447d0dab7592c67
2021-10-27 02:29:00 +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
614907db0b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: a6de7ad6b8 am: f7af4b6fb0 -s ours am: 80ff342b4a -s ours am: 3334d7154c -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: I9c5c9e1cbeb3166e8fb56076e52ea643c784cfee
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
Bill Yi
86b26abe8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 141d4127f8 -s ours am: 9153fc1720 -s ours am: 574609641b -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: Ie463ff35f3600d827008769a0829467cdcd74b7e
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
TreeHugger Robot
93884174c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 336aa9899c -s ours am: 2361df8e37 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3da21618f39b99dc0c9e819a10ee0db0ac90939e
2021-10-27 02:28:44 +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
04cb5796dc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 0317f233ce -s ours am: a1a8716b23 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08ab1395b3046cf80753b33c2f91db4725d0755e
2021-10-27 02:28:36 +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