Commit Graph

52810 Commits

Author SHA1 Message Date
cosmohsieh
a79783ca2a Improve some comments of strings and codes
1) Correct improper function comment about forget menu
2) Extends char limit of wifi_scan_always_turn_on_message_unknown for
translation.
3) Correct string comment on Saved networks summary

Bug: 130628569
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.WifiSettingsTest
Change-Id: I0e60e4f205c794367dfffc032cb4334dac4d1cdd
2019-04-21 15:35:58 +08:00
Bill Yi
d3b475fc67 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: f263f489e2 -s ours
am: b2e51354e7 -s ours
am skip reason: subject contains skip directive

Change-Id: I0b441b44c99d3ff62e52197c79f3d8d31a0386e5
2019-04-20 21:55:41 -07:00
Bill Yi
b2e51354e7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: f263f489e2 -s ours
am skip reason: subject contains skip directive

Change-Id: I29eb85d5002e7028c1e9fcd24f736c7586f4310e
2019-04-20 21:50:42 -07:00
TreeHugger Robot
f263f489e2 Merge "Import translations. DO NOT MERGE" into qt-dev 2019-04-21 04:43:31 +00:00
TreeHugger Robot
4428eb0624 Merge "Import translations. DO NOT MERGE" 2019-04-21 02:42:38 +00:00
Bill Yi
80d2278070 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I681232854213f3b89d0543d30c640622d759a396
2019-04-20 17:58:18 -07:00
Bill Yi
7cd3661791 Import translations. DO NOT MERGE
Change-Id: I90c45c06f57d03b07411318467c38abc0b725c55
Auto-generated-cl: translation import
2019-04-20 17:15:08 -07:00
Jonathan Scott
1f8154690f Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev am: 5a8cf48813
am: 28a697103d

Change-Id: Id394e1495f49fdca0353a7d9111ecf2273bf7ab1
2019-04-20 16:29:55 -07:00
Jonathan Scott
28a697103d Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
am: 5a8cf48813

Change-Id: Icea3822382cd2d6c21cedeb1560c4ed2f316d316
2019-04-20 16:24:57 -07:00
TreeHugger Robot
5a8cf48813 Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev 2019-04-20 23:16:25 +00:00
TreeHugger Robot
fbaae11bd7 Merge "Remove deprecated AccessPoint#getConfigName() in SavedNetworkComparator" 2019-04-20 22:09:41 +00:00
Mark Chien
826f37e86a [automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev am: 77b7618138 -s ours
am: 3e4c927e60 -s ours
am skip reason: change_id Id3157df1a5758f8c72acbc45c9fefd2215c87395 with SHA1 f9f0d11782 is in history

Change-Id: I5a7065ffa586b4696bbc0f874e7368c6fb4244bb
2019-04-20 00:00:19 -07:00
Mark Chien
57659716d0 Merge "Ignore the outdated entitlement check" am: d7885ca73a am: 7b30503dc4
am: f886be6999

Change-Id: Ic2cd5ed57ec675d0ad13521cc354a1eb4cc38d69
2019-04-19 23:45:35 -07:00
Mark Chien
3e4c927e60 [automerger skipped] Merge "Ignore the outdated entitlement check" into qt-dev
am: 77b7618138 -s ours
am skip reason: change_id Id3157df1a5758f8c72acbc45c9fefd2215c87395 with SHA1 f9f0d11782 is in history

Change-Id: I567c0256f1fbb449b7c7fe2b186b5455a7425d9a
2019-04-19 22:06:49 -07:00
Mark Chien
77b7618138 Merge "Ignore the outdated entitlement check" into qt-dev 2019-04-20 04:41:52 +00:00
Mark Chien
f886be6999 Merge "Ignore the outdated entitlement check" am: d7885ca73a
am: 7b30503dc4

Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b
2019-04-19 21:07:49 -07:00
Mark Chien
7b30503dc4 Merge "Ignore the outdated entitlement check"
am: d7885ca73a

Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9
2019-04-19 20:26:15 -07:00
Beverly
91d48e2c31 Merge "Allow up two lines of text on dnd restrict notif" into qt-dev am: f09245150d
am: 08de5537ef

Change-Id: Ibe64d01921a30d9538af0641c01a68112d12657d
2019-04-19 19:06:04 -07:00
Mark Chien
d7885ca73a Merge "Ignore the outdated entitlement check" 2019-04-20 02:05:33 +00:00
Lei Yu
88ba448b3a Merge "Fix battery robo test" into qt-dev am: fc48118694
am: 87bdcd3ce2

Change-Id: I06ff2450d1757a4ae45a28866084f7bb377c8a30
2019-04-19 18:56:31 -07:00
Salvador Martinez
f0ecd2bf7d Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev am: 022af8ca10
am: 72d99dd38c

Change-Id: I2b9279b3f11abef1719c6d23fa998774aa983af8
2019-04-19 18:07:31 -07:00
Fan Zhang
1b1bfc6508 Merge "Fix typo" into qt-dev am: 33f136fdec
am: cd576bfaae

Change-Id: I97b8d4fb843805b97317b94c85865497aac1543e
2019-04-19 18:06:38 -07:00
Fan Zhang
812db12067 Merge "Add a way to suppress injected tiles for OEMs" into qt-dev am: ac76a480bd
am: 4a4b2a5b00

Change-Id: I9873cb57e2bc2fd7584527d39215b80a2381161b
2019-04-19 18:05:50 -07:00
Fan Zhang
85e4de5122 Merge "Add @Ignore for all failing tests." into qt-dev am: 1830440231
am: 5a0629d12f

Change-Id: I9d7e1906b3e5b0b213d5d3d4e1e90ca1acf4f4a9
2019-04-19 18:04:49 -07:00
Beverly
08de5537ef Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
am: f09245150d

Change-Id: I159f4c670c2a103fe5c3fdb87e62e0e21a42bc5b
2019-04-19 17:28:45 -07:00
Lei Yu
87bdcd3ce2 Merge "Fix battery robo test" into qt-dev
am: fc48118694

Change-Id: Id0bcad14d216bb2718435dffdb802e105af440d4
2019-04-19 17:20:53 -07:00
TreeHugger Robot
f09245150d Merge "Allow up two lines of text on dnd restrict notif" into qt-dev 2019-04-19 23:20:10 +00:00
TreeHugger Robot
fc48118694 Merge "Fix battery robo test" into qt-dev 2019-04-19 23:13:51 +00:00
Salvador Martinez
72d99dd38c Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
am: 022af8ca10

Change-Id: Ie0e16d985ef878e9989ad4037947ff57e34749fc
2019-04-19 15:56:21 -07:00
Lei Yu
5fbde81391 Merge "Add SettingsPolicy to control BT feature" into qt-dev am: 125ab50a55
am: 142ca23949

Change-Id: I7f9b2c921651ba9e6163fb7ecc22db370a52196d
2019-04-19 15:55:15 -07:00
Fan Zhang
cd576bfaae Merge "Fix typo" into qt-dev
am: 33f136fdec

Change-Id: If6ba4153c8f642643054e1f7e949d4111a6e3b7e
2019-04-19 15:54:48 -07:00
Fan Zhang
4a4b2a5b00 Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
am: ac76a480bd

Change-Id: I5d72983c4c9cda2a6cfb36fb5931dfdff00ac45f
2019-04-19 15:53:26 -07:00
Fan Zhang
5a0629d12f Merge "Add @Ignore for all failing tests." into qt-dev
am: 1830440231

Change-Id: Ic779b72c3bf3a06e32c7dbe11f87e654baf70664
2019-04-19 15:21:59 -07:00
Salvador Martinez
022af8ca10 Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev 2019-04-19 22:00:27 +00:00
Jonathan Scott
4316259aa0 Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE
This is already covered by
getAvailabilityStatus_somePackagesAllowed_shouldBeAvailable and
getAvailabilityStatus_allPackagesAllowed_shouldBeAvailable.

Test: make RunSettingsRoboTests -j40 ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest
Fixes: 130896049
Change-Id: I3dbbbde693750c69e042f7c19143730cc8e313ff
2019-04-19 22:19:21 +01:00
Fan Zhang
5c9db0cb5e Fix CodeInspectionTest
Fixes: 130897640
Test: robo
Change-Id: Ic2d952e4d76bb0a2be6eab7ddc999b56656132a6
2019-04-19 14:14:51 -07:00
Lei Yu
2632f45010 Fix battery robo test
Fixes: 130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
2019-04-19 13:41:22 -07:00
Fan Zhang
33f136fdec Merge "Fix typo" into qt-dev 2019-04-19 20:32:37 +00:00
Fan Zhang
5d705839f2 Fix typo
Bug: 130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97
2019-04-19 13:31:52 -07:00
Fan Zhang
ac76a480bd Merge "Add a way to suppress injected tiles for OEMs" into qt-dev 2019-04-19 20:30:24 +00:00
Fan Zhang
1830440231 Merge "Add @Ignore for all failing tests." into qt-dev 2019-04-19 20:28:47 +00:00
Fan Zhang
ef2e91913b Add @Ignore for all failing tests.
Bug: 130896210
Bug: 130896218
Bug: 130896701
Bug: 130897882
Bug: 130897305
Bug: 130897640
Bug: 130896049
Test: robo
Change-Id: I77143d504501b358c2103aa736cd2aad13ed4c5c
2019-04-19 13:23:29 -07:00
Lei Yu
142ca23949 Merge "Add SettingsPolicy to control BT feature" into qt-dev
am: 125ab50a55

Change-Id: I46f37c9a1ac92bd3e77e2a2f8ff185a72436851e
2019-04-19 13:18:15 -07:00
Lei Yu
acb617855a Remove feature flag for slice injection
Since we already use SettingsUIDeviceConfig in this case, we can remove
feature flag safely.

Fixes: 121154979
Test: Manual
Change-Id: Ibf71f1109fd506feba5a02bf6ecd804c6b7ee8d4
2019-04-19 13:13:03 -07:00
Lei Yu
125ab50a55 Merge "Add SettingsPolicy to control BT feature" into qt-dev 2019-04-19 19:44:53 +00:00
Lei Yu
5d85dfb123 Add mms preference and controller
Only visible when it is metered and mobile data off.
Also refactor one mobile data observer so we can reuse it.

Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Id218f51da3c373fad98c1a39cfadd6b0e8c46a88
2019-04-19 11:25:14 -07:00
Linda Tseng
7e8d682188 Merge "Set max num of slices allowed in panel view" into qt-dev am: ae344faf4a
am: 67928018b3

Change-Id: Idbab620c65b8dbd65b721caca3e669f89baeed36
2019-04-19 11:07:16 -07:00
Linda Tseng
67928018b3 Merge "Set max num of slices allowed in panel view" into qt-dev
am: ae344faf4a

Change-Id: Id9ffef1fd7a7007a143661b221dd9d82dc9858b5
2019-04-19 10:36:41 -07:00
Salvador Martinez
6a81e41c7c Update battery stuff to use SettingsLib Estimate class
This will make the upcoming consistency Cl easier to implement.

Test: Robotests still pass
Bug: 124030091
Change-Id: Ief4989e2b5f9b83b5c3b93d17f9f9fa12136f3ee
2019-04-19 17:35:23 +00:00
Yanting Yang
4e56cb2917 Add a way to suppress injected tiles for OEMs
Create a config resource for OEMs to add suppressed tile's key, then
DashboardFragment will filter related tiles out from Settings.

OEMs can use this way to suppress security patch injected tile if they
don't use Google OTA.

Fixes: 130734771
Test: visual, robotests
Change-Id: I4cab79c8672048fa543d39b2a8f38ffe338189c8
2019-04-20 01:31:07 +08:00