OSDN Git Service
Lucas Dupin [Wed, 26 Jul 2017 21:53:20 +0000 (21:53 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
am:
c1edefc059
Change-Id: I9771f6c14fca2768b7b455792f6f62a1855ac4ec
Lucas Dupin [Wed, 26 Jul 2017 21:29:26 +0000 (21:29 +0000)]
Merge "Text color of "shutdown" after removing overlay" into oc-dr1-dev
Lucas Dupin [Fri, 21 Jul 2017 20:50:25 +0000 (13:50 -0700)]
Text color of "shutdown" after removing overlay
Bug:
63751714
Fixes:
64079315
Test: Visual, turn off device with white wallpaper set
Change-Id: I667d40135c8c7b4f498bc89f695cbfde5657588c
Fyodor Kupolov [Wed, 26 Jul 2017 20:50:47 +0000 (20:50 +0000)]
Merge "Tests for lookaside configuration" into oc-mr1-dev
Suprabh Shukla [Wed, 26 Jul 2017 20:43:11 +0000 (20:43 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
am:
a49681fab8
Change-Id: Ie09391bfb304ef6721c672e3a63078f9d66f95af
Suprabh Shukla [Wed, 26 Jul 2017 20:25:07 +0000 (20:25 +0000)]
Merge "Read the correct parameters for Jobscheduler" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 20:12:30 +0000 (20:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Fritze [Wed, 26 Jul 2017 20:07:18 +0000 (20:07 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev
am:
44f7badb73
Change-Id: I7b9bf39041d91b35296952d5e6651ad83e9e81cd
TreeHugger Robot [Wed, 26 Jul 2017 20:01:50 +0000 (20:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Matthew Fritze [Wed, 26 Jul 2017 19:58:20 +0000 (19:58 +0000)]
Merge "Add metrics event for trampoline activity" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 19:57:22 +0000 (19:57 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Sungsoo Lim [Wed, 26 Jul 2017 19:48:25 +0000 (19:48 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
am:
bba60fadc7
Change-Id: Idd61a0034321755fd7e53deb6e452e7a14d0ba44
Sungsoo [Wed, 26 Jul 2017 19:45:04 +0000 (19:45 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
am:
d7ff18dac8 -s ours
Change-Id: I88874d4f445b4769e6f5222388b2620f1d2801c6
TreeHugger Robot [Wed, 26 Jul 2017 19:14:36 +0000 (19:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:59:13 +0000 (18:59 +0000)]
Merge "Don't attribute incorrect unified challenge attempt to profile." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 18:47:25 +0000 (18:47 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
b978569fce -s ours
Change-Id: I5b78e73fc5fb303b739ef85788866f1c95c6195b
TreeHugger Robot [Wed, 26 Jul 2017 18:41:38 +0000 (18:41 +0000)]
Merge "Fix NPE in MediaRouterService" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:40:20 +0000 (18:40 +0000)]
Merge "Restore the selected route when an app starts to make sound" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:39:16 +0000 (18:39 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 18:32:39 +0000 (18:32 +0000)]
Merge "DO NOT MERGE - Wraps custom save subtitle on ScrollView." into oc-mr1-dev
Bill Yi [Wed, 26 Jul 2017 18:24:13 +0000 (18:24 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
900d7157c0 -s ours
Change-Id: I36c4d906aa15db83b8d199287413437b8c03fd3a
Bill Yi [Wed, 26 Jul 2017 18:20:30 +0000 (18:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
56b37be1c9 -s ours
Change-Id: I8f3ff43e58be87e3f7fa8c303fac180c7fb74266
Bill Yi [Wed, 26 Jul 2017 18:06:04 +0000 (18:06 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
2a2845a483 -s ours
Change-Id: Id4d5900551e15ae96cde2b63cf846aff7f80f6ea
TreeHugger Robot [Wed, 26 Jul 2017 17:31:03 +0000 (17:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 17:04:20 +0000 (17:04 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Adrian Roos [Wed, 26 Jul 2017 16:59:16 +0000 (16:59 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
am:
afda883f86
Change-Id: I343ee531e2bf5f658ba0693c7e0e402b395dc282
TreeHugger Robot [Wed, 26 Jul 2017 16:56:39 +0000 (16:56 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
Beverly [Wed, 26 Jul 2017 16:40:41 +0000 (16:40 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
am:
382644aa74
Change-Id: I7c8bfab80e82d2841f43a75ce7fddc0b03cacc70
TreeHugger Robot [Wed, 26 Jul 2017 16:39:56 +0000 (16:39 +0000)]
Merge "AOD: Only force doze brightness when actually unlocking" into oc-dr1-dev
Geoffrey Pitsch [Wed, 26 Jul 2017 16:29:01 +0000 (16:29 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
am:
0d5c1490ce
Change-Id: I130816097bc68d1978b035cb2cfb0a3c678f9291
Bryce Lee [Wed, 26 Jul 2017 16:25:40 +0000 (16:25 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
am:
512e5d1b9b
Change-Id: If5c2ce81a92d751c3481d7613611b9373060f78a
Adrian Roos [Wed, 26 Jul 2017 16:22:52 +0000 (16:22 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
am:
dd22dcbcdf
Change-Id: I50d98b16eb4ce43a555a0136a74421e891754786
Antony Sargent [Wed, 26 Jul 2017 16:18:33 +0000 (16:18 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
am:
1e74fdb684 -s ours
Change-Id: I489efc8ca8d93cd94ac71e2ea65f45e888a9a138
TreeHugger Robot [Wed, 26 Jul 2017 15:34:32 +0000 (15:34 +0000)]
Merge "Volume dialog doesn't show on ambient/aod." into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 15:05:55 +0000 (08:05 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia56580662240b965d77ec102ea91a8b0ea5a8bab
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 15:03:02 +0000 (08:03 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie143437207858ada42d95895b235e72f6ac8926f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 15:00:54 +0000 (08:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic35926e27018d65db6f2972f183cb7242687a483
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:58:46 +0000 (07:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iccb89ad7674386c75d6ce19d6bfaa037b03e4243
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Geoffrey Pitsch [Wed, 26 Jul 2017 14:31:23 +0000 (14:31 +0000)]
Merge "Remove ability to downgrade importance of existing channel." into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 14:30:33 +0000 (07:30 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia3879f9882a8fde1edcc669f31b4cb5125786ea5
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:27:44 +0000 (07:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I76674f28e858f631f43f88f041ce0b6798b30def
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Geoffrey Pitsch [Mon, 24 Jul 2017 15:24:21 +0000 (11:24 -0400)]
Remove ability to downgrade importance of existing channel.
Test: runtest systemui-notification
Bug:
63920384
Change-Id: Ic9f5c50c3d2a36ccd4ba9686dad1eb415b559215
Bill Yi [Wed, 26 Jul 2017 14:26:35 +0000 (07:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5232ba3964ba77e81d70d325f34630a153d2b22d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 14:25:10 +0000 (07:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddda7b19049b1fc773e56eada5c4100ae14b39da
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bryce Lee [Wed, 26 Jul 2017 14:20:31 +0000 (14:20 +0000)]
Merge "Do not report app bound differences as a Configuration change." into oc-dr1-dev
Adrian Roos [Wed, 26 Jul 2017 11:47:01 +0000 (11:47 +0000)]
Merge "Fix flickery behavior when launching notification when occluded" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 10:53:34 +0000 (10:53 +0000)]
Merge "@Keep all the things in TestAccessPointBuilder" into oc-dr1-dev
Bill Yi [Wed, 26 Jul 2017 08:26:17 +0000 (08:26 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
a7f60741ae -s ours
am:
4d00a9512a -s ours
Change-Id: I194fa29eb575b6bdd91a167c6d7826c4fda7df69
Bill Yi [Wed, 26 Jul 2017 08:18:10 +0000 (08:18 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours
am:
0ad45f6f76 -s ours
Change-Id: If23b7854224ec5320d2f912686deb3da10d34efb
Bill Yi [Wed, 26 Jul 2017 08:16:15 +0000 (08:16 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
090feca7b5 -s ours
Change-Id: I2b8ed5d538954b0d56aebea103ac863e985c15b6
Bill Yi [Wed, 26 Jul 2017 08:12:15 +0000 (08:12 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
a7f60741ae -s ours
Change-Id: I30a22e1c267bc9e8bd287c48410cf9c475abdde0
Bill Yi [Wed, 26 Jul 2017 08:07:22 +0000 (08:07 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b4e8cad186 -s ours
Change-Id: I8421a6ad828df9c491665144533931352a6196f1
Bill Yi [Wed, 26 Jul 2017 08:03:38 +0000 (08:03 +0000)]
Import translations. DO NOT MERGE
am:
7c2b27f26f -s ours
Change-Id: I9711ab0a99f2309c7e61e3548d7a16f3e555d166
TreeHugger Robot [Wed, 26 Jul 2017 08:03:03 +0000 (08:03 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Antony Sargent [Tue, 18 Jul 2017 22:28:46 +0000 (15:28 -0700)]
@Keep all the things in TestAccessPointBuilder
The test in packages/apps/Settings/tests/unit/src/com/android/settings/
wifi/WifiSettingsUiTest.java fails because the TestAccessPointBuilder
class and all methods in it seem to get stripped during build time
since they aren't referenced by code within the settings app itself.
Bug:
33245941
Test: runtest --path packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: I22b7e9fa54fcd67e0f754aca47907d87db9d7056
Merged-In: I92b56b7908e5be8a3553a2779646d48bb5b94f01
Roozbeh Pournader [Wed, 26 Jul 2017 05:53:34 +0000 (05:53 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
am:
4fc156c451
Change-Id: I84c82030ef8b0ff9b7da990d5ec1ffcda1984a30
Chet Haase [Wed, 26 Jul 2017 05:47:47 +0000 (05:47 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
am:
1c31f9653f
Change-Id: Ib76daf28d94791f0c525aa1dcc57939ac60050c9
Roozbeh Pournader [Wed, 26 Jul 2017 05:44:41 +0000 (05:44 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
Chet Haase [Wed, 26 Jul 2017 05:40:41 +0000 (05:40 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
Chet Haase [Fri, 21 Jul 2017 17:45:31 +0000 (10:45 -0700)]
Update overscroll and toast UI
Overscroll updates:
Same shape, but smaller radius (doesn't come as far into the view)
and more translucent (max 15% instead of 50%). Overall, more subtle.
Toast updates:
Light background, smaller, dark font, closer to the bottom of the
container.
Test: manual unit tests. Also:
cts test ToastTest for toast changes
cts test EdgeEffectTests for EdgeEffect changes (adding some tests to
known-failures for now, due to brittle golden-image failures - see
CL ag/
2596621)
Bug:
30563264 Refresh toast visuals for Android ODR
Bug:
63010438 Tweaks to overscroll animation
Change-Id: I0fac6322b0b81d030c8d174852c134211290bbea
Bill Yi [Wed, 26 Jul 2017 04:24:47 +0000 (21:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie81e9b6438034399af10f964876f14cb08b8ceb7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:17:50 +0000 (21:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd1d218d134f9871650b17254741c4a0b40a4f0d
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Bill Yi [Wed, 26 Jul 2017 04:15:58 +0000 (21:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f6bf766d9d5d91f8b885e4ecc0878cacde1668f
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
Winson Chung [Wed, 26 Jul 2017 04:09:03 +0000 (04:09 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am:
e31847642c
Change-Id: I0f0737b4407b9af27bf2012643786c718832d273
Winson Chung [Wed, 26 Jul 2017 04:01:48 +0000 (04:01 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 03:42:09 +0000 (03:42 +0000)]
Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 03:41:27 +0000 (03:41 +0000)]
Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 03:26:23 +0000 (03:26 +0000)]
Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev
Christine Franks [Wed, 26 Jul 2017 02:54:42 +0000 (02:54 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
am:
bdaada0af9
Change-Id: I1b15ab6395b4935d1169246d42fa0a6f0c588a3d
Philip Quinn [Wed, 26 Jul 2017 02:44:48 +0000 (02:44 +0000)]
Don't block the input thread to notify the StatusBar about key events.
am:
4b5b3c6ccc
Change-Id: Idcf28d3145c8e02a94dd128e445a89cf9ae67c88
Christine Franks [Wed, 26 Jul 2017 02:39:09 +0000 (02:39 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
Philip Quinn [Fri, 21 Jul 2017 04:07:58 +0000 (21:07 -0700)]
Don't block the input thread to notify the StatusBar about key events.
Also, give it a ping for volume key events.
Bug:
63183852
Bug:
63909062
Test: runtest systemui
Change-Id: I3e8507ad8fc23cf3078313b500b5012afc84fa07
Lucas Dupin [Wed, 26 Jul 2017 02:29:51 +0000 (02:29 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
am:
59aadea809
Change-Id: I191fea7efeae05fab885dcb91fc67ea5e54ec147
Kevin Chyn [Wed, 26 Jul 2017 02:27:56 +0000 (02:27 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
am:
192e7ccf45
Change-Id: Ib77387825e02f7579783e0a9e23f5e9d4b7ed537
TreeHugger Robot [Wed, 26 Jul 2017 02:18:10 +0000 (02:18 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
TreeHugger Robot [Wed, 26 Jul 2017 02:16:55 +0000 (02:16 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
Sungsoo Lim [Tue, 25 Jul 2017 00:09:03 +0000 (09:09 +0900)]
Fix NPE in MediaRouterService
Bug:
63970300
Test: manual and passed MediaRouterTest
Change-Id: I2e8d09d16ca8693b1bdf51397ad4f10c4aa6d87b
(cherry picked from commit
2d36ae9d2f2e286c205adb20af23eebe554f3dd8)
Sungsoo [Mon, 22 May 2017 08:10:44 +0000 (17:10 +0900)]
Restore the selected route when an app starts to make sound
Limitation: When two apps make sound simultaneously while one uses a BT
route and the other uses the default route, switching activities between
the two different apps will not change the BT A2DP status until one of
the apps changes its playback status to inactive.
Bug:
32958908, Bug:
35567695, Bug:
33186346
Test: Passed MediaRouter/MediaSession test, and manually varified that
the b/
33186346 is fixed.
Change-Id: I1da97dcb74fa2095425b311ad62cdd00f8118cea
(cherry picked from commit
b3658569e9a87afe1b3168837cc282235fd4d1f8)
TreeHugger Robot [Wed, 26 Jul 2017 01:09:33 +0000 (01:09 +0000)]
Merge "compressed images on system partition" into oc-mr1-dev
Christine Franks [Thu, 20 Jul 2017 21:01:55 +0000 (14:01 -0700)]
Remove RetailDemoModeServiceInternal
Bug:
62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
Christine Franks [Wed, 26 Jul 2017 00:26:16 +0000 (00:26 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
am:
4ac942f140 -s ours
Change-Id: Id0fe8d3025e47c9e798ee082d7c22dd18c308254
Christine Franks [Wed, 26 Jul 2017 00:07:14 +0000 (00:07 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
Lucas Dupin [Tue, 25 Jul 2017 00:44:25 +0000 (17:44 -0700)]
Themable volume and power dialogs
Test: visual
Bug:
63903361
Change-Id: I3e4dc74e960f212985712120341d3a80543c96db
Roozbeh Pournader [Tue, 25 Jul 2017 23:29:22 +0000 (16:29 -0700)]
Remove Kwasio (nmg) from user-selectable languages
The language had inadequate locale data, and even the name
of the Kwasio language itself was not localized to Kwasio.
Change-Id: I7b92460b7b3d736593db4a2f94d47863264561b4
Fixes:
64037672
Test: Manual (Kwasio, as 'Nmg', is no longer listed in Settings)
Jason Monk [Tue, 25 Jul 2017 23:27:38 +0000 (23:27 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
am:
18cb24ba33
Change-Id: Ibdb8fa6a4e9ce57009342c12cf169df959974dd2
Selim Cinek [Tue, 25 Jul 2017 23:10:20 +0000 (23:10 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev
am:
e06e3f97fc
Change-Id: I60cd55a9d8ef2de15aa1f268f42923955c9d050c
Sundeep Ghuman [Tue, 25 Jul 2017 23:05:11 +0000 (23:05 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
am:
d68b6dc56b
Change-Id: If442689c6a05ad261a846a5252d9a0256520508e
Jason Monk [Tue, 25 Jul 2017 23:02:11 +0000 (23:02 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
am:
bad473d147
Change-Id: I211be901cd264c3ff4f505abf54dd1d9d8c7667d
Makoto Onuki [Tue, 25 Jul 2017 22:58:23 +0000 (22:58 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev
am:
906d8f57bf
Change-Id: Ied5b515396764d398807c4f945aaf55af87de03a
TreeHugger Robot [Tue, 25 Jul 2017 22:55:08 +0000 (22:55 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev
Selim Cinek [Tue, 25 Jul 2017 22:45:55 +0000 (22:45 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev
Bill Yi [Tue, 25 Jul 2017 22:44:17 +0000 (22:44 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
edfb7279ee -s ours
Change-Id: I1464cf2e842dc2c9751a6e801a714cd9234fc563
Bill Yi [Tue, 25 Jul 2017 22:42:01 +0000 (22:42 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am:
f969869726 -s ours
Change-Id: I11b516cc23ae3714a6c75d937bdb6a24a772c255
TreeHugger Robot [Tue, 25 Jul 2017 22:41:39 +0000 (22:41 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev
Winson Chung [Tue, 25 Jul 2017 22:39:12 +0000 (22:39 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev
am:
cb9f6de368
Change-Id: I37a8cf4df2a430ea1ecd2231d48bbfaa45a45d3d
Alison Cichowlas [Tue, 25 Jul 2017 22:36:50 +0000 (22:36 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev
am:
5110b31dda
Change-Id: I9a09aae1a3fe9957f8568af85c4f5ed1773b50f8
TreeHugger Robot [Tue, 25 Jul 2017 22:35:18 +0000 (22:35 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev
Andrew Sapperstein [Tue, 25 Jul 2017 22:34:15 +0000 (22:34 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev
am:
b63b011419
Change-Id: If69caeaacd480686f5737e2f96d6804ef13ce380
Lucas Dupin [Tue, 25 Jul 2017 22:29:41 +0000 (22:29 +0000)]
Merge "Ambient indicator text color" into oc-dr1-dev
am:
5c6c7586cd -s ours
Change-Id: I7e26ad486d3478c405d2547fb43accf01a7328e5
OSDN Git Service
