Treehugger Robot
6827785e52
Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
2019-01-04 21:49:14 +00:00
Nathan Harold
63b1ab12f6
Fix BandMode Dialog Crash on Open due to Style
...
This sidesteps an error saying that the radio
BandMode activity must inherit from an AppCompat
style. Instead the window is now full-screen and
matches the theme of the RadioInfo menu.
Bug: 117571514
Test: manual - open the activity without a crash and
verify that the new style change is effective.
Change-Id: I6e49d731e039709db43dfa6531723781e9e48640
2019-01-03 09:51:49 -08:00
Bill Yi
5285ef3490
[automerger skipped] Import translations. DO NOT MERGE
...
am: 9e39db9d62
-s ours
Change-Id: I7fee4d617fe40d725dbd8bee03e138b95fb3cb9c
2018-12-28 18:03:18 -08:00
Bill Yi
9e39db9d62
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I2fd8dffe12b55f223316b37c9c097194e7cf426f
2018-12-28 13:41:40 -08:00
Pengquan Meng
1f2ba13698
Merge "Add PreferenceChangeListener to ApnSettings" am: 66d28c3e37
...
am: 9745ec5421
Change-Id: I6a6021f131f568b51fb491248d71e4ccbcdc49ef
2018-12-27 15:55:34 -08:00
Pengquan Meng
9745ec5421
Merge "Add PreferenceChangeListener to ApnSettings"
...
am: 66d28c3e37
Change-Id: Ideef529174f7b8b89f5668f7c9366cea090df68f
2018-12-27 15:51:21 -08:00
Pengquan Meng
66d28c3e37
Merge "Add PreferenceChangeListener to ApnSettings"
2018-12-27 23:36:18 +00:00
Lei Yu
2b976cce96
[automerger skipped] Merge "Update color-check-baseline.xml" am: 81cb8a2612
-s ours
...
am: 3461bd0644
-s ours
Change-Id: I6e510de1b75e2656e4f82727e2a9911f3e32d8d7
2018-12-27 13:49:35 -08:00
Lei Yu
3461bd0644
[automerger skipped] Merge "Update color-check-baseline.xml"
...
am: 81cb8a2612
-s ours
Change-Id: Id047f4c0964dc1f38ebf4c1afc46796c9c793ea1
2018-12-27 13:45:22 -08:00
Lei Yu
81cb8a2612
Merge "Update color-check-baseline.xml"
2018-12-27 21:35:31 +00:00
Pengquan Meng
2f434aa7ca
Add PreferenceChangeListener to ApnSettings
...
The PreferenceChangeListener was removed from aosp/779634, when the
selected apn is changed, the result is not saved to the database.
In this CL, we add the PreferenceChangeListener back.
Bug: 121229775
Test: build & manual test
Change-Id: Ief1a2e05c072e5eff8060731b044c19878d346be
2018-12-27 13:27:26 -08:00
Bill Yi
9ad826208e
[automerger skipped] Import translations. DO NOT MERGE
...
am: 05cf17a925
-s ours
Change-Id: I2c59a155b3d113099069840a08da8d90f8d1543c
2018-12-21 17:21:21 -08:00
Bill Yi
05cf17a925
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 118717573
Change-Id: Ifd74addec939651ce1aafca0d422f7fb65553a3a
2018-12-21 16:07:42 -08:00
Lei Yu
3cab6d51fb
Update color-check-baseline.xml
...
Since these colors are already fixed in internal master(ag/4164571).
This CL only update the baseline and won't merge down.
Change-Id: I19dbca351fb786b9dbbb84bf7f50ccc0347bd0cf
Merged-In: Ic361155d7cd36a2f1cca96e918af0e3855fb8ced
Fixes: 110960820
Test: repohook
2018-12-21 14:20:01 -08:00
Jack Yu
a91d29f5f0
Merge "Moved data settings to phone" am: bcd6a7db39
...
am: 67475a5c66
Change-Id: I5ae8d51ffbdfa41c0cfacd49a2d10524f6abdd25
2018-12-20 19:13:21 -08:00
Jack Yu
67475a5c66
Merge "Moved data settings to phone"
...
am: bcd6a7db39
Change-Id: I8fde45278c4a5db14f986ea87ab2bfa15b7507ab
2018-12-20 19:01:06 -08:00
Jack Yu
bcd6a7db39
Merge "Moved data settings to phone"
2018-12-21 02:29:43 +00:00
Calvin Pan
8c758f5ce7
Merge "Rename SIM_APN_LIST to SIM_APN_URI" am: d594716359
...
am: a49da46d96
Change-Id: Ifa3dd2166fadd7c4fce234adedd6db3df3fcf577
2018-12-20 18:22:01 -08:00
Calvin Pan
a49da46d96
Merge "Rename SIM_APN_LIST to SIM_APN_URI"
...
am: d594716359
Change-Id: If8708a4d84fd8dce4c7e66507320cd35369331b2
2018-12-20 17:48:19 -08:00
Calvin Pan
d594716359
Merge "Rename SIM_APN_LIST to SIM_APN_URI"
2018-12-21 01:31:44 +00:00
Jack Yu
e5accf70fb
Moved data settings to phone
...
Since there are multiple DcTrackers, but we only have
one set of data settings. So we need to move them from
DcTracker to Phone.
Test: Telephony sanity tests + unit tests
Bug: 73659459
Merged-In: If11a6eff057a18b4aa97addbb348537bd3194e1a
Change-Id: If11a6eff057a18b4aa97addbb348537bd3194e1a
(cherry picked from commit 50972ed89e
)
2018-12-20 15:23:11 -08:00
Inseob Kim
9d78bf6557
Merge "Remove unused system properties" am: fd0426d438
...
am: c3eb0887b0
Change-Id: If0837ac203b720b57868c1e6bbb64b05f7f8ffbf
2018-12-20 01:42:16 -08:00
Inseob Kim
c3eb0887b0
Merge "Remove unused system properties"
...
am: fd0426d438
Change-Id: I6f33268a640fb14ec8e9cd2fc5acec94ac25697d
2018-12-20 01:37:03 -08:00
Treehugger Robot
fd0426d438
Merge "Remove unused system properties"
2018-12-20 09:24:39 +00:00
calvinpan
9b56a8b278
Rename SIM_APN_LIST to SIM_APN_URI
...
In Telephony SIM_APN_LIST had been rename to SIM_APN_URI.
Bug: 120031619
Test: Build pass.
Change-Id: I203c765c7ba6ee468f76dbfdb84b50c787ac8dbe
2018-12-20 07:09:42 +00:00
Inseob Kim
1119bb9399
Remove unused system properties
...
Properties ro.config.license_path and ro.config.manual_path are not set
from anywhere but only from a test.
Bug: N/A
Test: mma -j
Change-Id: I651405f3a201f5129bf37059e96e7bcc5efa73bf
Merged-In: I651405f3a201f5129bf37059e96e7bcc5efa73bf
2018-12-20 00:33:24 +00:00
Ruchi Kandoi
b7251fa693
Add support for FEATURE_NFC_ANDROID_BEAM
...
Test: Check if app shows the Toggle switch
Bug: 117519147
Change-Id: I395653dd977dc9b149fc343b533d15df71affaf1
2018-12-18 16:08:43 -08:00
Josh Hou
ff5d0b0ac6
Merge "Refine APN fetching logic" am: 765621670b
...
am: 74069bc022
Change-Id: I372d73a75a7dd2077e39dfc29c66b29b1a3ace65
2018-12-17 00:25:12 -08:00
Josh Hou
74069bc022
Merge "Refine APN fetching logic"
...
am: 765621670b
Change-Id: Ib0a1dd0b3f944d5a98b71555a48aadacfb228543
2018-12-17 00:16:01 -08:00
Treehugger Robot
765621670b
Merge "Refine APN fetching logic"
2018-12-17 08:03:04 +00:00
Josh Hou
e519cd6e68
Refine APN fetching logic
...
APN fetching logic has been encapsulated in URL_SIM_APN_LIST API in
TelephonyProvider
Bug: 115709816
Test: Live network test
Change-Id: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
Merged-In: I735bc50e912dfbec0903fbcafdc4d6eaa6ccfc7b
2018-12-17 07:16:50 +00:00
Inseob Kim
744a9d1316
Revert "Revert "Schematize vold system properties""
...
am: 97b0fe0ac6
Change-Id: I8b6e78df6e31500df448addb82bed9d2c11c8fec
2018-12-13 16:14:41 -08:00
Inseob Kim
97b0fe0ac6
Revert "Revert "Schematize vold system properties""
...
This reverts commit 49e81e0eea
.
Reason for revert: Fixed breakage
Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: I5f75b15ab792329cdb9bf2dd2e4b42bccb6eb0f3
(cherry picked from commit 8346eb5ccc
)
2018-12-13 15:36:39 -08:00
Xin Li
e92deab316
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 889a8a3757
-s ours
...
am: a817ea5e80
-s ours
Change-Id: Ie235529d9065bdc9f258f91ba8206cda6d96379e
2018-12-13 13:13:47 -08:00
Xin Li
a817ea5e80
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
...
am: 889a8a3757
-s ours
Change-Id: Ide998fc70c7beb72b1bcf878783a5429268d1aeb
2018-12-13 13:09:45 -08:00
Xin Li
e21ca76caf
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 419086d8b3
-s ours
...
am: 7768155274
-s ours
Change-Id: I91475b01f6a1fa9f64f384ee6351e237c3e79c85
2018-12-13 12:19:49 -08:00
Xin Li
7768155274
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
am: 419086d8b3
-s ours
Change-Id: I620bd09f7331acdb7a6a8377cb02d4ccea4293f8
2018-12-13 11:24:06 -08:00
Treehugger Robot
889a8a3757
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master"
2018-12-13 05:45:20 +00:00
Xin Li
2c2f179630
[automerger skipped] Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
...
am: 2d744bd9e1
-s ours
Change-Id: Ia5bc1d228449c6f78d54f25c392b3ea33c80ddef
2018-12-11 15:54:17 -08:00
Xin Li
419086d8b3
DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
...
Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1
2018-12-11 15:24:05 -08:00
Xin Li
dfd5b86302
[automerger skipped] DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
am: 5134815af5
-s ours
Change-Id: I2bb19a2cb832111ee29ef3762c3b13808dde3b11
2018-12-11 15:07:53 -08:00
TreeHugger Robot
2d744bd9e1
Merge "DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master" into stage-aosp-master
2018-12-11 21:49:26 +00:00
Inseob Kim
fe9f5c42f6
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties""" am: cc24a22da9
-s ours
...
am: 95a1128814
-s ours
Change-Id: Id55802e6e5395a0f748f5b125d551b64c22473f1
2018-12-11 03:34:42 -08:00
Inseob Kim
95a1128814
[automerger skipped] Merge "Revert "Revert "Schematize vold system properties"""
...
am: cc24a22da9
-s ours
Change-Id: I19f28ff740c8cf3bb0ec1d68cef80563998154f2
2018-12-11 03:26:07 -08:00
Treehugger Robot
cc24a22da9
Merge "Revert "Revert "Schematize vold system properties"""
2018-12-11 11:04:01 +00:00
Xin Li
5134815af5
DO NOT MERGE: Merge pie-platform-release (PPRL.181205.001) into stage-aosp-master
...
Bug: 120502534
Change-Id: I4993ed4cbd133e995e950298c65ad57c73c9a5f3
2018-12-10 15:12:59 -08:00
Inseob Kim
8346eb5ccc
Revert "Revert "Schematize vold system properties""
...
This reverts commit 49e81e0eea
.
Reason for revert: Fixed breakage
Change-Id: I414b753a218d9baf3d24530ff14df7644eb148e0
Merged-In: Id2a696c621015d46015d5de0e7aef987e9e01b54
2018-12-10 13:03:37 +00:00
Anthony Stange
c7a5a2f39a
Merge "Revert "Schematize vold system properties"" am: 94ef16b6e3
...
am: a35a0418c1
Change-Id: I7ca5d4d85897ac4d2d851c05b9f69c986f6a662a
2018-12-07 04:38:25 -08:00
Anthony Stange
a35a0418c1
Merge "Revert "Schematize vold system properties""
...
am: 94ef16b6e3
Change-Id: If9a59cfa4939e3ef2cdc7c50e0151c33c58b24aa
2018-12-07 04:30:15 -08:00
Anthony Stange
94ef16b6e3
Merge "Revert "Schematize vold system properties""
2018-12-07 12:04:56 +00:00