Sarah Chin
b947a7f7bf
Merge "Remove NR NSA from voice network type" into rvc-dev am: 1d6acb4f8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11959142
Change-Id: Ia38afb3e20e41135bc5bbd700a9f5500e3df2fd1
2020-06-23 07:01:48 +00:00
Sarah Chin
1d6acb4f8c
Merge "Remove NR NSA from voice network type" into rvc-dev
2020-06-23 06:52:12 +00:00
Sarah Chin
4b5e95daa1
Remove NR NSA from voice network type
...
Since voice calls on NR NSA use LTE, the voice network type
should not be updated to be NR NSA.
Test: manual testing
Bug: 159382203
Change-Id: I77d92fab0020da356ae43293016237be7494c1e2
2020-06-23 06:51:44 +00:00
David Su
9a23c980a5
Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d
am: 46a4938667
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937
Change-Id: Id0dfcd8a9eb4db30e977c2ab555599b2186cc595
2020-06-23 03:37:16 +00:00
David Su
46a4938667
Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev am: 15d4970c9d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11923937
Change-Id: Ide91f1b4544712f71eb8c1bac843b80bdbdcee49
2020-06-23 03:20:16 +00:00
David Su
15d4970c9d
Merge "Stop expecting WifiConfig extra from CONFIGURED_NETWORKS_CHANGED_ACTION broadcast" into rvc-dev
2020-06-23 03:06:39 +00:00
tim peng
e84006b0de
Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38
am: 170179bbe3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339
Change-Id: I26eb6d76482746eac13e64253731fa7e14215568
2020-06-23 02:55:14 +00:00
tim peng
170179bbe3
Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev am: 6e10387a38
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931339
Change-Id: I66017db7ec0e11c06d62628dbb312225b203059d
2020-06-23 02:37:06 +00:00
tim peng
6e10387a38
Merge "In output switcher, the name of the device disappears for a brief period, which makes it seem like the devices are swapping positions." into rvc-dev
2020-06-23 02:22:46 +00:00
Jakub Pawlowski
ecee52a20f
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-s ours am: 07d3a4de3d
-s ours am: b5355ae3be
-s ours am: c9310c3156
-s ours am: 0d8a2e0cfe
-s ours
...
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: If481d3e35a48ec83d05dfc554c5994df0e77a7f3
2020-06-22 20:20:27 +00:00
Jakub Pawlowski
0d8a2e0cfe
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-s ours am: 07d3a4de3d
-s ours am: b5355ae3be
-s ours am: c9310c3156
-s ours
...
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: I9f2aec3f6305f65843a84718decd5dfc7fcc6fe7
2020-06-22 20:06:14 +00:00
Jakub Pawlowski
c9310c3156
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-s ours am: 07d3a4de3d
-s ours am: b5355ae3be
-s ours
...
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: I205f4af442741edeb0295bd713bef68f5ddccaa5
2020-06-22 19:54:45 +00:00
Jakub Pawlowski
b5355ae3be
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-s ours am: 07d3a4de3d
-s ours
...
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: I99e7d95f10f5f3d76ef18ab198464fe0b8289a8c
2020-06-22 19:38:34 +00:00
Jakub Pawlowski
07d3a4de3d
[automerger skipped] Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
am: 138dbb86cc
-s ours
...
am skip reason: Change-Id I99643ee9084f3a9bc1ad9a459ac27c587d832c91 with SHA-1 88815d1456
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: I19f322dfbc23f34fcf736215f46fd41f2dd0b570
2020-06-22 19:19:47 +00:00
Jakub Pawlowski
138dbb86cc
Prevent overlay drawing on top of Bluetooth pairing dialog am: f3afef8419
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11953485
Change-Id: I41bd60685dc58028a328c041ca4532b42881cec7
2020-06-22 19:03:01 +00:00
Jakub Pawlowski
f3afef8419
Prevent overlay drawing on top of Bluetooth pairing dialog
...
Bug: 155648639
Change-Id: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
Merged-In: I99643ee9084f3a9bc1ad9a459ac27c587d832c91
2020-06-22 17:35:40 +02:00
TreeHugger Robot
5b5f0f0836
Merge "Disable the defulat animation of the RecyclerView to avoid UI jank." into rvc-dev am: 72dac6e5be
am: a456072536
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949294
Change-Id: I05ad005de4386cc72babe4c589d87262b93acc04
2020-06-22 10:51:16 +00:00
Stanley Wang
bd7e2b93e8
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
am: b1895fc072
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: Iba0db5469c4a8671496e38f4121cccd8e227e6a7
2020-06-22 10:51:09 +00:00
TreeHugger Robot
a456072536
Merge "Disable the defulat animation of the RecyclerView to avoid UI jank." into rvc-dev am: 72dac6e5be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949294
Change-Id: Ib8597a1df999e308b90ae00ffd83b281627e7809
2020-06-22 10:42:42 +00:00
TreeHugger Robot
72dac6e5be
Merge "Disable the defulat animation of the RecyclerView to avoid UI jank." into rvc-dev
2020-06-22 10:40:46 +00:00
Stanley Wang
b1895fc072
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev am: 7afb61e6dc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11949297
Change-Id: I7bda54792d81ace1bcdee9f018fb3e5f3db0fc1b
2020-06-22 10:38:04 +00:00
Stanley Wang
7afb61e6dc
Merge "Fix the bug of not showing lock screen before entering Smart Lock page." into rvc-dev
2020-06-22 10:25:58 +00:00
Stanley Wang
f1a0801c00
Fix the bug of not showing lock screen before entering Smart Lock page.
...
Controller can't find the target preference to handle the click event.
Store the preference keys to match the clicked item.
Fixes: 158716163
Test: run robotest and manually test the click behavior
Change-Id: Ie243206ceffef013c56c4ea29c14fe56da510fb6
2020-06-22 16:49:02 +08:00
Stanley Wang
de3ddf5f3f
Merge "Add log to capture the hardware status." into rvc-dev am: 1117895745
am: 843622806b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908539
Change-Id: I13f42839733c90f88496adeea44aeaccdb89a9b3
2020-06-22 08:46:53 +00:00
Stanley Wang
843622806b
Merge "Add log to capture the hardware status." into rvc-dev am: 1117895745
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908539
Change-Id: I8d32c05d89d857859b88477d282fc36a614c4d9a
2020-06-22 08:29:51 +00:00
Jason Chiu
e7a9baaf8f
Merge "Workaround of Slice not pinned bug when using SliceCallback" into rvc-dev am: c548288a51
am: c13f549973
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931349
Change-Id: Ib2bcfe75f1ed54a3c9b4ab898d163ab1adab43ee
2020-06-22 08:24:48 +00:00
Stanley Wang
1117895745
Merge "Add log to capture the hardware status." into rvc-dev
2020-06-22 08:19:36 +00:00
Jason Chiu
c13f549973
Merge "Workaround of Slice not pinned bug when using SliceCallback" into rvc-dev am: c548288a51
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931349
Change-Id: Ia202ea7899f8ebb8770db91ea676b28f29cbef64
2020-06-22 08:11:49 +00:00
Jason Chiu
c548288a51
Merge "Workaround of Slice not pinned bug when using SliceCallback" into rvc-dev
2020-06-22 07:58:25 +00:00
Jason Chiu
73afb042dc
Workaround of Slice not pinned bug when using SliceCallback
...
When a client registers a SliceCallback, it starts to observe Slice
changes. The observer is running in the main looper and binds Slice
in AsyncTask.
However, when the client unregisters the callback, it unpins the Slice
in the client's thread. Thus, if the AsyncTask has pinned the slice but
hasn't bound it yet, it may be unpinned by the client, and an exception
occurs.
This fix is to unpin the Slice in the same SerialExecutor of AsyncTask,
which is to ensure bindSlice() and unpinSlice() are called in the same
thread one after another without the race condition.
Bug: 157387583
Test: robotest
Change-Id: If5f4b4bc0d8c5a2800cad8ff2afd7084426a6c96
2020-06-22 07:38:50 +00:00
Jason Chiu
0d96af8cea
Merge "Decrease memory usage for sleep idle test" into rvc-dev am: f1a65df04a
am: 07081ae34e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931351
Change-Id: I222b266722c726c8346491a87107aace2168615a
2020-06-22 07:27:48 +00:00
Jason Chiu
07081ae34e
Merge "Decrease memory usage for sleep idle test" into rvc-dev am: f1a65df04a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931351
Change-Id: Ia422444a14e73076de14098a612794d4c0909ddc
2020-06-22 07:14:46 +00:00
Jason Chiu
f1a65df04a
Merge "Decrease memory usage for sleep idle test" into rvc-dev
2020-06-22 07:05:38 +00:00
Yi-Ling Chuang
b54f9b4921
Disable the defulat animation of the RecyclerView to avoid UI jank.
...
When users go to a sub page in Settings and come back to the homepage
again, those sticky cards flicker which makes the UI janky. This is
because we rebind sticky cards to ensure it's always up-to-date, where
the recyclerView has its default animation while notifyItemInserted(),
ane thus introduce the jank.
Fixes: 158627602
Test: Open Settings -> go to sub pages -> back to the homepage -> cards
are not flickering.
Change-Id: I2104dbe0bed8b2486c35521bcc0b5c8b54efb995
2020-06-22 14:53:10 +08:00
Jason Chiu
23c1016d6d
Merge "Fix homepage cards show up problem after first launch" into rvc-dev am: 64dbdebfbf
am: 7ebe511104
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11897739
Change-Id: I99dec7ad62d2fbe5cfd2f8058517bc36d393f4e9
2020-06-22 06:44:58 +00:00
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