Chen Xu
71f9fe4dfa
Merge "address API council feedbacks for Telephony.Carriers"
2018-12-06 21:45:47 +00:00
android-build-team Robot
c103b546d2
Merge cherrypicks of [5704859, 5705300, 5704034, 5704195, 5705082, 5704058, 5704059, 5704932, 5705340, 5705341, 5705342, 5705343, 5705344, 5705361, 5705362, 5705363, 5705364, 5704870, 5704196, 5705083, 5701785, 5701786, 5701787, 5704035, 5705261, 5705281, 5704036, 5704037, 5704038, 5704871, 5704933, 5704872, 5705347, 5705262, 5704934] into pi-qpr2-release
...
Change-Id: I0eba927762c07cdb664a62d65637e9dbd7e79dc1
2018-12-05 05:16:47 +00:00
Fan Zhang
bd363f4925
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
(cherry picked from commit 4220b1e50c
2018-12-05 05:14:17 +00:00
Fan Zhang
b084c60686
Merge "Make migrate option menu invisible when src volume is not mounted"
...
am: 6db9f21256
2018-12-04 10:01:10 -08:00
Fan Zhang
6db9f21256
Merge "Make migrate option menu invisible when src volume is not mounted"
2018-12-04 17:33:33 +00:00
chen xu
54d5a727c1
address API council feedbacks for Telephony.Carriers
...
Bug: 118296421
Test: telephony unit test
Change-Id: Idf8bcad4fe9d765a73563e9b0c1c659175835447
Merged-in: Idf8bcad4fe9d765a73563e9b0c1c659175835447
2018-11-29 23:20:13 -08:00
Bill Yi
03812c93d1
Merge pi-qpr1-release PQ1A.181105.017.A1 to pi-platform-release
...
Change-Id: I120adda515fd4891b6b9b68e93cef5555951bacc
2018-11-28 18:34:54 -08:00
Neil Fuller
de0bd5321f
Merge "Track move of timezone classes to libcore.timezone"
...
am: 3ddcb6a90a
2018-11-26 15:27:52 -08:00
Neil Fuller
3ddcb6a90a
Merge "Track move of timezone classes to libcore.timezone"
2018-11-26 23:04:33 +00:00
Youming Ye
e29c62ea04
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"
...
am: a995cb334b
2018-11-26 13:38:30 -08:00
Youming Ye
a995cb334b
Merge "Display a toast to notify user that Preset APN setting cannot be viewed"
2018-11-26 21:14:14 +00:00
android-build-team Robot
f8d659af6c
Snap for 5140444 from a31c2ec237 to pi-qpr2-release
...
Change-Id: I51e2f0730950c181af8670b76357bbd9f379b015
2018-11-26 18:45:11 +00:00
Neil Fuller
17f04b66b2
Track move of timezone classes to libcore.timezone
...
Some time zone related libcore classes are moving from
libcore.util to libcore.timezone.
Bug: 119026403
Test: build only
Merged-In: I920411dfa7e000a0da9678826a035e0461211619
Change-Id: I920411dfa7e000a0da9678826a035e0461211619
(cherry picked from commit 1e1961a5b3
2018-11-22 10:05:12 +00:00
taiki tsutsumi
4d044ced6d
Display a toast to notify user that Preset APN setting cannot be viewed
...
When KEY_HIDE_PRESET_APN_DETAILS_BOOL is set to true, Preset APN setting
is hidden. When user taps Preset APN, a toast should be shown to inform
that user cannot view the APN.
Test: manual - check Preset APN setting details are hidden
Bug: 115453290
Depends-On: I8a5c6f92f876d349b304acf89b4ffab86ff3f24b
Change-Id: I0078b3492ae87a4297f24871b8bea1579e6a79af
2018-11-21 15:40:58 -08:00
Maurice Lam
918c0c5896
Merge "Remove ShadowLibcoreTimeZoneNames"
...
am: 45f8352422
2018-11-21 07:44:39 -08:00
Treehugger Robot
45f8352422
Merge "Remove ShadowLibcoreTimeZoneNames"
2018-11-21 15:17:51 +00:00
Maurice Lam
3cf13adf9b
Remove ShadowLibcoreTimeZoneNames
...
Bug: 119829838
Test: Treehugger
(cherry picked from commit cc2cf5ba5a
2018-11-21 11:07:11 +00:00
android-build-team Robot
9b65905c31
Snap for 5143169 from b232d21e3d to pi-qpr2-release
...
Change-Id: Ic72f92cf2b191d7f19c92d6c8a1ae0730dfac5bc
2018-11-21 04:06:46 +00:00
Fan Zhang
b232d21e3d
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1 am: eeaff5deeb -s ours
...
am: 622444d488
2018-11-20 02:43:38 -08:00
Fan Zhang
622444d488
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1
...
am: eeaff5deeb
2018-11-20 02:34:38 -08:00
Fan Zhang
eeaff5deeb
Hide quicksetting tile for dev options when it's turned off
...
am: 73469d9de1
2018-11-20 02:28:15 -08:00
Fan Zhang
cb560b65f5
[automerger skipped] Hide quicksetting tile for dev options when it's turned off
...
am: 04f1e38dc3
2018-11-19 22:38:50 -08:00
TreeHugger Robot
4c16ad5abf
Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
2018-11-20 05:00:03 +00:00
android-build-team Robot
a31c2ec237
Snap for 5130385 from 1ba1a70dfb to pi-qpr2-release
...
Change-Id: I641ad1361cf9c09aeb9e04afde2a203d20b7664b
2018-11-14 04:09:54 +00:00
Inseob Kim
e6baedd917
Schematize vold system properties
...
Properties accessed across partitions are now schematized and will
become APIs to make explicit interfaces among partitions.
Bug: 117924132
Test: m -j
Change-Id: Id2a696c621015d46015d5de0e7aef987e9e01b54
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
2018-11-14 12:05:28 +09:00
TreeHugger Robot
1ba1a70dfb
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-11-14 00:49:33 +00:00
Bill Yi
0301470757
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic00cbf2b25c019d77c85c93203e58f4a1cf102c1
2018-11-13 14:42:50 -08:00
Risan
e613923d66
Merge "Allow StubVolume to be browseable in Settings"
...
am: 8f516adef7
2018-11-13 11:45:08 -08:00
Treehugger Robot
8f516adef7
Merge "Allow StubVolume to be browseable in Settings"
2018-11-13 19:20:38 +00:00
Neil Fuller
78e132773a
Merge "Remove the feature flag and dead code for the old time zone picker"
...
am: 6bb4b5ca43
2018-11-13 01:50:08 -08:00
Neil Fuller
6bb4b5ca43
Merge "Remove the feature flag and dead code for the old time zone picker"
2018-11-13 09:33:16 +00:00
Victor Chang
fe627a5901
Remove the feature flag and dead code for the old time zone picker
...
This commit backports commit 6be6c582066be6c58206
2018-11-13 07:49:32 +00:00
Fan Zhang
4220b1e50c
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-13 09:22:06 +08:00
Edgar Wang
96d829be9a
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
2018-11-13 01:16:48 +00:00
Fan Zhang
73469d9de1
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 20:25:51 +08:00
Fan Zhang
04f1e38dc3
Hide quicksetting tile for dev options when it's turned off
...
Merged-In: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Bug: 117770924
Test: robotests
2018-11-12 19:52:32 +08:00
Edgar Wang
bea5b289ff
Move "About Phone" to bottom of Settings main IA, above "Tips & Support"
...
Merged-In: I0a0f03bdb27d9eea48eb758496eefeebcbc57b6c
Change-Id: If839a7199992104cc0abac9327844145d148cd68
Fixes: 118168552
Test: robotests
2018-11-09 11:24:48 +08:00
Youming Ye
6b0237ebfb
Merge "Fix issue that read-only apns can be edited"
...
am: e871464053
2018-11-08 17:20:26 -08:00
Youming Ye
e871464053
Merge "Fix issue that read-only apns can be edited"
2018-11-09 01:00:35 +00:00
Risan
9deece9086
Allow StubVolume to be browseable in Settings
...
Test: Unit test + manual test: Mount and unmount stubvolume in ARC++,
check settings show the device correctly and could browse it using
DocumentsUI.
Bug: 110380403
Change-Id: I96fc82e731225776ac7070ef035687f83da94245
2018-11-08 21:47:22 +00:00
android-build-team Robot
589539103c
Snap for 5117340 from 0eea3b6c9e to pi-qpr2-release
...
Change-Id: Ie37868f13ec5507a77ea14ec542e3677912edc0b
2018-11-08 01:11:46 +00:00
Fan Zhang
0eea3b6c9e
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
2018-11-07 20:44:59 +00:00
Clown SHEN
74fe4a9177
Merge "Launch WfcActivation with subscription ID"
...
am: bd57f94a4c
2018-11-06 23:30:23 -08:00
Clown SHEN
bd57f94a4c
Merge "Launch WfcActivation with subscription ID"
2018-11-07 07:09:27 +00:00
android-build-team Robot
6a2725ba18
Snap for 5115288 from 222dca5b7c to pi-qpr2-release
...
Change-Id: Ied0d2683aa566fae94e0b0684a872b7dcaab3f4d
2018-11-07 04:16:35 +00:00
Fan Zhang
d9c6692f25
Fix crash when starting daydream setting with wrong context
...
The context must be a UI context. This is a new requirement in P.
Change-Id: I3e2de5068f44010da7d57af030e9f029dd97a7f8
Merged-In: I28874f296da617f4cedf6706b0663b76671f1780
Fixes: 111375261
Fixes: 113312592
Test: robotests
2018-11-06 23:47:24 +00:00
Bill Yi
222dca5b7c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie15195c81e11f67f4bd72be18c6af0d273666ceb
2018-11-06 04:15:12 -08:00
Bill Yi
935509aa3d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic830e9dc65c715010b562f0148821899114de819
2018-11-02 15:27:05 -07:00
Yuming Mao
8d1eee08f7
Fix issue that read-only apns can be edited
...
When entering to ApnEditor with ApnSettings#onPreferenceTreeClick(),
subId is not passed.
So invalid subId is used and it gets wrong carrier config values.
To resolve this issue, remove unnecessary ApnSettings click event.
The only click event for launching ApnEditor is ApnPreference click
event.
Test: manual - Check that the read-only APN can't be edited when tap
the edge of the APN settings screen
Bug: 117302653
Change-Id: I0a61b409539d6e4f6aa9860235e61c43c76640fa
2018-11-02 19:56:11 +09:00
clownshen
95f8c6e96a
Launch WfcActivation with subscription ID
...
For multi SIM project, need to have subscription ID information in the
intent for launching WFC activation activity.
Bug: 112826472
Test: manual test
Change-Id: I9f470c014054efa612c87ff16e574fc9fd286b3d
2018-10-31 13:28:09 +08:00
