Commit Graph

73456 Commits

Author SHA1 Message Date
Alex Li
19a9278325 Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834 am: 22f3f4f157 am: 91650720d4 am: dfcdeb8147
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: Icdd484fb6e605d57a4b5214fd8128c2d10732fb5
2020-06-22 05:07:04 +00:00
Alex Li
4a1d7dd7bf Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 49df46ef59 am: 953e87a578 am: 21caf00d4a am: d8c48ebb9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: I7cf8a4aba1af34cb9fa4f17f5223864adbfff795
2020-06-22 05:06:47 +00:00
Alex Li
53a2a57e9e Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834 am: d5f6a66682 am: 8dc66ef820 am: c8184bbae9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: I394b8d829ff6a60fa3c00f19e0d09df2608a3a42
2020-06-22 05:06:34 +00:00
Alex Li
dfcdeb8147 Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834 am: 22f3f4f157 am: 91650720d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: I72adda4345232e110179e04b610752ee3b8edfc5
2020-06-22 04:51:12 +00:00
Alex Li
d8c48ebb9f Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 49df46ef59 am: 953e87a578 am: 21caf00d4a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: Ib717da9afd1d12db45b606dcd3bbdbfae15173c2
2020-06-22 04:51:06 +00:00
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
TreeHugger Robot
b784d18b6e Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 11018b11c1 am: 46383f190a am: d98079a0e8 am: c158204e82
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: Ida78e98870738a4a913aa500a53eef8084980d6d
2020-06-22 04:36:43 +00:00
Automerger Merge Worker
241f54588f 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 am: 05428ae28a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: Ic25e10a185b9732c630012aef0a76a1b3b91a27d
2020-06-22 04:36:37 +00:00
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
TreeHugger Robot
3be20653dc Merge "Make Telephony related PreferenceController un-sliceable" into rvc-dev am: fbabf8f251 am: 2b697fac94 am: c758384eec am: f339f5a25d am: 3ab6e990ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862423

Change-Id: I060ac80c6ebdf88d1311b26b94dc970eee204d70
2020-06-22 04:36:31 +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
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
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
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
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
9e5a2dc506 Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment" am: fb2b144413
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11817238

Change-Id: I7861aafb0b91a29d46ffc4c11d8d2e0537654d96
2020-06-21 14:38:29 +00:00
Arc Wang
fb2b144413 Merge "[Wi-Fi] Apply WifiTrackerLib objects in NetworkRequestDialogFragment" 2020-06-21 14:25:18 +00:00
TreeHugger Robot
0f1dd621aa [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: f7a63f2b1a -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: I65a4e1e2c7fc233b0a7175b766dde30a5cd6d8ab
2020-06-21 00:36:54 +00:00
TreeHugger Robot
2b98af667e [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: 405cb89e76 -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: Icfcfb51d6067978bac7f2d7b288239968380e3da
2020-06-21 00:36:48 +00:00
TreeHugger Robot
007c1edb68 [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: 3df28010e2 -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: Iaa969a425ad5d923eea456b2a30aff3ab82cb3c3
2020-06-21 00:36:42 +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
Bill Yi
66c952d5cd [automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: cbd2b6aa2a -s ours am: bc7b2016a8 -s ours am: d726194acf -s ours am: 054e6d951f -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: I7c0f671445af78b9b90e8799d43079ed4a65f68c
2020-06-21 00:11:29 +00:00
Bill Yi
c007303a8d [automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: 16b45b30aa -s ours am: 709a4fb31d -s ours am: b1202b22aa -s ours am: 3cc52f0535 -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: I1078d4c3078bf8ebc4d135f29284c20ca5833939
2020-06-21 00:11:18 +00:00
Bill Yi
36187d1cfb [automerger skipped] Import translations. DO NOT MERGE am: 82322a6754 -s ours am: cbd2b6aa2a -s ours am: 3c015b8044 -s ours am: 8ebf4ac8f7 -s ours am: 40cb11d8a9 -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: Iee8dc65eb5b2ac56f968cc777fce8813bce89d0c
2020-06-21 00:10:56 +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