Commit Graph

46213 Commits

Author SHA1 Message Date
Bill Yi
6aa71b3aef [automerger skipped] Import translations. DO NOT MERGE
am: e60e0d2291 -s ours
am skip reason: subject contains skip directive

Change-Id: I27259294f2360a745415605afaf325e37fe8c565
2019-01-19 14:46:03 -08:00
Bill Yi
e60e0d2291 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ie074fc1d702ed2775866c82a126bd8efa8b2865b
2019-01-19 11:34:19 -08:00
Fan Zhang
3de14ebfa2 Merge "Add Dynamic tiles" am: 15bf05f6fd
am: 0d8ea3bfce

Change-Id: I081d9ce4018e6fb7d899655ddeb96c5a9c3eb649
2019-01-17 17:26:39 -08:00
Fan Zhang
0d8ea3bfce Merge "Add Dynamic tiles"
am: 15bf05f6fd

Change-Id: I0998725bc59e1d4f9b8afff388c2a9a3c680423c
2019-01-17 17:08:14 -08:00
Fan Zhang
15bf05f6fd Merge "Add Dynamic tiles" 2019-01-18 00:47:52 +00:00
jin.dong
b82df9bd43 Add Dynamic tiles
Add new CategoryKey for screens below:
    about_legal.xml
    my_device_info.xml
    battery_saver_settings.xml

Bug: 113249409
Change-Id: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
Merged-In: I3cdad9b6ceeba0df3e0e9db4607daffcc5cbdc8b
2019-01-16 00:54:07 +00:00
Anton Hansson
850fdb32e9 Merge "Make the Settings permission a required module" am: 480b56e3d6
am: bc79e6e6f3

Change-Id: I775d8b3a84ef2c1eccfb8d590e97ee1dcbeedf5d
2019-01-14 08:15:32 -08:00
Anton Hansson
bc79e6e6f3 Merge "Make the Settings permission a required module"
am: 480b56e3d6

Change-Id: I2316d82bb50778e6f524d708cc1711dcd69f1f9d
2019-01-14 08:11:21 -08:00
Anton Hansson
480b56e3d6 Merge "Make the Settings permission a required module" 2019-01-14 16:03:16 +00:00
Anton Hansson
09064cf6d9 Make the Settings permission a required module
This will include the Settings permission file whenever
the Settings app is installed.

Bug: 110072687
Test: make
Exempt-From-Owner-Approval: cp from internal
Change-Id: Ia2548355282498bceeffddb564de32a6cb857c66
Merged-In: Ia2548355282498bceeffddb564de32a6cb857c66
(cherry picked from commit 16322a0271)
2019-01-14 15:50:28 +00:00
Anton Hansson
403fe5d83c Merge "Move Settings app to /product" am: 0a399bf543
am: 297fe94122

Change-Id: I6f04ca71a2a4af1cfb4bc07019f991bc845fd8e6
2019-01-14 01:50:56 -08:00
Anton Hansson
297fe94122 Merge "Move Settings app to /product"
am: 0a399bf543

Change-Id: Ia4a28ee04e834727d7cfa86e67f1038f16aeee1d
2019-01-14 01:22:53 -08:00
Anton Hansson
0a399bf543 Merge "Move Settings app to /product" 2019-01-14 09:06:25 +00:00
Bill Yi
004425d2b9 [automerger skipped] Import translations. DO NOT MERGE
am: e18f734843 -s ours
am skip reason: subject contains skip directive

Change-Id: I7eeb038b93fe47601b946e74d0309e6923e048d5
2019-01-13 16:39:54 -08:00
Bill Yi
e18f734843 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I8d9dbbd271f3d3eb6e889e213fc2cfa4a6546cbe
2019-01-12 23:00:35 -08:00
Anton Hansson
9a7786b3e1 Move Settings app to /product
Since this app is frequently customized by OEMs, it doesn't
fit in the mainline /system image right now. Move it to
/product.

Bug: 110072687
Test: make
Change-Id: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
Merged-In: Iee5940125af3f2a8543ecb3a68d7fba737acd77d
(cherry picked from commit f109282c8e)
2019-01-11 16:41:54 +00:00
Nathan Harold
c015a1bac0 Merge "Fix BandMode Dialog Crash on Open due to Style" am: 7588ef1518
am: 7aacdc2c13

Change-Id: I50588e17f07d89daa3a989a72080a4fe695b4729
2019-01-07 17:31:14 -08:00
Nathan Harold
7aacdc2c13 Merge "Fix BandMode Dialog Crash on Open due to Style"
am: 7588ef1518

Change-Id: I0dd365652f4deac7b69b181317b0dd86610400a7
2019-01-07 17:16:52 -08:00
Nathan Harold
7588ef1518 Merge "Fix BandMode Dialog Crash on Open due to Style" 2019-01-08 00:18:21 +00:00
Ruchi Kandoi
a7c886925f Merge "Add support for FEATURE_NFC_ANDROID_BEAM" am: 6827785e52
am: 39845367ab

Change-Id: Ia7fc968221a6eb314a9ee384e0dd84d3aa0e84b4
2019-01-04 14:07:48 -08:00
Ruchi Kandoi
39845367ab Merge "Add support for FEATURE_NFC_ANDROID_BEAM"
am: 6827785e52

Change-Id: I7c71bad831892bf9a853ca5d4777e42c1b3a9171
2019-01-04 13:58:22 -08:00
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