OSDN Git Service
Kweku Adams [Tue, 23 Apr 2019 22:21:54 +0000 (15:21 -0700)]
Merge "Using explicit Looper in Handler initialization." into qt-dev am:
bb1d4e7f1e
am:
6b91eb3047
Change-Id: Iff6065d49960e71fd8527752e65f2b964ed94b19
Andrew Sapperstein [Tue, 23 Apr 2019 22:13:36 +0000 (15:13 -0700)]
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev am:
28cfb72aaa
am:
b2ad73da8e
Change-Id: I2d267d88965d3db10849ece1a920f27f75687590
Hyunyoung Song [Tue, 23 Apr 2019 22:10:06 +0000 (15:10 -0700)]
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev am:
5f328aff51
am:
e85166328c
Change-Id: Ic68b26bbe3daa61650b78bc00372566a3194e97a
Arc Wang [Tue, 23 Apr 2019 21:49:05 +0000 (14:49 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev am:
79f75e483f
am:
a23f01673b
Change-Id: I4c22fc284b5ae87dd04cfe5052a400421657f22c
Beverly [Tue, 23 Apr 2019 21:23:35 +0000 (14:23 -0700)]
Merge "Remove "unless turned on automatically" text" into qt-dev am:
87158ed0b2
am:
cab31cf14c
Change-Id: I653f40988ee3074aaa6406fb457d10672dc0059d
Kweku Adams [Tue, 23 Apr 2019 19:24:50 +0000 (12:24 -0700)]
Merge "Using explicit Looper in Handler initialization." into qt-dev
am:
bb1d4e7f1e
Change-Id: Iacf57a71ef728c6c0954973b6811825c47931ccd
Andrew Sapperstein [Tue, 23 Apr 2019 19:19:11 +0000 (12:19 -0700)]
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
am:
28cfb72aaa
Change-Id: I5543b540f1b61a4c0f844f11886e45d56959162d
Hyunyoung Song [Tue, 23 Apr 2019 19:12:12 +0000 (12:12 -0700)]
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev
am:
5f328aff51
Change-Id: Ief93c695a1c160fe4c53f4492d1b2c25eac59ce0
Arc Wang [Tue, 23 Apr 2019 18:57:02 +0000 (11:57 -0700)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
am:
79f75e483f
Change-Id: I66646329c5f7813679dc8181ddd70d1cc3b4d3e6
TreeHugger Robot [Tue, 23 Apr 2019 18:28:56 +0000 (18:28 +0000)]
Merge "Using explicit Looper in Handler initialization." into qt-dev
Andrew Sapperstein [Tue, 23 Apr 2019 18:18:41 +0000 (18:18 +0000)]
Merge "Fix WifiDetailPreferenceControllerTest new test case failure" into qt-dev
Beverly [Tue, 23 Apr 2019 18:13:50 +0000 (11:13 -0700)]
Merge "Remove "unless turned on automatically" text" into qt-dev
am:
87158ed0b2
Change-Id: I9fcdb16ab74587f48c30cf703715fe7942e8023f
TreeHugger Robot [Tue, 23 Apr 2019 17:50:05 +0000 (17:50 +0000)]
Merge "Reduce binder call to OverlayManager (3->1)" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 17:36:54 +0000 (17:36 +0000)]
Merge "Add action metrics for Wi-Fi provision features" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 17:02:28 +0000 (17:02 +0000)]
Merge "Remove "unless turned on automatically" text" into qt-dev
Jason Chiu [Tue, 23 Apr 2019 16:30:01 +0000 (09:30 -0700)]
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev am:
805e208f14
am:
86d8a9ce8d
Change-Id: I449770b897407afae739ae5e9e852a694512f70f
Jason Chiu [Tue, 23 Apr 2019 16:13:56 +0000 (09:13 -0700)]
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
am:
805e208f14
Change-Id: I733b0eb6cfded17baa0f1fb1e329618fb16547c3
Beverly [Tue, 23 Apr 2019 14:08:32 +0000 (10:08 -0400)]
Remove "unless turned on automatically" text
- In Q, the title of this preference was changed from
"Duration" to "Default duration." The title change clarifies
that the preference controls the dnd default duration and not the
schedules, so we can now remove "unless turned on automatically"
text in the subtext.
Test: manual
Fixes:
130843902
Change-Id: I404acd61136e1e1aa4675e421c07ce871c1f9db9
TreeHugger Robot [Tue, 23 Apr 2019 11:47:21 +0000 (11:47 +0000)]
Merge "Automatically direct the user to the captive portal in Wi-Fi Slice" into qt-dev
Yi-Ling Chuang [Tue, 23 Apr 2019 09:51:18 +0000 (02:51 -0700)]
Merge "Expand advanced button by default in Notifications." into qt-dev am:
ab2b8c5bfa
am:
ccc73b4ced
Change-Id: Id09dd033a788aa0cc949b6d934d0996295bbf6a7
Yi-Ling Chuang [Tue, 23 Apr 2019 09:43:17 +0000 (02:43 -0700)]
Merge "Expand advanced button by default in Notifications." into qt-dev
am:
ab2b8c5bfa
Change-Id: Ided47e34125d26ece6bdea048b444a90a8b8b2b5
TreeHugger Robot [Tue, 23 Apr 2019 09:33:47 +0000 (09:33 +0000)]
Merge "Expand advanced button by default in Notifications." into qt-dev
clownshen [Tue, 23 Apr 2019 09:15:32 +0000 (17:15 +0800)]
Fix WifiDetailPreferenceControllerTest new test case failure
Bug:
130370187
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I314702be14db4e853412874c123e0a4b229849a2
Arc Wang [Tue, 23 Apr 2019 04:51:15 +0000 (21:51 -0700)]
Merge "Change description string of Wi-Fi add device" into qt-dev am:
dd310fa892
am:
e7f2326b63
Change-Id: I32fd0bf6d2906bc3c5bc31c7a2662542c20346c7
Arc Wang [Tue, 23 Apr 2019 04:47:19 +0000 (21:47 -0700)]
Merge "Change description string of Wi-Fi add device" into qt-dev
am:
dd310fa892
Change-Id: I2d5ad539a8cf480a1d47b597b8f71b778aa12bb7
TreeHugger Robot [Tue, 23 Apr 2019 04:32:26 +0000 (04:32 +0000)]
Merge "Change description string of Wi-Fi add device" into qt-dev
Jason Chiu [Fri, 19 Apr 2019 10:47:39 +0000 (18:47 +0800)]
Automatically direct the user to the captive portal in Wi-Fi Slice
Save the SSID when the user clicks the network, and then automatically
start login page when the network gets the captive portal capability.
Fixes:
128056349
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ia25241a8243d7d6aae604f341b512350404d9fd1
Clown SHEN [Tue, 23 Apr 2019 03:51:10 +0000 (20:51 -0700)]
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev am:
2a14b7e8b5
am:
1575a3fa40
Change-Id: I254ae60a4fac0f68e83ab5d8bbb4fa2a929ff6c4
Clown SHEN [Tue, 23 Apr 2019 03:35:56 +0000 (20:35 -0700)]
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev am:
2e340d284e
am:
e0dbee7894
Change-Id: I0f499ed7e65cc4cc1b8736694577493c5e535caf
Clown SHEN [Tue, 23 Apr 2019 03:15:35 +0000 (20:15 -0700)]
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
am:
2a14b7e8b5
Change-Id: If34484a29f3338bb594e47e65ae9f4c9049cfd7e
Clown SHEN [Tue, 23 Apr 2019 03:13:24 +0000 (20:13 -0700)]
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev
am:
2e340d284e
Change-Id: I65852f7e05b31db4633a27d007c3bc5e0f0326f6
Clown SHEN [Tue, 23 Apr 2019 03:02:31 +0000 (03:02 +0000)]
Merge "Fix WifiDetailPreferenceControllerTest failure" into qt-dev
Clown SHEN [Tue, 23 Apr 2019 03:01:48 +0000 (03:01 +0000)]
Merge "Correct detail page UI once user change MAC randomized setting" into qt-dev
Alex Salo [Tue, 23 Apr 2019 01:47:19 +0000 (18:47 -0700)]
Merge "Remove todo comment" into qt-dev am:
37db031aa1
am:
7bb8466d96
Change-Id: I9d6ac57f4eac9b3abf1c0b893149f3adcaa32008
cosmohsieh [Tue, 23 Apr 2019 01:29:44 +0000 (18:29 -0700)]
Merge "Improve some comments of strings and codes" into qt-dev am:
0bc3fac6d9
am:
b7fc587b5b
Change-Id: Ie78c6030466f81b4526cf2e26986bae816d811ea
Kevin Chyn [Tue, 23 Apr 2019 01:28:47 +0000 (18:28 -0700)]
Merge "Update enrollment footer icon" into qt-dev am:
c9239e11b6
am:
012ba13cb3
Change-Id: Ibe91ddbe2702ed65e985edcc2fd4768794443f90
Kevin Chyn [Tue, 23 Apr 2019 01:27:19 +0000 (18:27 -0700)]
Merge "Update introduction layout spacing" into qt-dev am:
89f0d5274a
am:
38d44c96a0
Change-Id: Icb622dd27638bb8554684c221a453ea4127f04c9
Lei Yu [Tue, 23 Apr 2019 01:22:36 +0000 (18:22 -0700)]
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev am:
357825d228
am:
787e15fbe5
Change-Id: I4530a2d6e26a082332b776351464633232d28e9b
Alex Salo [Tue, 23 Apr 2019 01:20:57 +0000 (18:20 -0700)]
Merge "Remove todo comment" into qt-dev
am:
37db031aa1
Change-Id: If7ae4aab6b59ebe0b6a759cd464d9054b11be3b0
Fan Zhang [Tue, 23 Apr 2019 01:11:43 +0000 (18:11 -0700)]
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev am:
5e42b894bc
am:
d1bc5895b0
Change-Id: I9a1bde9ec5bbd3b6ca00cce451e0970d7a6c79ae
cosmohsieh [Tue, 23 Apr 2019 01:01:09 +0000 (18:01 -0700)]
Merge "Improve some comments of strings and codes" into qt-dev
am:
0bc3fac6d9
Change-Id: I7638a753e235ae4dee29cb0294918e896089d85e
Kevin Chyn [Tue, 23 Apr 2019 01:00:13 +0000 (18:00 -0700)]
Merge "Update enrollment footer icon" into qt-dev
am:
c9239e11b6
Change-Id: I64f8178d7838781ddc3f1a86117e59f9ca81617a
Kevin Chyn [Tue, 23 Apr 2019 00:55:21 +0000 (17:55 -0700)]
Merge "Update introduction layout spacing" into qt-dev
am:
89f0d5274a
Change-Id: I197d2451018bf3b6ae4d9135fd716fcaab0797b7
Lei Yu [Tue, 23 Apr 2019 00:50:40 +0000 (17:50 -0700)]
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
am:
357825d228
Change-Id: I5e64d99af01a568f2f98fbda0240ca09e85fc65c
Fan Zhang [Tue, 23 Apr 2019 00:32:32 +0000 (17:32 -0700)]
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
am:
5e42b894bc
Change-Id: Id3fc9e6a6e211d530d4b33a0050fafd0de11e2d7
TreeHugger Robot [Tue, 23 Apr 2019 00:19:26 +0000 (00:19 +0000)]
Merge "Remove todo comment" into qt-dev
TreeHugger Robot [Tue, 23 Apr 2019 00:04:56 +0000 (00:04 +0000)]
Merge "Improve some comments of strings and codes" into qt-dev
Hyunyoung Song [Mon, 22 Apr 2019 23:27:50 +0000 (16:27 -0700)]
Reduce binder call to OverlayManager (3->1)
Bug:
131112014
Test: builds, manually tested
Change-Id: I1f0fba30a55713be92b8755c0793ee84928f9d5e
Kweku Adams [Mon, 22 Apr 2019 21:52:21 +0000 (14:52 -0700)]
Using explicit Looper in Handler initialization.
Bug:
130639146
Test: flash device and toggle settings
Change-Id: I40d0578487c94da9fc9d940089bacbddf3a43751
Kevin Chyn [Mon, 22 Apr 2019 23:23:16 +0000 (23:23 +0000)]
Merge "Update enrollment footer icon" into qt-dev
Kevin Chyn [Mon, 22 Apr 2019 23:16:39 +0000 (23:16 +0000)]
Merge "Update introduction layout spacing" into qt-dev
Fan Zhang [Mon, 22 Apr 2019 23:02:46 +0000 (16:02 -0700)]
Merge "Fix CodeInspectionTest" into qt-dev am:
4b54ad9bd5
am:
d9fb048712
Change-Id: Ie7e99df8d2a2721120178886763db00b4c4adbc5
Lei Yu [Mon, 22 Apr 2019 22:57:24 +0000 (22:57 +0000)]
Merge "Test fix: Add MmsPreferenceController to whitelist" into qt-dev
Lei Yu [Mon, 22 Apr 2019 22:51:58 +0000 (15:51 -0700)]
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
Fan Zhang [Mon, 22 Apr 2019 22:48:59 +0000 (22:48 +0000)]
Merge "Partial revert Ib2396575bbc69a7cca5e9c90e113c76ff6db00b5" into qt-dev
Fan Zhang [Mon, 22 Apr 2019 22:14:51 +0000 (15:14 -0700)]
Merge "Fix CodeInspectionTest" into qt-dev
am:
4b54ad9bd5
Change-Id: I9f5885c5c9e52019ea9142337b18722e903a459c
Alex Salo [Mon, 22 Apr 2019 21:54:51 +0000 (14:54 -0700)]
Remove todo comment
Bug:
129352433
Test: not needed
Change-Id: I7aa7840c0852c17ed05dba684fdd84cb7d5ad4ed
TreeHugger Robot [Mon, 22 Apr 2019 21:37:29 +0000 (21:37 +0000)]
Merge "Fix CodeInspectionTest" into qt-dev
Kevin Chyn [Mon, 22 Apr 2019 19:38:33 +0000 (12:38 -0700)]
Update enrollment footer icon
Fixes:
131094701
Test: Builds
Change-Id: I9e1a75986ffeb35791271d55bf05a2daa9af5bad
Fan Zhang [Mon, 22 Apr 2019 19:28:07 +0000 (12:28 -0700)]
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
Kevin Chyn [Thu, 18 Apr 2019 23:34:37 +0000 (16:34 -0700)]
Update introduction layout spacing
Bug:
130740990
Test: builds
Change-Id: I2c10d991097fcdb7eb0775f744b5b12af2597780
Lei Yu [Mon, 22 Apr 2019 18:35:04 +0000 (11:35 -0700)]
Merge "Add mms preference and controller" into qt-dev am:
f3365e911d
am:
7ec9c1db1d
Change-Id: I6a18373e1567d332a8a6a74c8449fc9ec9d28698
Lei Yu [Mon, 22 Apr 2019 18:20:01 +0000 (11:20 -0700)]
Merge "Remove feature flag for slice injection" into qt-dev am:
fe393599a0
am:
cbb86c71b6
Change-Id: I7c38ee5efcec236e5aabfcf3b9c81632b2b2e5ee
Lei Yu [Mon, 22 Apr 2019 18:14:34 +0000 (11:14 -0700)]
Merge "Add mms preference and controller" into qt-dev
am:
f3365e911d
Change-Id: I7d564e576a0ce387f376e71af54839794a3281cd
Lei Yu [Mon, 22 Apr 2019 18:10:37 +0000 (11:10 -0700)]
Merge "Remove feature flag for slice injection" into qt-dev
am:
fe393599a0
Change-Id: I8cb5753b3d809811464b8410e3b26be35e0efca6
Lei Yu [Mon, 22 Apr 2019 17:55:34 +0000 (17:55 +0000)]
Merge "Add mms preference and controller" into qt-dev
Lei Yu [Mon, 22 Apr 2019 17:49:52 +0000 (17:49 +0000)]
Merge "Remove feature flag for slice injection" into qt-dev
Tim Peng [Mon, 22 Apr 2019 17:23:26 +0000 (10:23 -0700)]
Remove "Play media to" when no connected device am:
99ed023ca4
am:
568520bdf5
Change-Id: If5de94fba3f751e29155df223372ce6a165120df
Tim Peng [Mon, 22 Apr 2019 17:03:39 +0000 (10:03 -0700)]
Remove "Play media to" when no connected device
am:
99ed023ca4
Change-Id: I462ce390a7addc95ceacb0f0a4e48382ac34aed5
clownshen [Mon, 22 Apr 2019 10:33:46 +0000 (18:33 +0800)]
Fix WifiDetailPreferenceControllerTest failure
Bug:
130896210
Test: make RunSettingsRoboTests -j32 ROBOTEST_FILTER=com.android.settings.wifi.details.WifiDetailPreferenceControllerTest
Change-Id: I994fbc4a67f4c58afebb38316555f8e1442b96c0
Tim Peng [Mon, 22 Apr 2019 06:05:09 +0000 (14:05 +0800)]
Remove "Play media to" when no connected device
Bug:
130251782
Test: make -j42 RunSettingsRoboTests
Change-Id: Id40199a67aef48b99f59cf6e04f93be2abe5e8fc
Yi-Ling Chuang [Fri, 19 Apr 2019 11:03:46 +0000 (19:03 +0800)]
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
clownshen [Wed, 17 Apr 2019 11:33:37 +0000 (19:33 +0800)]
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
Arc Wang [Mon, 22 Apr 2019 03:06:16 +0000 (11:06 +0800)]
Change description string of Wi-Fi add device
Bug:
130825364
Test: manual
Change-Id: Ic633cfa80475a438be94fabb0527c24ec9df39a9
cosmohsieh [Thu, 18 Apr 2019 02:58:45 +0000 (10:58 +0800)]
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
Bill Yi [Sun, 21 Apr 2019 04:55:41 +0000 (21:55 -0700)]
[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
Bill Yi [Sun, 21 Apr 2019 04:50:42 +0000 (21:50 -0700)]
[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
TreeHugger Robot [Sun, 21 Apr 2019 04:43:31 +0000 (04:43 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
TreeHugger Robot [Sun, 21 Apr 2019 02:42:38 +0000 (02:42 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Sun, 21 Apr 2019 00:58:18 +0000 (17:58 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I681232854213f3b89d0543d30c640622d759a396
Bill Yi [Sun, 21 Apr 2019 00:15:08 +0000 (17:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I90c45c06f57d03b07411318467c38abc0b725c55
Auto-generated-cl: translation import
Jonathan Scott [Sat, 20 Apr 2019 23:29:55 +0000 (16:29 -0700)]
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev am:
5a8cf48813
am:
28a697103d
Change-Id: Id394e1495f49fdca0353a7d9111ecf2273bf7ab1
Jonathan Scott [Sat, 20 Apr 2019 23:24:57 +0000 (16:24 -0700)]
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
am:
5a8cf48813
Change-Id: Icea3822382cd2d6c21cedeb1560c4ed2f316d316
TreeHugger Robot [Sat, 20 Apr 2019 23:16:25 +0000 (23:16 +0000)]
Merge "Remove redundant (and failing) test getAvailabilityStatus_hasManagedUser_AVAILABLE" into qt-dev
TreeHugger Robot [Sat, 20 Apr 2019 22:09:41 +0000 (22:09 +0000)]
Merge "Remove deprecated AccessPoint#getConfigName() in SavedNetworkComparator"
Mark Chien [Sat, 20 Apr 2019 07:00:19 +0000 (00:00 -0700)]
[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
Mark Chien [Sat, 20 Apr 2019 06:45:35 +0000 (23:45 -0700)]
Merge "Ignore the outdated entitlement check" am:
d7885ca73a am:
7b30503dc4
am:
f886be6999
Change-Id: Ic2cd5ed57ec675d0ad13521cc354a1eb4cc38d69
Mark Chien [Sat, 20 Apr 2019 05:06:49 +0000 (22:06 -0700)]
[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
Mark Chien [Sat, 20 Apr 2019 04:41:52 +0000 (04:41 +0000)]
Merge "Ignore the outdated entitlement check" into qt-dev
Mark Chien [Sat, 20 Apr 2019 04:07:49 +0000 (21:07 -0700)]
Merge "Ignore the outdated entitlement check" am:
d7885ca73a
am:
7b30503dc4
Change-Id: I294f9f2e9ca239cb8f1c689580ce266ddead8f5b
Mark Chien [Sat, 20 Apr 2019 03:26:15 +0000 (20:26 -0700)]
Merge "Ignore the outdated entitlement check"
am:
d7885ca73a
Change-Id: If610c3233137562571eeff0b2d73b2bdd946ebd9
Beverly [Sat, 20 Apr 2019 02:06:04 +0000 (19:06 -0700)]
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev am:
f09245150d
am:
08de5537ef
Change-Id: Ibe64d01921a30d9538af0641c01a68112d12657d
Mark Chien [Sat, 20 Apr 2019 02:05:33 +0000 (02:05 +0000)]
Merge "Ignore the outdated entitlement check"
Lei Yu [Sat, 20 Apr 2019 01:56:31 +0000 (18:56 -0700)]
Merge "Fix battery robo test" into qt-dev am:
fc48118694
am:
87bdcd3ce2
Change-Id: I06ff2450d1757a4ae45a28866084f7bb377c8a30
Salvador Martinez [Sat, 20 Apr 2019 01:07:31 +0000 (18:07 -0700)]
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev am:
022af8ca10
am:
72d99dd38c
Change-Id: I2b9279b3f11abef1719c6d23fa998774aa983af8
Fan Zhang [Sat, 20 Apr 2019 01:06:38 +0000 (18:06 -0700)]
Merge "Fix typo" into qt-dev am:
33f136fdec
am:
cd576bfaae
Change-Id: I97b8d4fb843805b97317b94c85865497aac1543e
Fan Zhang [Sat, 20 Apr 2019 01:05:50 +0000 (18:05 -0700)]
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev am:
ac76a480bd
am:
4a4b2a5b00
Change-Id: I9873cb57e2bc2fd7584527d39215b80a2381161b
Fan Zhang [Sat, 20 Apr 2019 01:04:49 +0000 (18:04 -0700)]
Merge "Add @Ignore for all failing tests." into qt-dev am:
1830440231
am:
5a0629d12f
Change-Id: I9d7e1906b3e5b0b213d5d3d4e1e90ca1acf4f4a9
Beverly [Sat, 20 Apr 2019 00:28:45 +0000 (17:28 -0700)]
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
am:
f09245150d
Change-Id: I159f4c670c2a103fe5c3fdb87e62e0e21a42bc5b
Lei Yu [Sat, 20 Apr 2019 00:20:53 +0000 (17:20 -0700)]
Merge "Fix battery robo test" into qt-dev
am:
fc48118694
Change-Id: Id0bcad14d216bb2718435dffdb802e105af440d4
OSDN Git Service
