Jason Chiu
7ebe511104
Merge "Fix homepage cards show up problem after first launch" into rvc-dev am: 64dbdebfbf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897739
Change-Id: I1f30b105bcad02f13661b4d7a3652165a328fa13
2020-06-22 06:32:58 +00:00
Jason Chiu
64dbdebfbf
Merge "Fix homepage cards show up problem after first launch" into rvc-dev
2020-06-22 06:20:08 +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
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
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
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
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
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
TreeHugger Robot
27d10f6b63
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-06-20 23:42:20 +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
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
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
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
tim peng
9ff43d2fa3
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: Ida3ffa1110238057993e4ce345dce3cb3a8791d6
2020-06-20 10:25:04 +00:00
TreeHugger Robot
fb904dcfc1
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f
am: 74bb0edf99
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: I5bcce3784d3192fab5dcbec2f13b8cf6e22694e8
2020-06-20 10:12:26 +00:00
tim peng
02e311e537
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev
2020-06-20 10:12:03 +00:00
TreeHugger Robot
74bb0edf99
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: Ib482b91a0fc2b10d17150f212b2990ef753347a1
2020-06-20 09:57:03 +00:00
TreeHugger Robot
cab1329f0f
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev
2020-06-20 09:42:23 +00:00
Mill Chen
a99b8799ee
Make Telephony related PreferenceController un-sliceable
...
Since the structure of Telephony is changed, some of Telephony
related PreferenceController cannot be converted to slices
smoothly whether devices have mobile data or not. So we
decided to make them un-sliceable.
Bug: 155846002
Test: robotests, manual
1. Settings -> Settings search -> search for roaming
2. Check that roaming result has no toggle widget.
Change-Id: I7cba8f6a750d9780a59411942665f68dac61248c
2020-06-20 08:20:07 +00:00
Jason Chiu
ad9a214fff
Revert "Revert "Fix SecurityException while accessing Slice Uris""
...
This reverts commit 52ac47d9c8
.
Reason for revert: This CL is what we wanted to merge in RVC and has already got Code-Review +2, Owner-Approval, and DrNo-Review from other folks regardless of the accident.
Bug: 159195420
Change-Id: I6c646269cd3e13e015dcc06418e21db66372e680
2020-06-20 07:04:52 +00:00
Sunny Shao
b1756d3c50
[automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3
am: 9c6ab4cbd3
-s ours am: 2b11f44b90
-s ours am: 2a2639f193
-s ours am: b345896d55
-s ours am: c325b11117
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I950880fd50f253fa3ba4e24fc5a6fa56a1d49888
2020-06-20 05:35:15 +00:00
Sunny Shao
c325b11117
[automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3
am: 9c6ab4cbd3
-s ours am: 2b11f44b90
-s ours am: 2a2639f193
-s ours am: b345896d55
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I5deef4dc950efeb61a7e669c50b6cc37b7c7663c
2020-06-20 05:20:52 +00:00
Sunny Shao
b345896d55
[automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3
am: 9c6ab4cbd3
-s ours am: 2b11f44b90
-s ours am: 2a2639f193
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I1746a3d5fc38f521bf421d3a986f01f0c369ae7b
2020-06-20 05:08:14 +00:00
TreeHugger Robot
d9d63ebea6
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
am: 731e6d8e5f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: If2bece909901622ae43762ed24f1fc2853d278ba
2020-06-20 04:56:52 +00:00
Sunny Shao
73e27b249f
[automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb
-s ours am: af9bdcb4b5
-s ours am: 0f995b348c
-s ours am: a3c637e61b
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012
Change-Id: I27a04f69e54108cc16b472b096ba135221099950
2020-06-20 04:56:46 +00:00
Sunny Shao
2a2639f193
[automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3
am: 9c6ab4cbd3
-s ours am: 2b11f44b90
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I8dc9137ebe410ae8b4484c2fe489a9e7caa6ac59
2020-06-20 04:56:22 +00:00
Sunny Shao
2b11f44b90
[automerger skipped] Allows to launch only authenticator owned activities am: 818fef48f3
am: 9c6ab4cbd3
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 c8f92acbfb
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I4dd7f5ec61df98fd6ab2b7c7f9c76d29517fa42a
2020-06-20 04:44:00 +00:00
TreeHugger Robot
731e6d8e5f
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: I924680694eb54be8e4447e873aa195aa1f5c19c4
2020-06-20 04:43:49 +00:00
Sunny Shao
a3c637e61b
[automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb
-s ours am: af9bdcb4b5
-s ours am: 0f995b348c
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012
Change-Id: I3f5b3413b533a0474de2ce783f0d0740a6193841
2020-06-20 04:43:38 +00:00
Sunny Shao
0322929036
[automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9
-s ours am: cd328fdf28
-s ours am: 6b54959afe
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011
Change-Id: Id9f4b77e5d32c7862d3f0106b903360cab9c267a
2020-06-20 04:38:31 +00:00
TreeHugger Robot
5b849d8ac8
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev
2020-06-20 04:35:24 +00:00
Sunny Shao
9c6ab4cbd3
Allows to launch only authenticator owned activities am: 818fef48f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I931654780a07f5e8f52dc875854545771d99bcde
2020-06-20 04:32:24 +00:00
Sunny Shao
0f995b348c
[automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb
-s ours am: af9bdcb4b5
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012
Change-Id: Ie2bf08f396f0f56abe4e16cb911f2f0ad4ae711b
2020-06-20 04:32:10 +00:00
Sunny Shao
6b54959afe
[automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9
-s ours am: cd328fdf28
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011
Change-Id: I03039040a71397c3970badd1f39d546bf2b0cf42
2020-06-20 04:26:17 +00:00
Sunny Shao
af9bdcb4b5
[automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 addc1ea1b9
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802012
Change-Id: I744c94080ee322f7def92065538b39ef0b9213d4
2020-06-20 04:20:17 +00:00
Sunny Shao
cd328fdf28
[automerger skipped] Allows to launch only authenticator owned activities am: addc1ea1b9
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 d6d8f98844
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802011
Change-Id: I7ceb020038b0dcc729e7e5a406f5bd3479ee199c
2020-06-20 04:14:04 +00:00
Tim Peng
aeabfc3050
Add a separate line at the bottom of list area in output switcher
...
-Bottom divider is not showed when there are more than 7 devices exist in output switcher
-Check panel type in isDividerAllowedBelow()
-Hide the Slice bottom divider of Output switcher panel
-Show divider in panel layout only for output switcher panel
Bug: 159177275
Test: make -j42 RunSettingsRoboTests
Change-Id: I49396a0ee0543b494a2b3d714ec248ebab08e7ba
2020-06-20 03:44:43 +00:00
Akshay Thakker
b6c41df0f2
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
am: efbdb099fd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I9e0194640b23d84e3745212bd11b05341cb229c7
2020-06-20 03:22:36 +00:00
SongFerngWang
36796a1616
NetworkModePreference's list needs to allow values set from overlay.
...
Root cause: ag/10614943 removed the resources, so each of item
values is hard coded. This broke the overlay. This CL adds the
resource back so the overlay can work.
Bug: 159301925
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)
Change-Id: Id5ad2fdd0a87586136e4a26d2e44cf5278df5d9d
2020-06-20 11:21:18 +08:00
Akshay Thakker
efbdb099fd
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev am: 826459695f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11940588
Change-Id: I00d9c3ce6b3213de8dd04de38da7e60737c5d5fd
2020-06-20 03:10:27 +00:00
Jason Chiu
cfe50a6f60
Merge "Fix SecurityException while accessing Slice Uris" into rvc-dev am: 4b6e900e64
am: 5381571891
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897738
Change-Id: If672ca9668dd95afba4b8d859a7fad2389a45c13
2020-06-20 03:04:24 +00:00
Akshay Thakker
826459695f
Merge "Revert "Fix SecurityException while accessing Slice Uris"" into rvc-dev
2020-06-20 02:56:49 +00:00
Akshay Thakker
52ac47d9c8
Revert "Fix SecurityException while accessing Slice Uris"
...
This reverts commit 2e790e1859
.
Reason for revert: I accidentally +2'd this CL and it got merged. Sorry about that.
Change-Id: Ia1b2e0a264e16b368601bbb7a32148ec6c183e84
Bug: 159195420
Exempt-From-Owner-Approval: Just a revert
2020-06-20 02:56:09 +00:00