Neil Fuller
18a275efc3
Merge "Track move of timezone classes to libcore.timezone" am: 3ddcb6a90a
...
am: de0bd5321f
2018-11-26 15:48:38 -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
e5e4e4cb76
Merge "Display a toast to notify user that Preset APN setting cannot be viewed" am: a995cb334b
...
am: e29c62ea04
2018-11-26 13:51:57 -08: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
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
c2772b777d
Merge "Remove ShadowLibcoreTimeZoneNames" am: 45f8352422
...
am: 918c0c5896
2018-11-21 08:06:22 -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
Fan Zhang
b84867f450
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 73469d9de1 am: eeaff5deeb -s ours am: 622444d488 -s ours
...
am: b232d21e3d
2018-11-20 21:42:26 -08:00
Fan Zhang
1c60e846e6
[automerger skipped] Hide quicksetting tile for dev options when it's turned off am: 04f1e38dc3 -s ours
...
am: cb560b65f5
2018-11-20 21:41:34 -08:00
Fan Zhang
1c5a636e17
[automerger skipped] Merge "Hide quicksetting tile for dev options when it's turned off" into pi-dev
...
am: 4c16ad5abf
2018-11-20 21:40:53 -08: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
Bill Yi
778b6372aa
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 1ba1a70dfb
2018-11-13 16:58:03 -08: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
1670c69b7c
Merge "Allow StubVolume to be browseable in Settings" am: 8f516adef7
...
am: e613923d66
2018-11-13 11:57:54 -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
e451323669
Merge "Remove the feature flag and dead code for the old time zone picker" am: 6bb4b5ca43
...
am: 78e132773a
2018-11-13 02:03:38 -08: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
Edgar Wang
03aca9f0f9
Merge "Move "About Phone" to bottom of Settings main IA, above "Tips & Support"" into pi-dev
...
am: 96d829be9a
2018-11-12 17:39:43 -08: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
502ad46dc1
Merge "Fix issue that read-only apns can be edited" am: e871464053
...
am: 6b0237ebfb
2018-11-08 17:32:00 -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
Fan Zhang
16d5d7872c
Merge "DO NOT MERGE Fix summary text for advanced button." into pi-dev
...
am: 0eea3b6c9e
2018-11-07 12:59:32 -08: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
Fan Zhang
75fbb4511c
Fix crash when starting daydream setting with wrong context
...
am: d9c6692f25
2018-11-07 10:51:48 -08:00
Clown SHEN
4f2055500a
Merge "Launch WfcActivation with subscription ID" am: bd57f94a4c
...
am: 74fe4a9177
2018-11-06 23:35:41 -08: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
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
b7d0d2cf2d
[automerger skipped] Import translations. DO NOT MERGE
...
am: 222dca5b7c
2018-11-06 07:07:33 -08: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
fe385f4a14
[automerger skipped] Import translations. DO NOT MERGE
...
am: 935509aa3d
2018-11-02 21:26:36 -07:00
