Alex Li
c8184bbae9
Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834 am: d5f6a66682 am: 8dc66ef820
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662
Change-Id: I8b61d4f39dc18a105850f5c6e55da25c09019275
2020-06-22 04:50:55 +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
TreeHugger Robot
c158204e82
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 11018b11c1 am: 46383f190a am: d98079a0e8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: I3c34f0fdba231160b283fdac004c814bebc3bb37
2020-06-22 04:25:05 +00:00
Automerger Merge Worker
05428ae28a
Merge "Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: 009de48ded" into rvc-qpr-dev-plus-aosp am: c19a4eb78a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Ic21a42ff758055f441913f154db7a34fbf1c534b
2020-06-22 04:24:58 +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
3ab6e990ab
Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: c758384eec am: f339f5a25d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423
Change-Id: Ic02e9129f844255524ba8f9f00e3902562b68882
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
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
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
Arc Wang
fb2b144413
Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment"
2020-06-21 14:25:18 +00:00
TreeHugger Robot
f7a63f2b1a
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63 -s ours am: d76af20a41 -s ours am: e755b8ae39 -s ours am: 0f3bfc0bf0 -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: I971a5641bc5e0d4fef264deef06cbe0d8351a867
2020-06-21 00:24:33 +00:00
TreeHugger Robot
405cb89e76
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63 -s ours am: 85e3e2d0f9 -s ours am: 0c94e12c75 -s ours am: dc6854d87c -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: I6159110b0af0c9c980133717aa05f99faa8154a3
2020-06-21 00:24:26 +00:00
TreeHugger Robot
3df28010e2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 27d10f6b63 -s ours am: d76af20a41 -s ours am: b5968c5bcc -s ours am: 755765f501 -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: I8c05d6f39c56033eeae10969e062c17d1c6d7222
2020-06-21 00:24:13 +00: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
Bill Yi
054e6d951f
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: cbd2b6aa2a -s ours am: bc7b2016a8 -s ours am: d726194acf -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: Iba06051094c4282ba6d936834e9ca9bb064720cf
2020-06-20 23:54:23 +00:00
Bill Yi
3cc52f0535
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: 16b45b30aa -s ours am: 709a4fb31d -s ours am: b1202b22aa -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: Ic8dc1db157dad09f37684b6af51a6506654ae9ad
2020-06-20 23:54:08 +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
Bill Yi
40cb11d8a9
[automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: cbd2b6aa2a -s ours am: 3c015b8044 -s ours am: 8ebf4ac8f7 -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: I8a8ff960f94b265352c046bd5c1110b0ae12b7a0
2020-06-20 23:53:43 +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
tim peng
94e51cecbd
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 34a29d1bb5 am: 253ee8c68a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I9c927cacb0f194bd4bd873d1ccf9787e3431578c
2020-06-20 11:06:01 +00:00
tim peng
8cba94d43d
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: fc3f730d98 am: 23917b3826 am: 5375d1e3b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: Icf65772fc4d27a1328752d9cb55cb9aad659472b
2020-06-20 11:05:53 +00:00
tim peng
4d956498e4
Merge "Add a separate line at the bottom of list area in output switcher" into rvc-dev am: 02e311e537 am: 9ff43d2fa3 am: 593d62d992 am: 826cd4f88f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900663
Change-Id: I7caf8d437cfd45979b1e33882c38d65c4fa43f63
2020-06-20 11:05:46 +00: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
