hoffc
5474dc1a90
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours am: 8190103964 -s ours am: 5c657ec406 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 11:18:39 +00:00
hoffc
6b0dafdf90
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours am: d6c1d47dff -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:04:14 +00:00
hoffc
45d33e3240
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours am: 9c5d56cae1 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:04:08 +00:00
hoffc
d6c1d47dff
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4 am: 38495e875b -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 11:03:57 +00:00
hoffc
5c657ec406
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours am: 8190103964 -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 11:03:54 +00:00
hoffc
9c5d56cae1
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours am: dbb42d1e8f -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 10:49:28 +00:00
hoffc
8190103964
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours am: 3bb45a9d9e -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 10:49:11 +00:00
hoffc
38495e875b
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb am: 375b565eb4
...
Change-Id: Ic0098f3f4f6301e2e783296722ac473f04bbb9dd
2020-04-29 10:49:08 +00:00
hoffc
375b565eb4
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb
...
Change-Id: I0e287cb3d0f1689679c96131e6cf90ee11e80a9c
2020-04-29 10:33:14 +00:00
hoffc
dbb42d1e8f
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours am: 01b5c4b51f -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
2020-04-29 10:33:13 +00:00
hoffc
3bb45a9d9e
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb am: 535ebae5fb -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 10:32:49 +00:00
SongFerng Wang
edde890918
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90 am: 966d9550f8 am: 01a23fb357
...
Change-Id: I2213737a1314e91567dd86ec5dbcc0d4f7258ce1
2020-04-29 10:12:47 +00:00
hoffc
01b5c4b51f
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb -s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
2020-04-29 10:12:45 +00:00
hoffc
535ebae5fb
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
...
Change-Id: I1c1c3b249f938ee487dc9346bcad4c9223e2e4e7
2020-04-29 10:12:39 +00:00
SongFerng Wang
01a23fb357
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90 am: 966d9550f8
...
Change-Id: I737132d68dc11f4f8eed3780cb66e14db9ed4351
2020-04-29 09:56:59 +00:00
SongFerng Wang
966d9550f8
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82 am: 4d8db97e90
...
Change-Id: I392df21aa7cdfeaf76801cd8204c8d74ac8c2a0b
2020-04-29 09:42:30 +00:00
Automerger Merge Worker
8115876b2f
Merge "Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1" into rvc-qpr-dev-plus-aosp am: b44f330b9e am: 0f6ddcbab8
...
Change-Id: Id9fd1fcfc37dc17bfe45dbfbcf7b1af6bc7e6f4a
2020-04-29 09:25:57 +00:00
Alex Johnston
4e047932bc
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce am: 7d2f42ef2b am: ed1948b639 am: b907ec03b6
...
Change-Id: I91be877e5452da934c6bb15c9c7a4c16d40f5cc3
2020-04-29 09:25:40 +00:00
Alex Johnston
45ddcfba11
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 85404a89c2 am: 4c5218b503 am: a8f1a69f3e
...
Change-Id: Ifcca588a7bf33f416c61ca7f7d3bb5ad149100d0
2020-04-29 09:25:29 +00:00
Menghan Li
99f2e34e8a
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af am: 5337625d14 am: 3a4a4e785c am: 251e1fe6b6
...
Change-Id: Ifbb93fe29ffb3fa0f7fdcc2c8d45ab92652aa88a
2020-04-29 09:25:07 +00:00
SongFerng Wang
4d8db97e90
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2 am: d5cc228c82
...
Change-Id: I0a4007846f5a75bf83fd6c5a4992eb72bad505f0
2020-04-29 09:24:18 +00:00
Menghan Li
1808683ac1
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 36d7ad2e0d am: 70a1921d2b am: f8e96c07f3 am: d62544cd06
...
Change-Id: I6b99f4e0b90f518490b4191e89b45512b88dd6a5
2020-04-29 09:24:18 +00:00
Menghan Li
b9d83ce356
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: aa0c512ff5 am: 6267537581 am: 149f35605f
...
Change-Id: I54a3ed7a681695d3ba258544e17feae05aa79e49
2020-04-29 09:23:46 +00:00
Neil Fuller
eafec7a244
Fix missing zone strings in some cases
...
ICU's TimeZoneNames requires a "canonical" zone ID, otherwise it will
return no data. Usually the ID being used is the same as the canonical
ID so there's no problem. TZDB version 2020a switched the ID of one of
Greenland's zones from America/Godthab to America/Nuuk, and ICU/CLDR
hold their translation data against America/Godthab in the current
version of ICU on Android.
Bug: 155167041
Test: Manual - viewed settings on a device with the tzdb 2020a update
Change-Id: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
2020-04-29 10:16:19 +01:00
Yanting Yang
df5aaec663
Remove index for Take call on of Sound page
...
"Take call on" is only visible when there are multiple media devices
connected and phone call is incoming or answering. In general, this
preference is hard to see for users.
In reality, users usually change the phone call output on Phone app,
it's a rare case that user will go to Settings to search "Take call on"
to change the phone call output when they are answering call.
Intend to remove its index from Settings Search first since it's almost
invisible on Sound page. Users will confuse that why Sound page doesn't
show the corresponding preference when they found the "Take call on" and
tapped on it from Settings Search.
Fixes: 140392320
Test: visual and robotests
Change-Id: I87ec4fda2a3d8625c8f09beeffe348a302187d6d
2020-04-29 17:14:35 +08:00
Automerger Merge Worker
0f6ddcbab8
Merge "Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1" into rvc-qpr-dev-plus-aosp am: b44f330b9e
...
Change-Id: I70e959679c452b8042035caf29714b8b776841eb
2020-04-29 09:09:51 +00:00
Alex Johnston
b907ec03b6
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce am: 7d2f42ef2b am: ed1948b639
...
Change-Id: Iee8391dcd523688cf6995995bac9b68c86395d63
2020-04-29 09:09:42 +00:00
Alex Johnston
a8f1a69f3e
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 85404a89c2 am: 4c5218b503
...
Change-Id: I86bb6e9d8bc49954eae1ccdabb758e0ff8dcf0f4
2020-04-29 09:09:35 +00:00
Menghan Li
251e1fe6b6
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af am: 5337625d14 am: 3a4a4e785c
...
Change-Id: I423a85d95983df8c846dcf5f0ef0acae46bc0cff
2020-04-29 09:09:07 +00:00
Automerger Merge Worker
b44f330b9e
Merge "Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1" into rvc-qpr-dev-plus-aosp
2020-04-29 09:08:43 +00:00
SongFerng Wang
d5cc228c82
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5 am: 7999b0a9a2
...
Change-Id: I99e0482c5102182c50d171c733927b7c29dddbca
2020-04-29 09:08:42 +00:00
Alex Johnston
c86fe071d8
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39 am: f4b2859be1
...
Change-Id: I714f8f269ca0c7b42ba48a24d3cf94f6b4dbd1a6
2020-04-29 09:08:38 +00:00
Alex Johnston
ed1948b639
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce am: 7d2f42ef2b
...
Change-Id: I8b55af4101a6c45b1cc665b2bd09ee0a6a0233a6
2020-04-29 09:08:37 +00:00
Menghan Li
d62544cd06
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 36d7ad2e0d am: 70a1921d2b am: f8e96c07f3
...
Change-Id: I94bd78e1fdc553135ead554ecc51a08d44b18f99
2020-04-29 09:08:29 +00:00
Alex Johnston
4c5218b503
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 85404a89c2
...
Change-Id: I31d1eff357cb1dace71ad33123a388cff5850ec8
2020-04-29 09:08:21 +00:00
Menghan Li
3a4a4e785c
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af am: 5337625d14
...
Change-Id: Iac4d54cab4393905a388533565584670d7079eb1
2020-04-29 09:08:07 +00:00
Alex Johnston
7d2f42ef2b
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7 am: 36956907ce
...
Change-Id: Ia99cb382f7a8db2065751f7f9dcc9696497bd129
2020-04-29 09:07:58 +00:00
Menghan Li
149f35605f
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: aa0c512ff5 am: 6267537581
...
Change-Id: I356ddb582b6fd154766c932e774ccbbe3d653f5e
2020-04-29 09:07:47 +00:00
Alex Johnston
f4b2859be1
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: 20555b3e39
...
Change-Id: Ie3c5f305b2c4eb25dc12ce6db4df0428a3b9e047
2020-04-29 08:50:25 +00:00
Alex Johnston
36956907ce
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7
...
Change-Id: Iea3de900abd4fa5179e355f59366e9f8cd542d11
2020-04-29 08:50:09 +00:00
SongFerng Wang
7999b0a9a2
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
...
Change-Id: I1799dd42b0400e29772bb01ddeb957031df6aa8b
2020-04-29 08:50:04 +00:00
Alex Johnston
85404a89c2
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6 am: b2c004b3b7
...
Change-Id: I35a73ed9051d360ab493968defcee656ca92f0c1
2020-04-29 08:49:52 +00:00
Menghan Li
f8e96c07f3
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 36d7ad2e0d am: 70a1921d2b
...
Change-Id: If26020d1a23820f45991f24c7f37b98a663034b2
2020-04-29 08:45:23 +00:00
Menghan Li
6267537581
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: aa0c512ff5
...
Change-Id: Id43cccbab4bd05b79b3c05d6305ebb5dde0ee690
2020-04-29 08:44:57 +00:00
Menghan Li
5337625d14
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b am: 5d7fd4abc3 am: 222ccca3af
...
Change-Id: I85414131be20dc1e393a1f3d7c5e69860400e758
2020-04-29 08:44:48 +00:00
hoffc
d6c805f0bb
Settings: Fix force close when destory sim lock fragment view
...
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.
Override its parent onCreateView when no sim card inserted.
Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
Merged-In: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
2020-04-29 16:34:21 +08:00
Alex Johnston
20555b3e39
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
...
Change-Id: Ia730a919a16bb89f4d4543bc5cd592885ff730fd
2020-04-29 08:34:00 +00:00
Alex Johnston
b2c004b3b7
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
...
Change-Id: I65079e2dc5c1cceb8489c7d691cdce08f0788c90
2020-04-29 08:33:53 +00:00
SongFerng Wang
0d4010c5e5
Merge "Settings: Fix force close when destory sim lock fragment view"
2020-04-29 08:31:05 +00:00
Jason Chiu
d304c20a15
Refine contextual Bluetooth card behavior when Bluetooth is off
...
When bluetooth is off, show the specific layout for enabling Bluetooth.
Bug: 154691520
Test: robotest
Change-Id: If3fd493558dcf2a47183345bbe175dfe257574d1
2020-04-29 16:29:41 +08:00
