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
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
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
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
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
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
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
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
android-build-team Robot
36cdfcf838
Snap for 5101444 from 7849607a7c to pi-qpr2-release
...
Change-Id: I0f8379a2470ce61035c289a5c1f84f5675423501
2018-10-31 03:05:05 +00:00
Lei Yu
73c361b544
Revert "resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp"
...
This reverts commit e81224d80c
2018-10-29 20:35:24 +00:00
Lei Yu
e81224d80c
resolve merge conflicts of 7849607a7c to pi-dev-plus-aosp
...
Bug: 115707279
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ifd8f2c090ccd9eadbc7b789b927550bce732f1d1
Merged-In: I3d2ebad2879479a870bcdfe596bb88b83c424389
2018-10-25 14:25:21 -07:00
Lei Yu
7849607a7c
Merge "Add entitlement check for usb tethering" into pi-dev
2018-10-25 19:58:53 +00:00
Bill Yi
816e75fbc3
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE am: 8b16aba0dd -s ours
...
am: 27e14db009
2018-10-24 18:53:10 -07:00
Bill Yi
27e14db009
[automerger skipped] Merge pie-platform-release to aosp-master - DO NOT MERGE
...
am: 8b16aba0dd
2018-10-24 16:31:58 -07:00
