OSDN Git Service
Leon Liao [Tue, 23 Apr 2019 05:25:52 +0000 (13:25 +0800)]
Replace the placeholder animation.
Update the placeholder animation in Accessibility Settings
'Time to read' and 'Time to take action'.
Bug:
119283926
Bug:
129090045
Test: Screenshot | RunSettingsRoboTests
Change-Id: I215facd35cb3b9d0fc90a5e267368de2edddf0dc
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
TreeHugger Robot [Fri, 19 Apr 2019 23:20:10 +0000 (23:20 +0000)]
Merge "Allow up two lines of text on dnd restrict notif" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 23:13:51 +0000 (23:13 +0000)]
Merge "Fix battery robo test" into qt-dev
Salvador Martinez [Fri, 19 Apr 2019 22:56:21 +0000 (15:56 -0700)]
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
am:
022af8ca10
Change-Id: Ie0e16d985ef878e9989ad4037947ff57e34749fc
Lei Yu [Fri, 19 Apr 2019 22:55:15 +0000 (15:55 -0700)]
Merge "Add SettingsPolicy to control BT feature" into qt-dev am:
125ab50a55
am:
142ca23949
Change-Id: I7f9b2c921651ba9e6163fb7ecc22db370a52196d
Fan Zhang [Fri, 19 Apr 2019 22:54:48 +0000 (15:54 -0700)]
Merge "Fix typo" into qt-dev
am:
33f136fdec
Change-Id: If6ba4153c8f642643054e1f7e949d4111a6e3b7e
Fan Zhang [Fri, 19 Apr 2019 22:53:26 +0000 (15:53 -0700)]
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
am:
ac76a480bd
Change-Id: I5d72983c4c9cda2a6cfb36fb5931dfdff00ac45f
Fan Zhang [Fri, 19 Apr 2019 22:21:59 +0000 (15:21 -0700)]
Merge "Add @Ignore for all failing tests." into qt-dev
am:
1830440231
Change-Id: Ic779b72c3bf3a06e32c7dbe11f87e654baf70664
Salvador Martinez [Fri, 19 Apr 2019 22:00:27 +0000 (22:00 +0000)]
Merge "Update battery stuff to use SettingsLib Estimate class" into qt-dev
Jonathan Scott [Fri, 19 Apr 2019 21:19:21 +0000 (22:19 +0100)]
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
Lei Yu [Fri, 19 Apr 2019 20:36:31 +0000 (13:36 -0700)]
Fix battery robo test
Fixes:
130896701
Test: RunSettingsRoboTests
Change-Id: Iffb7874250335db81181b23f96fe7b50a2dd0062
Fan Zhang [Fri, 19 Apr 2019 20:32:37 +0000 (20:32 +0000)]
Merge "Fix typo" into qt-dev
Fan Zhang [Fri, 19 Apr 2019 20:31:36 +0000 (13:31 -0700)]
Fix typo
Bug:
130897882
Test: rebuild
Change-Id: I066b69634214cd25c4acbd173e8fe82cd73d4e97
Fan Zhang [Fri, 19 Apr 2019 20:30:24 +0000 (20:30 +0000)]
Merge "Add a way to suppress injected tiles for OEMs" into qt-dev
Fan Zhang [Fri, 19 Apr 2019 20:28:47 +0000 (20:28 +0000)]
Merge "Add @Ignore for all failing tests." into qt-dev
Fan Zhang [Fri, 19 Apr 2019 20:23:29 +0000 (13:23 -0700)]
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
Lei Yu [Fri, 19 Apr 2019 20:18:15 +0000 (13:18 -0700)]
Merge "Add SettingsPolicy to control BT feature" into qt-dev
am:
125ab50a55
Change-Id: I46f37c9a1ac92bd3e77e2a2f8ff185a72436851e
Lei Yu [Fri, 19 Apr 2019 19:44:53 +0000 (19:44 +0000)]
Merge "Add SettingsPolicy to control BT feature" into qt-dev
Linda Tseng [Fri, 19 Apr 2019 18:07:16 +0000 (11:07 -0700)]
Merge "Set max num of slices allowed in panel view" into qt-dev am:
ae344faf4a
am:
67928018b3
Change-Id: Idbab620c65b8dbd65b721caca3e669f89baeed36
Linda Tseng [Fri, 19 Apr 2019 17:36:41 +0000 (10:36 -0700)]
Merge "Set max num of slices allowed in panel view" into qt-dev
am:
ae344faf4a
Change-Id: Id9ffef1fd7a7007a143661b221dd9d82dc9858b5
Salvador Martinez [Fri, 12 Apr 2019 00:12:44 +0000 (17:12 -0700)]
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
Yanting Yang [Thu, 18 Apr 2019 13:37:31 +0000 (21:37 +0800)]
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
Beverly [Fri, 19 Apr 2019 17:21:31 +0000 (13:21 -0400)]
Allow up two lines of text on dnd restrict notif
Test: manual
Bug:
130848971
Change-Id: I1d32963f0e291d42c8b98ba8ca39eba749a26989
Linda Tseng [Fri, 19 Apr 2019 17:19:59 +0000 (17:19 +0000)]
Merge "Set max num of slices allowed in panel view" into qt-dev
Julia Reynolds [Fri, 19 Apr 2019 17:02:48 +0000 (10:02 -0700)]
Merge "Fix broken tests" into qt-dev am:
1115d61c0b
am:
4ca871a8bd
Change-Id: Id1599af2007f7127b65ac6d1ddb4f6bd62899976
hughchen [Fri, 19 Apr 2019 17:01:12 +0000 (10:01 -0700)]
Merge "Remove all device from preference when BT is disabled" into qt-dev am:
e69a25caad
am:
8fcce3e5ca
Change-Id: I26ce994197c1b85e23f00f81227f359e4bd4ed29
Julia Reynolds [Fri, 19 Apr 2019 16:51:37 +0000 (09:51 -0700)]
Merge "Fix broken tests" into qt-dev
am:
1115d61c0b
Change-Id: I16026c2a7306fecb02230d1403f31efd50e297e2
hughchen [Fri, 19 Apr 2019 16:46:50 +0000 (09:46 -0700)]
Merge "Remove all device from preference when BT is disabled" into qt-dev
am:
e69a25caad
Change-Id: I84cb23ab372c897121ea239aa8f1f4c337f5d59d
TreeHugger Robot [Fri, 19 Apr 2019 16:32:15 +0000 (16:32 +0000)]
Merge "Fix broken tests" into qt-dev
TreeHugger Robot [Fri, 19 Apr 2019 16:25:26 +0000 (16:25 +0000)]
Merge "Remove all device from preference when BT is disabled" into qt-dev
Yi-Ling Chuang [Fri, 19 Apr 2019 16:13:20 +0000 (09:13 -0700)]
Merge "Fix the break of repo hook color check." into qt-dev am:
73ab8fcb63
am:
bff5746cd5
Change-Id: If0fccdb354d9b251d5362a6fec5faf3f6cf49cb1
Yi-Ling Chuang [Fri, 19 Apr 2019 15:53:31 +0000 (08:53 -0700)]
Merge "Fix the break of repo hook color check." into qt-dev
am:
73ab8fcb63
Change-Id: Iacab2b9a297bc17826d8eb2c17d45e9bf1d5f416
TreeHugger Robot [Fri, 19 Apr 2019 15:38:03 +0000 (15:38 +0000)]
Merge "Fix the break of repo hook color check." into qt-dev
Julia Reynolds [Fri, 19 Apr 2019 14:01:53 +0000 (10:01 -0400)]
Fix broken tests
Test: robo tests
Fixes:
130871450
Change-Id: If7b01147f5680392c7635f3a3b4e558aa56a633e
Beverly Tai [Fri, 19 Apr 2019 13:37:06 +0000 (06:37 -0700)]
Merge "Show correct text for old zen modes" into qt-dev am:
60eb96cd29
am:
ece7d9b88d
Change-Id: I06422941e7087f347b3ce917e004fc2c4063fc10
Beverly Tai [Fri, 19 Apr 2019 13:27:31 +0000 (06:27 -0700)]
Merge "Show correct text for old zen modes" into qt-dev
am:
60eb96cd29
Change-Id: I0bec770e82f3ee0aa0a9110f9a42c8fa63ec0da0
Beverly Tai [Fri, 19 Apr 2019 13:17:20 +0000 (13:17 +0000)]
Merge "Show correct text for old zen modes" into qt-dev
tmfang [Fri, 19 Apr 2019 08:07:11 +0000 (01:07 -0700)]
Merge "Remove odd spacing after the divider" into qt-dev am:
fb250122f8
am:
92f864565d
Change-Id: Ib658d0a2e4ad325681dbc6ce5b5b3f8b9d0ef951
tmfang [Fri, 19 Apr 2019 07:55:49 +0000 (00:55 -0700)]
Merge "Remove odd spacing after the divider" into qt-dev
am:
fb250122f8
Change-Id: I99f5aab97be9a32fdeec857bf2875ae05b5ac9a9
Stanley Wang [Fri, 19 Apr 2019 07:45:47 +0000 (00:45 -0700)]
Merge "Hardware version should should support copy action" into qt-dev am:
7f46c8714e
am:
cb525e5fad
Change-Id: I10bcce4a113cc1ba759e9da33606f24073491302
TreeHugger Robot [Fri, 19 Apr 2019 07:45:02 +0000 (07:45 +0000)]
Merge "Remove odd spacing after the divider" into qt-dev
Stanley Wang [Fri, 19 Apr 2019 07:40:46 +0000 (00:40 -0700)]
Merge "Hardware version should should support copy action" into qt-dev
am:
7f46c8714e
Change-Id: I1b397e2c12fc0b3a07d5382b70b8e4dd08ede20a
Stanley Wang [Fri, 19 Apr 2019 07:35:46 +0000 (07:35 +0000)]
Merge "Hardware version should should support copy action" into qt-dev
Yi-Ling Chuang [Fri, 19 Apr 2019 05:52:25 +0000 (13:52 +0800)]
Fix the break of repo hook color check.
Add the missing color for notification importance button
Fixes:
130850328
Test: manual
Change-Id: I6c070fad42d5fb0e6d5e3aa00d66b32708dde605
Jonathan Scott [Fri, 19 Apr 2019 06:00:34 +0000 (23:00 -0700)]
Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev am:
6e2fce6fdc
am:
d760559474
Change-Id: I3fd6add4c45d5617b10512ba5c602f9d5f772945
Jonathan Scott [Fri, 19 Apr 2019 05:46:17 +0000 (22:46 -0700)]
Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev
am:
6e2fce6fdc
Change-Id: Ia1b28b4dce00022ff1dfd57894f8d9b18108a6ad
TreeHugger Robot [Fri, 19 Apr 2019 05:24:24 +0000 (05:24 +0000)]
Merge "Don't show policy transparency UI for cross-profile setting." into qt-dev
Stanley Wang [Thu, 18 Apr 2019 12:12:22 +0000 (20:12 +0800)]
Hardware version should should support copy action
Implement isSliceable method in HardwareRevisionPreferenceController
Fixes:
130653205
Test: manual and robotests
Change-Id: Ib872b9625c2c1984ff7b036fef5b3145c7fd8d2a
Cn Chen [Fri, 19 Apr 2019 02:34:35 +0000 (19:34 -0700)]
Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev am:
9588c9003f
am:
7b2f016be8
Change-Id: I3df778d24dfb31ae0eaab29e0e9597c05f675759
Cn Chen [Fri, 19 Apr 2019 02:08:01 +0000 (19:08 -0700)]
Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev
am:
9588c9003f
Change-Id: I37cb68e0df1abb76792122e12c91636ecf24644b
hughchen [Thu, 18 Apr 2019 09:48:15 +0000 (17:48 +0800)]
Remove all device from preference when BT is disabled
The issue is happened when BT is disabled then navigate to
"Connected devices". BluetoothDeviceUpdater didn't update
UI when BT is disabled. Remove all device from preference when
BT is disabled.
Bug:
80090956
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia1fd8cfbcf95d712a1a702fdf101ff98186b76cd
Cn Chen [Fri, 19 Apr 2019 01:37:13 +0000 (01:37 +0000)]
Merge "Update fingerprint suggestion enable state when back pressed" into qt-dev
Julia Reynolds [Fri, 19 Apr 2019 01:36:08 +0000 (18:36 -0700)]
Merge "Updates to main notification page" into qt-dev am:
51d16f2368
am:
ef5d654d53
Change-Id: I4a22ccba2c4d7e348ca481319dc180adc1adf9f2
Yiwei Zhang [Fri, 19 Apr 2019 01:19:55 +0000 (18:19 -0700)]
[automerger skipped] Merge changes from topic "GameDriver2" am:
44ab00de7f am:
730c10c93e -s ours
am:
3e3fb21167 -s ours
am skip reason: change_id Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5 with SHA1
ccc81a83cc is in history
Change-Id: I91b0b386e4890090a02e74ae47fca1bf63a0bdc7
Yiwei Zhang [Fri, 19 Apr 2019 01:18:58 +0000 (18:18 -0700)]
[automerger skipped] Game Driver: rename GUP to Game Driver am:
046b9a8ca2 am:
eb5f8b1139 -s ours
am:
667b4f6159 -s ours
am skip reason: change_id Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9 with SHA1
bf854fc41b is in history
Change-Id: Ic3dec9ccbab3e0ae94ef9036058e9c83bb0cf2af
Yiwei Zhang [Fri, 19 Apr 2019 01:18:08 +0000 (18:18 -0700)]
[automerger skipped] Game Driver: Add footer to the dashboard am:
34986f5ba5 am:
b168f16bfd -s ours
am:
6a3e7b3812 -s ours
am skip reason: change_id I9788d4c64b06deb099a43e8db7eecab20a85f494 with SHA1
8aa568f1f5 is in history
Change-Id: I50aa898dc97e3ad182abe50120b66037ae514b84
Yiwei Zhang [Fri, 19 Apr 2019 01:17:16 +0000 (18:17 -0700)]
[automerger skipped] Game Driver: Add SwitchBar to control GUP feature am:
b15cc090d1 am:
ceb8551cd1 -s ours
am:
7b7188b907 -s ours
am skip reason: change_id Ice9ded17c759791a3728c552f79881e2215ac081 with SHA1
51691ab0d0 is in history
Change-Id: I220dfe7581b4bf26f176b478803730e9ac4c8817
Yiwei Zhang [Fri, 19 Apr 2019 01:16:26 +0000 (18:16 -0700)]
[automerger skipped] GUP: Add global switch for all apps am:
75548c4a33 am:
c37c07ba99 -s ours
am:
6047cf86a4 -s ours
am skip reason: change_id Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493 with SHA1
15bb7944a5 is in history
Change-Id: I82f1d71deb2929507ffd829259a7ea65ee2f2397
Yiwei Zhang [Fri, 19 Apr 2019 01:15:33 +0000 (18:15 -0700)]
[automerger skipped] GUP: Fixed some typos and update some values am:
d0bbbfeeea am:
e506f9d7f5 -s ours
am:
536542927e -s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1
5735199641 is in history
Change-Id: I63fb2c2acf5aa417b2acd1c251fdf8ed0844f583
Yiwei Zhang [Fri, 19 Apr 2019 01:14:29 +0000 (18:14 -0700)]
[automerger skipped] GUP: Display a list of Apps and dialogs am:
dc62028e85 am:
f0b7bf7cca -s ours
am:
09a45e5cd0 -s ours
am skip reason: change_id Ide4934c0dd3901532723e77e74663e5a7b639026 with SHA1
83c030f1cd is in history
Change-Id: Ib574f9b0bb08b06143544ea56f2e49122526f98a
Yiwei Zhang [Fri, 19 Apr 2019 01:13:39 +0000 (18:13 -0700)]
[automerger skipped] GUP: Add stub UI am:
a2754c515b am:
329a5e938e -s ours
am:
c82b531871 -s ours
am skip reason: change_id I1f7cc66790e1d1e1de5113e28a055ec5d1679013 with SHA1
c81a03b60e is in history
Change-Id: I17416c245a6a93f6c763ccff169761ee023dd790
Julia Reynolds [Fri, 19 Apr 2019 01:11:47 +0000 (18:11 -0700)]
Merge "Updates to main notification page" into qt-dev
am:
51d16f2368
Change-Id: Ie7ca2cf7ed6ee0144820e360903345cb48c0a4b4
Yiwei Zhang [Fri, 19 Apr 2019 00:58:24 +0000 (17:58 -0700)]
[automerger skipped] Merge changes from topic "GameDriver2" am:
44ab00de7f
am:
730c10c93e -s ours
am skip reason: change_id Iffbe3355b37763d4fa71b96271c1ba448fb6cdc5 with SHA1
ccc81a83cc is in history
Change-Id: I8f91ed2a8ed8a6f40b060af1f9e67599814eb357
Yiwei Zhang [Fri, 19 Apr 2019 00:57:36 +0000 (17:57 -0700)]
[automerger skipped] Game Driver: rename GUP to Game Driver am:
046b9a8ca2
am:
eb5f8b1139 -s ours
am skip reason: change_id Ia7b9e3978ad96436a66843e6b5d1bd1e15f367c9 with SHA1
bf854fc41b is in history
Change-Id: I9f7b40977c4464ff5605c490d11deab8061095aa
TreeHugger Robot [Fri, 19 Apr 2019 00:57:32 +0000 (00:57 +0000)]
Merge "Updates to main notification page" into qt-dev
Yiwei Zhang [Fri, 19 Apr 2019 00:56:58 +0000 (17:56 -0700)]
[automerger skipped] Game Driver: Add footer to the dashboard am:
34986f5ba5
am:
b168f16bfd -s ours
am skip reason: change_id I9788d4c64b06deb099a43e8db7eecab20a85f494 with SHA1
8aa568f1f5 is in history
Change-Id: Ibe54a2abac4b7162b82ffaf87ed3725bb92c6a66
Yiwei Zhang [Fri, 19 Apr 2019 00:56:07 +0000 (17:56 -0700)]
[automerger skipped] Game Driver: Add SwitchBar to control GUP feature am:
b15cc090d1
am:
ceb8551cd1 -s ours
am skip reason: change_id Ice9ded17c759791a3728c552f79881e2215ac081 with SHA1
51691ab0d0 is in history
Change-Id: Iab4e744884a45e8fa77517e26036e578dd066535
Yiwei Zhang [Fri, 19 Apr 2019 00:55:27 +0000 (17:55 -0700)]
[automerger skipped] GUP: Add global switch for all apps am:
75548c4a33
am:
c37c07ba99 -s ours
am skip reason: change_id Iebf6c5eceb323d03332169eeb0a4a0d1f9c2c493 with SHA1
15bb7944a5 is in history
Change-Id: Ib866bd29edf02141b3b9c7db6401fbcd9f2b837c
Yiwei Zhang [Fri, 19 Apr 2019 00:54:49 +0000 (17:54 -0700)]
[automerger skipped] GUP: Fixed some typos and update some values am:
d0bbbfeeea
am:
e506f9d7f5 -s ours
am skip reason: change_id I7b1e42cd3a823a72bcd6d61b26c4954c237ff6d0 with SHA1
5735199641 is in history
Change-Id: I0642e07bed6da847b16738f7e14f7aec2cb0632a
Yiwei Zhang [Fri, 19 Apr 2019 00:54:12 +0000 (17:54 -0700)]
[automerger skipped] GUP: Display a list of Apps and dialogs am:
dc62028e85
am:
f0b7bf7cca -s ours
am skip reason: change_id Ide4934c0dd3901532723e77e74663e5a7b639026 with SHA1
83c030f1cd is in history
Change-Id: I34b7e2c2ef9afba6baee101ddc29ba7b9e022be0
Yiwei Zhang [Fri, 19 Apr 2019 00:53:34 +0000 (17:53 -0700)]
[automerger skipped] GUP: Add stub UI am:
a2754c515b
am:
329a5e938e -s ours
am skip reason: change_id I1f7cc66790e1d1e1de5113e28a055ec5d1679013 with SHA1
c81a03b60e is in history
Change-Id: I8be0f7ee8f61a455d1503554101e18b7b15c7ce8
Yiwei Zhang [Fri, 19 Apr 2019 00:40:42 +0000 (17:40 -0700)]
Merge changes from topic "GameDriver2"
am:
44ab00de7f
Change-Id: I4ffdd92469ccd67907a169bead5d1473a5a6777c
Yiwei Zhang [Fri, 19 Apr 2019 00:39:38 +0000 (17:39 -0700)]
Game Driver: rename GUP to Game Driver
am:
046b9a8ca2
Change-Id: I58e48a8893ad5cac202bf9bf2afd3db120ae23cc
Yiwei Zhang [Fri, 19 Apr 2019 00:38:20 +0000 (17:38 -0700)]
Game Driver: Add footer to the dashboard
am:
34986f5ba5
Change-Id: Id046f661896bdd068519fb96524e6ab455229025
Yiwei Zhang [Fri, 19 Apr 2019 00:36:46 +0000 (17:36 -0700)]
Game Driver: Add SwitchBar to control GUP feature
am:
b15cc090d1
Change-Id: Icd1b593294426db2d8ffda3cad926fffb32cd4d5
OSDN Git Service
