TreeHugger Robot
0ad035560f
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb am: 36c472970e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I34e631b2e35e1f311fb994e2fa80b3e1334562db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:45:23 +00:00
TreeHugger Robot
36c472970e
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev am: c45731efdb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18868163
Change-Id: I0250905df7b4fca60115d7a2fd837e122efbae44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-14 03:25:27 +00:00
TreeHugger Robot
c45731efdb
Merge "Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link" into tm-dev
2022-06-14 03:01:18 +00:00
Jason Chiu
27c6b55ac5
Remove FLAG_ACTIVITY_NEW_DOCUMENT when starting the deep link
...
If an app starts a Settings deep link with FLAG_ACTIVITY_NEW_DOCUMENT,
FLAG_ACIVITY_NEW_TASK is auto-appended by frameworks which causes a
SecurityException on the 2-pane design because starting a new task on
the right pane is not allowed.
Deep links in the 2-pane design will clear the top activities, which has
the same UX behavior of setting FLAG_ACTIVITY_NEW_DOCUMENT, so we remove
the flag in this case.
Fix: 233917580
Test: start account page via Assistant
Change-Id: Idcbeb96e441592d48686f18f3433864f2c14832a
2022-06-14 02:45:49 +00:00
Gil Cukierman
f5c8089089
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a am: ad8685a28e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I7a16c8e1c2a6e397cc14fe92a8d7cd02708d24ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 20:43:42 +00:00
Gil Cukierman
ad8685a28e
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165 am: fecd7c1c1a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I52b1fba91b6d25b5b02d94d9ae3fd9cf307cb37f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 20:16:03 +00:00
Gil Cukierman
fecd7c1c1a
Merge "Improve documentation of Enable2gPreferenceController" am: 778d851165
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2120772
Change-Id: I6ceccc283e4065fb94b2cf0c741905be40b31c1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 19:48:40 +00:00
Gil Cukierman
778d851165
Merge "Improve documentation of Enable2gPreferenceController"
2022-06-13 19:03:49 +00:00
TreeHugger Robot
4f31518c41
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: a0ebaf2b57
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: Iaf4096983d2b3cfb6e56cf336537be5b3f38fa1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:58:36 +00:00
TreeHugger Robot
751fb13dea
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd am: 62a0ea69e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: Ie4a6f197d16da945da70d76f0612c59306f1ad5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:49:38 +00:00
TreeHugger Robot
a0ebaf2b57
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I499228ea7bc6dd7971447040dac399dea5cb45d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:31:22 +00:00
TreeHugger Robot
62a0ea69e3
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev am: e058aae3cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18841360
Change-Id: I5a82edaa021f62b910267ff6f7da5fda43453031
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:29:37 +00:00
TreeHugger Robot
e058aae3cd
Merge "Add "smallestScreenSize" into homepage activities" into tm-dev
2022-06-13 18:11:22 +00:00
TreeHugger Robot
0602432a32
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 3ecbe9bc0b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I62f62d45d9c9b6a4fe74ec9c10060c16a0304984
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:03:33 +00:00
Bill Yi
b8112dac09
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: ae5b4b8105 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ie189203047c5d3106f06b155330a8ec3a6e2046f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:03:21 +00:00
Bill Yi
30580dfed4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: b0b7c615bf -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I26a6412f180f6ee94e1f48e3b79459bba6c91af6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 18:03:01 +00:00
TreeHugger Robot
3ecbe9bc0b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ib80b1d4f968a8275bc8c92aede6c84f8aa7ab523
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:34 +00:00
Bill Yi
ae5b4b8105
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ibe20bf626167e701d69bb9b57eb6fa1a42fb1270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:19 +00:00
Bill Yi
b0b7c615bf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Ibfd46c1623530d3384f10c41bd4a19f4817a75e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:32:04 +00:00
TreeHugger Robot
d956cbe32a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours am: 7723c37234 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I5d6f2d6b1b3e99fb080c438a0cb5c83be1c4a47e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:33 +00:00
Bill Yi
947e4e0ce8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours am: 85d2a6c7b4 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I5bd6f198943162cd76025f9d80e9fbb6f7699b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:17 +00:00
Bill Yi
14f91f0604
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours am: d9fbc3319c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I09519681ced6997db295739bb967083ce56d44cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:20:02 +00:00
Bill Yi
c921642dde
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: e8c0397e8a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I3141c81605ef7a72c49e33e64fdea27858a171bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:17:23 +00:00
Automerger Merge Worker
a20f785e3d
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours" into tm-d1-dev-plus-aosp
2022-06-13 17:16:26 +00:00
Bill Yi
798cf379cc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 7b831dc400 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858730
Change-Id: Ie09c58f20159e4c92bcab0971df8a52d3fe84413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:23 +00:00
Bill Yi
46f045f411
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours am: fbf554e66e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I8cbaba18c3e0ecf45c81008d33726d239ee81ba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:16 +00:00
TreeHugger Robot
7723c37234
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours am: e5a507e23c -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I73937e9aef737e9d10eb725abe15efbe552c93f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:15:12 +00:00
Bill Yi
85d2a6c7b4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours am: 04d01b2661 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: Ic36f1744655068cce7bf729f26b8cba914bf2639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:14:58 +00:00
Bill Yi
d9fbc3319c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours am: 362f3f6b6a -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: I054b90b7fde831108c85e053e8641ec6b3612561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:14:41 +00:00
TreeHugger Robot
e5a507e23c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 8122edc9ac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I441cc35d147566377eb06f328905a44ea6649954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:05:07 +00:00
Bill Yi
04d01b2661
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 154b913f4b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847791
Change-Id: I76566346fa6990130c77e736031ecbf4e40b2c57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:55 +00:00
Bill Yi
362f3f6b6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f5cfec7f75 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18847790
Change-Id: Ib0ff724718fbe1ab699152f1a6744015645d7051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 17:04:36 +00:00
Bill Yi
e8c0397e8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I91096d91de1b1556306446a40455d093faec87b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:55:43 +00:00
Bill Yi
fbf554e66e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e006e9823d -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18858726
Change-Id: I94c794e5c7065d881be7d7888f4223fd5fdf0491
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-13 16:54:19 +00:00
TreeHugger Robot
8122edc9ac
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev
2022-06-13 16:40:03 +00:00
Jason Chiu
ae1c17bd0f
Add "smallestScreenSize" into homepage activities
...
The Settings home activity was initially launched in full-screen size,
and then resized in order to be displayed with another placeholder
activity size-by-side.
After ag/18668447, the smallest screen width dp configuration of the
activity was changed to half of the screen size (vs. the fullscreen
size) while embedding.
Therefore, the system updates the configuration changes using
CONFIG_SMALLEST_SCREEN_SIZE, which the Settings home activities didn't
declared. This makes Settings show the full-screen home layout in
dual-pane mode.
Fix: 235449822
Test: visual, robotest
Change-Id: I801ff5fb20b2a42c94223a6edd4af08b67e7f4e9
2022-06-13 06:44:22 +00:00
Bill Yi
7b831dc400
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie29078a0f8a50a373604db8dbd4fd2272426add7
2022-06-11 13:26:42 -07:00
Bill Yi
e006e9823d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I81a6f90e03513ab441888db3316d4b612b3a72ca
2022-06-11 13:17:41 -07:00
Bill Yi
154b913f4b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9332ed519d4fb2a15ad3ba9fcfea68d9ab657ff8
2022-06-10 21:47:08 -07:00
Bill Yi
f5cfec7f75
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6e5a4af5147a8e1cdebd5049ad5941ce51442553
2022-06-10 21:43:26 -07:00
TreeHugger Robot
4ab4d68f60
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 45580a02a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Id674f125687fc60af9359a95b2852cbbc33d4a2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:32:24 +00:00
TreeHugger Robot
4091170456
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72 am: 063e34e53c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Iaa080b1ba55ad24a174edb5907a5b3fe7dd78584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 21:31:32 +00:00
TreeHugger Robot
063e34e53c
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: I48f417627a248636a9aecf0b3a25d9f0ce45eaa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:39:13 +00:00
TreeHugger Robot
45580a02a4
Merge "Update fingerprint removal dialog strings" into tm-dev am: 1c45e9ad72
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18736456
Change-Id: Ic7f0628f3ef18ee92733fee88e21242a1424c62a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 20:37:28 +00:00
TreeHugger Robot
1c45e9ad72
Merge "Update fingerprint removal dialog strings" into tm-dev
2022-06-10 20:09:03 +00:00
Automerger Merge Worker
4b1b519a92
Merge "Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9" into tm-d1-dev-plus-aosp
2022-06-10 19:58:41 +00:00
TreeHugger Robot
863843c7b0
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: 3b2fe3e89e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I80e67d73410150349c3501001c3b8d2252dfe4be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:38 +00:00
TreeHugger Robot
661c13a194
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296 am: f7b4e4adc9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: If4f9c33086ac7d1041e073a63214c33390b575ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 19:58:33 +00:00
TreeHugger Robot
3b2fe3e89e
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I11486349b04ce9af7004e6761e6d419e4892baf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:56:02 +00:00
TreeHugger Robot
f7b4e4adc9
Merge "[VolumePanel] Fix the Hearable control slice uri parameter" into tm-dev am: fc45c25296
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18638446
Change-Id: I6c28e8ad8fc8e97cf1f6c5c290562f7b6dda4821
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-06-10 18:54:24 +00:00