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
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
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
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
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
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
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
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
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
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
ab95ad13fb
Merge "Revert "Revert "Fix SecurityException while accessing Slice Uris""" into rvc-dev am: cab1329f0f
am: 128d19f24e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931344
Change-Id: I9296c9684b70222b8cabb39fd2c89093ca21d980
2020-06-20 10:12:25 +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
9c6d33b149
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: I570056028a1605984de1d0e657bc540a8d6fe045
2020-06-20 10:12:02 +00:00
TreeHugger Robot
128d19f24e
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: Icc40ad462d75fdd5d104681fac707b0562119dfc
2020-06-20 09:57:19 +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
7bf05608b0
[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: ea8d70b9b1
-s ours
...
am skip reason: Change-Id I5ce1a0b3838db7b3fbe48c6ea23d5f093d625cdb with SHA-1 818fef48f3
is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11802014
Change-Id: I22613bd66dcd88ddf7ddbf2ce2b3f7a5acbd25fc
2020-06-20 05:35:11 +00:00
Sunny Shao
064fb53d3f
[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: I6f05f88204e0de2fdebf5a94d1333bcc0b41709f
2020-06-20 05:34:53 +00:00
Sunny Shao
ea8d70b9b1
[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: I299271b7dd23771e023ec0774caef49df5d89bf2
2020-06-20 05:21:11 +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
f8c4277924
Merge "NetworkModePreference's list needs to allow values set from overlay." into rvc-dev am: 5b849d8ac8
am: 914f8e7d07
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11908541
Change-Id: Ia3b9d654d0d62e10daec80c1b5e05b9739f62272
2020-06-20 04:56:51 +00:00
Sunny Shao
b9d8eebcdb
[automerger skipped] Allows to launch only authenticator owned activities am: c8f92acbfb
-s ours am: af9bdcb4b5
-s ours am: 0f995b348c
-s ours am: e4e335c662
-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/+/11802012
Change-Id: I646cae8a5c2b5530803e018bde6b628124b3d299
2020-06-20 04:56:44 +00:00
TreeHugger Robot
58c4a5bf48
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: Ia862cf87cf256805fb0b6ab27101cdfc41614778
2020-06-20 04:56:28 +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
0d8086c16c
[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: Ifb3a75afc4c130396ad28cd3d7fa2d8b95648f38
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
914f8e7d07
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: I6607dc1cea3303faf895dbacbd5528f4600118e2
2020-06-20 04:43:49 +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
e4e335c662
[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: I35c521acfe9cacdf2189606addb8d9e5532a9f82
2020-06-20 04:43:41 +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
Mark Chien
2a77178e63
[automerger skipped] Merge changes from topics "pass-res", "remove-isProvisioningNeeded" am: 92eb12c0e2
am: cbfe64ea94
-s ours am: 0614f6da80
-s ours
...
am skip reason: Change-Id I3b0da2672246997aee16b11576ce5ae9bfe596dc with SHA-1 efb029c067
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344640
Change-Id: I19f31fdbad6afd512c6728fd8d09799b06570af2
2020-06-20 04:39:08 +00:00
markchien
5497e1a929
[automerger skipped] Get entitlement configuration from intent extra am: 6d2c010891
am: 017dd38916
-s ours am: f5dc453a8b
-s ours
...
am skip reason: Change-Id I3d06df01302a9c1f0893712d9250fe394dc66588 with SHA-1 e22bd7a2e8
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344639
Change-Id: Id2df5e5ebad706e4269075294aba0a09ce12ed14
2020-06-20 04:39:06 +00:00
markchien
1abe88eb28
[automerger skipped] Remove isProvisioningNeededButUnavailable usage am: e48a3d7a76
am: 1932ef4389
-s ours am: c0d484c488
-s ours
...
am skip reason: Change-Id If0b0a3e6cadab3c4a4d2c003e2aa9e9f3dd7449c with SHA-1 92b09e825f
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1344638
Change-Id: I9d822817789f46a481da335692f409cf4b7ea350
2020-06-20 04:39:03 +00:00