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
is in history
Change-Id: Ice6979bfa5ec74ae5802fe156fe3b1a475db5bd1
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
is in history
Change-Id: I92bdadf3a9c5a93376c1392cf01c28a17fe35f3b
2020-04-29 10:32:49 +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
is in history
Change-Id: I2f1e4bbf75585aad6d6cfe04b3a40e988d02b437
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
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
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
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
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
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
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
Menghan Li
70a1921d2b
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
am: 36d7ad2e0d
...
Change-Id: Ic8a68c0e39e7e9dd630608e6a6e39fb2cd35abd9
2020-04-29 08:25:28 +00:00
Menghan Li
222ccca3af
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
am: 5d7fd4abc3
...
Change-Id: I5b445da9587b04642bec4ac63ed18cbaf1f628ea
2020-04-29 08:25:17 +00:00
Menghan Li
aa0c512ff5
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
am: 5d7fd4abc3
...
Change-Id: I0f0d7a674aacd998ee88a5627fa30586e3662c28
2020-04-29 08:24:51 +00:00
Alex Johnston
d1408a66a6
Merge "Check if FRP policy is supported in Settings" into rvc-dev
2020-04-29 08:19:14 +00:00
Menghan Li
36d7ad2e0d
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
...
Change-Id: Iae5b3d775430bbdbb789be190a61dfbfb7975463
2020-04-29 08:14:13 +00:00
Menghan Li
5d7fd4abc3
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
...
Change-Id: I3a7d6846feb4191cf09aea61f3b6e1eb0cea03e4
2020-04-29 08:13:57 +00:00
Menghan Li
981d10db0b
Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev
2020-04-29 07:59:35 +00:00
Arc Wang
86aa111f0c
Set usage graph LTR layout direction for Persian & Urdu
...
Persian & Urdu are RTL lanuages but users request LTR
usage graph layout direction.
Bug: 153483998
Test: manual visual
Set locale Persian or Urdu.
In 'Wi-Fi data usage', the usage graph should be LTR.
Change-Id: I850baa17d12ac3e0de62382fcb90eda9a19dbcbd
2020-04-29 15:10:14 +08:00
Zoey Chen
4baa729613
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 9bdb276281
am: 1891db88b1
am: fc6bf429e3
...
Change-Id: Ic419ea8ba8c4db5349bd3da85bbfd65000a623fc
2020-04-29 06:51:43 +00:00
Zoey Chen
6fbf4dabe1
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 5ef8e70bba
am: 30be159390
...
Change-Id: I4478f873a1662bd5b4ff8bec8f58cc80454fa444
2020-04-29 06:41:29 +00:00
Zoey Chen
9935b4684b
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 9bdb276281
am: b041384d57
...
Change-Id: Ic98b9855734f71224d5a231a4e946b51df6842cf
2020-04-29 06:41:19 +00:00
Zoey Chen
fc6bf429e3
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 9bdb276281
am: 1891db88b1
...
Change-Id: Ifbabf8515ea4223a0ae74f930127dd3ee404465b
2020-04-29 06:40:31 +00:00
Zoey Chen
30be159390
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 5ef8e70bba
...
Change-Id: I8f7aae08ea5fb6edde4d2d3639f4a3d693a22886
2020-04-29 06:28:03 +00:00
Zoey Chen
1891db88b1
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 9bdb276281
...
Change-Id: Iea50e0a5c9f4f01050aacb55c63c9663b7847699
2020-04-29 06:27:51 +00:00
Zoey Chen
b041384d57
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
am: 9bdb276281
...
Change-Id: I9d0e6885341b7810261f948710dde2766c2eaf8e
2020-04-29 06:27:05 +00:00
TreeHugger Robot
7649025260
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323
-s ours am: c763d18148
-s ours am: 29f6ec314e
-s ours am: 1276dbef56
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I51d2d0cde402ebf33d555d1aaa082dde691df7b7
2020-04-29 06:21:49 +00:00
TreeHugger Robot
5f2fccb939
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88
-s ours am: 899dbf039f
-s ours am: f80898b03b
-s ours am: 113a084571
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Id0d10764a4652dd488c23367024b70a7e158d917
2020-04-29 06:20:57 +00:00
TreeHugger Robot
2abc1f2a43
Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
am: 222da24344
am: ae12c347ee
am: dc18558a59
...
Change-Id: Ie88c9a8dbd0f11a8f5e1f92af4e6f295e0484f15
2020-04-29 06:20:44 +00:00
TreeHugger Robot
f0b0e1b416
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323
-s ours am: c763d18148
-s ours am: 82a2d63074
-s ours
...
am skip reason: subject contains skip directive
Change-Id: If5c7b6ddc4bf35e785554452b54269ab22a3d9bc
2020-04-29 06:13:03 +00:00
Zoey Chen
5ef8e70bba
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
...
Change-Id: I501cd6da5ab4672cc7989b07a9c351953238ffae
2020-04-29 06:12:00 +00:00
Zoey Chen
9bdb276281
Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
...
Change-Id: If161edb6ba8db7861bd9e36fcec89e02f14031ce
2020-04-29 06:11:55 +00:00