Alex Li
91650720d4
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
am: 0567bb7834
am: 22f3f4f157
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I98eca56f9147ffe00e274ea1cf9b5a24bd2d80bd
2020-06-22 04:36:33 +00:00
Alex Li
21caf00d4a
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
am: 49df46ef59
am: 953e87a578
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: Ib8df2bd4f85743d0f8194c56a60f2490fe12732c
2020-06-22 04:36:13 +00:00
Alex Li
8dc66ef820
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
am: 0567bb7834
am: d5f6a66682
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I83c51cebcfe071939b1da0e01a1eba871b5723f6
2020-06-22 04:36:07 +00:00
Alex Li
22f3f4f157
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
am: 0567bb7834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I4f3823469f74ef6e13104695b8dcc59405de9ddf
2020-06-22 04:25:08 +00:00
Alex Li
953e87a578
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
am: 49df46ef59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I81caf8c8e01ebbf956ed81d6034f3cc594a78279
2020-06-22 04:25:06 +00:00
Alex Li
d5f6a66682
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
am: 0567bb7834
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I905797e8477a4d0ea86bb57b8c02bfac95cfb001
2020-06-22 04:24:46 +00:00
TreeHugger Robot
d98079a0e8
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 11018b11c1
am: 46383f190a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Ib1f2f88fd8f4f347a231ea7a8ba34ec93498c281
2020-06-22 04:11:07 +00:00
Automerger Merge Worker
c19a4eb78a
Merge "Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
am: 009de48ded" into rvc-qpr-dev-plus-aosp
2020-06-22 04:11:04 +00:00
TreeHugger Robot
d25b321f3a
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
am: 009de48ded
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I4668510c6c1720f111f39cd510f655cd9d37a53d
2020-06-22 04:11:00 +00:00
TreeHugger Robot
f339f5a25d
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
am: c758384eec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Id2c6a16fe7318f2627c309b95609eacdc453cfdb
2020-06-22 04:10:58 +00:00
Alex Li
49df46ef59
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: Id0716197d222a2382c3992d05ffbfb1426b929a1
2020-06-22 04:10:53 +00:00
Alex Li
0567bb7834
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I1606b0ae03f46750d0067a9c9abc898dbbfe0c4b
2020-06-22 04:10:37 +00:00
Alex Li
3f8d40bd95
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev
2020-06-22 03:59:30 +00:00
TreeHugger Robot
46383f190a
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 11018b11c1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Ie03b467b5a3d7df4fe1e76e0deba5739ded90cf7
2020-06-22 03:58:55 +00:00
TreeHugger Robot
c758384eec
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I26f2941082ad0b1a6a49a488fa8bc5f346a05d09
2020-06-22 03:55:43 +00:00
TreeHugger Robot
009de48ded
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
am: 2b697fac94
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I77d3bf02a641854f2388fd40704bc590437842e4
2020-06-22 03:54:55 +00:00
TreeHugger Robot
11018b11c1
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I9b287ae61c3c1d1bad877859bb8b1ee80a9421fd
2020-06-22 03:44:29 +00:00
TreeHugger Robot
2b697fac94
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I97fcaa6787a5f9a205e8027d3bfe9d52fa358b6a
2020-06-22 03:44:17 +00:00
TreeHugger Robot
fbabf8f251
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev
2020-06-22 03:27:01 +00:00
Jason Chiu
2e0758f7ae
Decrease memory usage for sleep idle test
...
Postpone setTheme to decrease memory usage of Settings for the test
android.platform.test.scenario.sleep.Idle
Bug: 156631776
Test: forrest test
Change-Id: I4178eae0832e15c9d6da4a0f1f2898f5c797d388
2020-06-22 02:43:10 +00:00
alexylli
40b79387cc
[Settings] Avoids disabled component when page start from setup wizard.
...
Fixs when disable component during system busy, the framework have high possibility to force closing activities on the same task.
test
1. setup a pin code and go through to the anything else page. click "control info on lock screen".
>> The SetupRedactionInterstitial not been disabled.
>> The lock screen can be setup repeatedly.
2. into home screen. using adb command to start SetupRedactionInterstitial.
>> the screen not shown.
3. using adb command to start RedactionInterstitial and click "done".
>> the activity existed normally.
Bug: 158961310
Test: Manual
Change-Id: I09fe95db591d3d3603b2c13623a0873bfab3bac0
2020-06-22 09:59:28 +08:00
TreeHugger Robot
0f3bfc0bf0
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours am: d76af20a41
-s ours am: e755b8ae39
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: I6abdca87018149ee430e4360c37c37da7f38b6ed
2020-06-21 00:20:34 +00:00
TreeHugger Robot
dc6854d87c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours am: 85e3e2d0f9
-s ours am: 0c94e12c75
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: I5c2024af374032a9f085babd870e3105bef06352
2020-06-21 00:15:58 +00:00
TreeHugger Robot
755765f501
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours am: d76af20a41
-s ours am: b5968c5bcc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: If2179bae1f74d27067aa0b1cb2bd0ef6c479985c
2020-06-21 00:15:52 +00:00
TreeHugger Robot
0c94e12c75
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours am: 85e3e2d0f9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: I45baa1a1918014ed96f0809c921db1ad8ee5b30d
2020-06-21 00:10:46 +00:00
TreeHugger Robot
e755b8ae39
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours am: d76af20a41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: Ia7c975d06d993f692f692fc44d2bb2bdf95e43e4
2020-06-21 00:05:48 +00:00
TreeHugger Robot
b5968c5bcc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours am: d76af20a41
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: I1d5f8c27f7c6c18d430c02655e118b6ea2785eb8
2020-06-21 00:05:26 +00:00
TreeHugger Robot
85e3e2d0f9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: I60cac5e4038779e6924467878536a74466228518
2020-06-20 23:53:47 +00:00
TreeHugger Robot
d76af20a41
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944942
Change-Id: I5088997a93166a56376bcbb40fe3026a9648427d
2020-06-20 23:53:28 +00:00
Bill Yi
d726194acf
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours am: cbd2b6aa2a
-s ours am: bc7b2016a8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: I765792b1558f2ad7168e67523833580429bc5ede
2020-06-20 23:44:13 +00:00
Bill Yi
b1202b22aa
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours am: 16b45b30aa
-s ours am: 709a4fb31d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: I84bcf361bcc5c1405966accfda7284b28d5583d9
2020-06-20 23:44:00 +00:00
Bill Yi
8ebf4ac8f7
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours am: cbd2b6aa2a
-s ours am: 3c015b8044
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: Ib66cfd296f5d39f7ca257305d8090eff5f09fdf5
2020-06-20 23:43:54 +00:00
TreeHugger Robot
27d10f6b63
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-20 23:42:20 +00:00
Bill Yi
709a4fb31d
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours am: 16b45b30aa
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: Id17818c26c3da65f46b6aca7447d2219d906086e
2020-06-20 23:40:19 +00:00
Bill Yi
bc7b2016a8
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours am: cbd2b6aa2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: Ie726270ffdaf1afc3dc4f0f5e21f659378b98b57
2020-06-20 23:34:26 +00:00
Bill Yi
3c015b8044
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours am: cbd2b6aa2a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: I11cfdab42baf34f427d952eec081fbe323a531c8
2020-06-20 23:34:04 +00:00
Bill Yi
16b45b30aa
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: I41d3214666bb8c3a1ede612df9b269021d54e267
2020-06-20 23:22:27 +00:00
Bill Yi
cbd2b6aa2a
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11944939
Change-Id: Iedb69ba596e6095c9359455b585b2411fb8923b4
2020-06-20 23:22:06 +00:00
Bill Yi
52003358fe
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I16a7879b6bdf4790c9f78fafd62e754dcc0feb20
2020-06-20 22:43:20 +00:00
Bill Yi
82322a6754
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: Ifd53c8670485825782f0c44452bfd33e56b721b2
2020-06-20 22:06:36 +00:00
Stanley Wang
f7e6c1e4c5
Add log to capture the hardware status.
...
Sometimes Settings Search show the items that are not supported by
the hardware. e.g. FaceLock.
Add log to check the HW status when the problem occurred.
Bug: 156667203
Test: watch the log output.
Change-Id: Ie6a89f338aac6f7bdefc69fc84cfa5bf848ed015
2020-06-20 20:02:35 +08:00
tim peng
253ee8c68a
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: 9ff43d2fa3
am: 34a29d1bb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I649c9f5a90d9ac2615e715b7a40e907faf40d495
2020-06-20 11:02:27 +00:00
tim peng
5375d1e3b1
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: fc3f730d98
am: 23917b3826
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I0aa9b9a205445dd798245fc7b06a49c818287c4c
2020-06-20 10:58:37 +00:00
tim peng
826cd4f88f
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: 9ff43d2fa3
am: 593d62d992
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ib28d00846fd3f92015248148e6ce83bd44e82c95
2020-06-20 10:58:26 +00:00
tim peng
34a29d1bb5
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: 9ff43d2fa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I5424b492896803eb5e20ae2fcc636df7e7b5c6e5
2020-06-20 10:48:45 +00:00
tim peng
23917b3826
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: fc3f730d98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I73bbbb19f344da5e35a50190ef175e059f4e47dc
2020-06-20 10:48:45 +00:00
tim peng
593d62d992
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
am: 9ff43d2fa3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Ibcab4ea712bcf00fa380c2f449713e6304e766b2
2020-06-20 10:48:25 +00:00
Jason Chiu
3ee13ce4d6
Fix homepage cards show up problem after first launch
...
ContextualCardLoader was waiting for eligible card checkers with a 300
ms timeout one by one in a loop. So if more than four checkers expire,
the total waiting time will exceed the 1 sec homepage content loading
timeout, which causes no card shows up.
The solution is to leverage all the checkers' timeout starting time,
and increase the timeout for all checkers. So that ContextualCardLoader
just needs to wait for all checkers for at most 400 ms and then can get
the results.
Bug: 159236069
Test: robotest
Change-Id: I601ac4151bf8be68b30eaabdb45a4e1ace95653f
2020-06-20 18:36:38 +08:00
TreeHugger Robot
98a03ef382
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f
am: 74bb0edf99
am: fb904dcfc1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: Ib7183b5ea5b46e6f04ea8e037bf414982bef9357
2020-06-20 10:25:23 +00:00
tim peng
fc3f730d98
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Iadc1abf749b34eb94956dd9e21a910d56069d4d4
2020-06-20 10:25:18 +00:00