Alex Salo
7bb8466d96
Merge "Remove todo comment" into qt-dev
...
am: 37db031aa1
Change-Id: If7ae4aab6b59ebe0b6a759cd464d9054b11be3b0
2019-04-22 18:20:57 -07:00
cosmohsieh
b7fc587b5b
Merge "Improve some comments of strings and codes" into qt-dev
...
am: 0bc3fac6d9
Change-Id: I7638a753e235ae4dee29cb0294918e896089d85e
2019-04-22 18:01:09 -07:00
Kevin Chyn
012ba13cb3
Merge "Update enrollment footer icon" into qt-dev
...
am: c9239e11b6
Change-Id: I64f8178d7838781ddc3f1a86117e59f9ca81617a
2019-04-22 18:00:13 -07:00
Kevin Chyn
38d44c96a0
Merge "Update introduction layout spacing" into qt-dev
...
am: 89f0d5274a
Change-Id: I197d2451018bf3b6ae4d9135fd716fcaab0797b7
2019-04-22 17:55:21 -07:00
Lei Yu
787e15fbe5
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
...
am: 357825d228
Change-Id: I5e64d99af01a568f2f98fbda0240ca09e85fc65c
2019-04-22 17:50:40 -07:00
Fan Zhang
d1bc5895b0
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
...
am: 5e42b894bc
Change-Id: Id3fc9e6a6e211d530d4b33a0050fafd0de11e2d7
2019-04-22 17:32:32 -07:00
TreeHugger Robot
37db031aa1
Merge "Remove todo comment" into qt-dev
2019-04-23 00:19:26 +00:00
TreeHugger Robot
0bc3fac6d9
Merge "Improve some comments of strings and codes" into qt-dev
2019-04-23 00:04:56 +00:00
Hyunyoung Song
205bac7c26
Reduce binder call to OverlayManager (3->1)
...
Bug: 131112014
Test: builds, manually tested
Change-Id: I1f0fba30a55713be92b8755c0793ee84928f9d5e
2019-04-22 16:59:45 -07:00
Kweku Adams
1db16a7d4b
Using explicit Looper in Handler initialization.
...
Bug: 130639146
Test: flash device and toggle settings
Change-Id: I40d0578487c94da9fc9d940089bacbddf3a43751
2019-04-22 16:52:48 -07:00
Kevin Chyn
c9239e11b6
Merge "Update enrollment footer icon" into qt-dev
2019-04-22 23:23:16 +00:00
Kevin Chyn
89f0d5274a
Merge "Update introduction layout spacing" into qt-dev
2019-04-22 23:16:39 +00:00
Lei Yu
357825d228
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
2019-04-22 22:57:24 +00:00
Lei Yu
41ad7a5bb4
Test fix: Add MmsPreferenceController to whitelist
...
Add it to grandfather_slice_controller_not_in_xml since right now
it only exists in mobile_network_settings_v2.xml, not v1.
This should be fixed automatically once we remove all old code.
Bug: 130222866
Test: RunSettingsRoboTests
Change-Id: Ib0bc976fd31818d7b39ca9f3e7427859fd7175ff
2019-04-22 15:55:16 -07:00
Fan Zhang
5e42b894bc
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
2019-04-22 22:48:59 +00:00
Fan Zhang
d9fb048712
Merge "Fix CodeInspectionTest" into qt-dev
...
am: 4b54ad9bd5
Change-Id: I9f5885c5c9e52019ea9142337b18722e903a459c
2019-04-22 15:14:51 -07:00
Alex Salo
eaa5d1ffa3
Remove todo comment
...
Bug: 129352433
Test: not needed
Change-Id: I7aa7840c0852c17ed05dba684fdd84cb7d5ad4ed
2019-04-22 14:55:28 -07:00
TreeHugger Robot
4b54ad9bd5
Merge "Fix CodeInspectionTest" into qt-dev
2019-04-22 21:37:29 +00:00
Kevin Chyn
338883034f
Update enrollment footer icon
...
Fixes: 131094701
Test: Builds
Change-Id: I9e1a75986ffeb35791271d55bf05a2daa9af5bad
2019-04-22 12:38:33 -07:00
Fan Zhang
12533b9588
Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5
...
The previous change removed summary text for gesture settings too
aggresively. We still need summary in main Settings app, just not in
search.
Fixes: 130652619
Test: manual
Change-Id: I95ae3ca31b34a514f10993413527e987cf67d998
2019-04-22 12:28:07 -07:00
Kevin Chyn
c5ae8a7bab
Update introduction layout spacing
...
Bug: 130740990
Test: builds
Change-Id: I2c10d991097fcdb7eb0775f744b5b12af2597780
2019-04-22 11:51:29 -07:00
Lei Yu
7ec9c1db1d
Merge "Add mms preference and controller" into qt-dev
...
am: f3365e911d
Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd
2019-04-22 11:14:34 -07:00
Lei Yu
cbb86c71b6
Merge "Remove feature flag for slice injection" into qt-dev
...
am: fe393599a0
Change-Id: I8cb5753b3d809811464b8410e3b26be35e0efca6
2019-04-22 11:10:37 -07:00
Lei Yu
f3365e911d
Merge "Add mms preference and controller" into qt-dev
2019-04-22 17:55:34 +00:00
Lei Yu
fe393599a0
Merge "Remove feature flag for slice injection" into qt-dev
2019-04-22 17:49:52 +00:00
Tim Peng
568520bdf5
Remove "Play media to" when no connected device
...
am: 99ed023ca4
Change-Id: I462ce390a7addc95ceacb0f0a4e48382ac34aed5
2019-04-22 10:03:39 -07:00
clownshen
922b555dfb
Fix WifiDetailPreferenceControllerTest failure
...
Bug: 130896210
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I994fbc4a67f4c58afebb38316555f8e1442b96c0
2019-04-22 18:33:46 +08:00
Tim Peng
99ed023ca4
Remove "Play media to" when no connected device
...
Bug: 130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc
2019-04-22 06:09:36 +00:00
Yi-Ling Chuang
8b2e0a5768
Expand advanced button by default in Notifications.
...
When users search for a certain preference hidden in advanced group
in Notifications page, we should expand the advanced button so
users can see the highlighted preference.
Fixes: 130655529
Test: visual
Change-Id: I6a166ddd1e741651d3a3a76ccfc37c58eafdf7e1
2019-04-22 12:26:21 +08:00
clownshen
60013de198
Correct detail page UI once user change MAC randomized setting
...
Changing MAC randomized setting will disconnect and reconnect Wi-Fi in
the background automatically. UI display as disconnect even AP
reconnected. Fix this problem and also remove some obsolete code.
Another problem is connect button display as disabled with
"Connecting..." wording after user click connect then change the MAC
randomized setting.
Bug: 130370187
Test: Manual test with test case in go/wifi_connnection_btn_design
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: Id87c3db0cc785a9ceb3a71c7cbb78ffd87ffb0a1
2019-04-22 11:44:37 +08:00
Arc Wang
bf627839d7
Change description string of Wi-Fi add device
...
Bug: 130825364
Test: manual
Change-Id: Ic633cfa80475a438be94fabb0527c24ec9df39a9
2019-04-22 11:06:16 +08:00
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
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
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
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
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
Mark Chien
d7885ca73a
Merge "Ignore the outdated entitlement check"
2019-04-20 02:05:33 +00: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
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