OSDN Git Service
Android Build Merger (Role) [Wed, 26 Jul 2017 08:31:07 +0000 (08:31 +0000)]
Merge "Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
090feca7b5 -s ours am:
816a4d38de -s ours" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 26 Jul 2017 08:30:34 +0000 (08:30 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
0ad45f6f76 -s ours am:
101cf38a40 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:29:10 +0000 (08:29 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
090feca7b5 -s ours
am:
816a4d38de -s ours
Change-Id: I2ec52f9136d4a821a88211a1a8263d37098a9b22
Bill Yi [Wed, 26 Jul 2017 08:28:43 +0000 (08:28 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
0ad45f6f76 -s ours
am:
101cf38a40 -s ours
Change-Id: I58d52127fe0103931071c261742186e1d2ca70ab
Android Build Merger (Role) [Wed, 26 Jul 2017 08:28:16 +0000 (08:28 +0000)]
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
5bbc5fe521 -s ours am:
b4b0c6acb4 -s ours" into oc-mr1-dev-plus-aosp
Bill Yi [Wed, 26 Jul 2017 08:25:13 +0000 (08:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours am:
5bbc5fe521 -s ours
am:
b4b0c6acb4 -s ours
Change-Id: I3cc6305086fb24b1d732288d2c8d7880dbd5a0ec
Bill Yi [Wed, 26 Jul 2017 08:25:11 +0000 (08:25 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
090feca7b5 -s ours
am:
b56bbb9dcb -s ours
Change-Id: Ia861a78a5d71eea2afdddb4a4329383a2e2b3080
Bill Yi [Wed, 26 Jul 2017 08:18:42 +0000 (08:18 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours am:
dcb5e77673 -s ours
am:
af65d78745 -s ours
Change-Id: I2576170517dac2e196691edf3b8c7a6a55dcd79d
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:17:46 +0000 (08:17 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
090feca7b5 -s ours
Change-Id: I393ed981f7f52e9ac81f8aac11c3f4108ce681e4
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:14:11 +0000 (08:14 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
b4e8cad186 -s ours
am:
5bbc5fe521 -s ours
Change-Id: I43cb6a9c7ea06c02575a53816cd649c6e0a4c2c2
Bill Yi [Wed, 26 Jul 2017 08:11:41 +0000 (08:11 +0000)]
Import translations. DO NOT MERGE am:
7c2b27f26f -s ours
am:
dcb5e77673 -s ours
Change-Id: I2f04880b253b79e28dceeb48237dd612b720fdba
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
Bill Yi [Wed, 26 Jul 2017 08:02:03 +0000 (08:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
b4e8cad186 -s ours
Change-Id: I5c909bf0c13581379f08f21394c1c3221944c93e
Bill Yi [Wed, 26 Jul 2017 07:59:43 +0000 (07:59 +0000)]
Import translations. DO NOT MERGE
am:
7c2b27f26f -s ours
Change-Id: I229f14aa24ced413b14247e372f6d94974fba315
TreeHugger Robot [Wed, 26 Jul 2017 07:53:12 +0000 (07:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Roozbeh Pournader [Wed, 26 Jul 2017 06:08:06 +0000 (06:08 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev am:
4fc156c451
am:
a637513640
Change-Id: Ie3fdab8a3061ecbf4a2da628d15f9ae35d75aa5b
Roozbeh Pournader [Wed, 26 Jul 2017 06:03:42 +0000 (06:03 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev am:
4fc156c451
am:
6ea806cab7
Change-Id: Ieac30429e78a9035c33016506bbd8e70aa486375
Android Build Merger (Role) [Wed, 26 Jul 2017 06:00:24 +0000 (06:00 +0000)]
Merge "Merge "Update overscroll and toast UI" into oc-dr1-dev am:
1c31f9653f am:
29e03e574b" into oc-mr1-dev-plus-aosp
Chet Haase [Wed, 26 Jul 2017 05:57:38 +0000 (05:57 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev am:
1c31f9653f
am:
29e03e574b
Change-Id: I0cea587c16ba49b593b1ed3ca59beb9bb9404105
Chet Haase [Wed, 26 Jul 2017 05:57:36 +0000 (05:57 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev am:
1c31f9653f
am:
36fa7f4eec
Change-Id: Ie3edd12921a1732781121ad89ed3661bb934a889
Roozbeh Pournader [Wed, 26 Jul 2017 05:53:38 +0000 (05:53 +0000)]
Merge "Remove Kwasio (nmg) from user-selectable languages" into oc-dr1-dev
am:
4fc156c451
Change-Id: Ib519d557c3b7c7bfad10e40553c5a8cabe4d7ea1
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
Chet Haase [Wed, 26 Jul 2017 05:47:46 +0000 (05:47 +0000)]
Merge "Update overscroll and toast UI" into oc-dr1-dev
am:
1c31f9653f
Change-Id: I206f0394e523c69bf74df51ad4b9779020714626
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
Android Build Merger (Role) [Wed, 26 Jul 2017 04:18:55 +0000 (04:18 +0000)]
Merge "Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am:
e31847642c am:
9d35a1ee6b" into oc-mr1-dev-plus-aosp
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
Winson Chung [Wed, 26 Jul 2017 04:16:33 +0000 (04:16 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am:
e31847642c
am:
9d35a1ee6b
Change-Id: I87f0758cccc701d9da5c9eb753105f407bb2e461
Winson Chung [Wed, 26 Jul 2017 04:16:30 +0000 (04:16 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev am:
e31847642c
am:
7fb48a776d
Change-Id: Ic95cc72ccd03e2bb11b417331a0994f06000c9ac
Winson Chung [Wed, 26 Jul 2017 04:09:05 +0000 (04:09 +0000)]
Merge "Ensure that we timeout waiting when starting the PiP menu activity" into oc-dr1-dev
am:
e31847642c
Change-Id: Ida93e02bae4e099ae20d2db7bd0d3efb774a546c
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
Eric Schwarzenbach [Wed, 26 Jul 2017 03:53:29 +0000 (03:53 +0000)]
Merge "Only display RSSI/band information if network is connected." into oc-mr1-dev
am:
c7886489ee
Change-Id: I18be4be9f92d841cf5579ecde4fd6b73c860ee93
Eric Schwarzenbach [Wed, 26 Jul 2017 03:51:02 +0000 (03:51 +0000)]
Merge "Sort APs by Speed label value instead of ranking score." into oc-mr1-dev
am:
3b8ce7c6d7
Change-Id: I43772768b4fe58de3a6b4fa1af909ed06122f802
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:35:32 +0000 (03:35 +0000)]
Merge "Remove RetailDemoModeServiceInternal" into oc-mr1-dev
am:
cfb5d97c3f
Change-Id: I614791d2b37573eebfb0a1e5b6da6993267e0f62
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 03:04:15 +0000 (03:04 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am:
bdaada0af9
am:
0caac28160
Change-Id: If27b4e737b93fd1452445fc2e3b9f84dfc621b25
Christine Franks [Wed, 26 Jul 2017 02:59:55 +0000 (02:59 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev am:
bdaada0af9
am:
a9a5c9f017
Change-Id: I1e1d318334514e63092dfb56b8f9525468244472
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
Android Build Merger (Role) [Wed, 26 Jul 2017 02:54:17 +0000 (02:54 +0000)]
Merge "Don't block the input thread to notify the StatusBar about key events. am:
4b5b3c6ccc am:
400f09200e" into oc-mr1-dev-plus-aosp
Christine Franks [Wed, 26 Jul 2017 02:52:59 +0000 (02:52 +0000)]
Merge "DO NOT MERGE - Update night display coefficients" into oc-dr1-dev
am:
bdaada0af9
Change-Id: I603e609a6068e53f270eafefcf56dcaa496db12a
Philip Quinn [Wed, 26 Jul 2017 02:52:31 +0000 (02:52 +0000)]
Don't block the input thread to notify the StatusBar about key events. am:
4b5b3c6ccc
am:
400f09200e
Change-Id: I1a8b630e64da1e6419bdd05a04084c66953e1f12
Philip Quinn [Wed, 26 Jul 2017 02:51:12 +0000 (02:51 +0000)]
Don't block the input thread to notify the StatusBar about key events. am:
4b5b3c6ccc
am:
6ccaea570d
Change-Id: If7dde636fad2d7bfb5dd4bba1890a46287efa985
Philip Quinn [Wed, 26 Jul 2017 02:44:56 +0000 (02:44 +0000)]
Don't block the input thread to notify the StatusBar about key events.
am:
4b5b3c6ccc
Change-Id: Ie5e9f5a71b49c7eca1d646d72680998aef39f69c
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
Android Build Merger (Role) [Wed, 26 Jul 2017 02:44:28 +0000 (02:44 +0000)]
Merge "Merge "Themable volume and power dialogs" into oc-dr1-dev am:
59aadea809 am:
9e7262732c" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Wed, 26 Jul 2017 02:43:34 +0000 (02:43 +0000)]
Merge "Merge "Themable volume and power dialogs" into oc-dr1-dev am:
59aadea809 am:
a35d4bc639" into oc-mr1-dev-plus-aosp
Lucas Dupin [Wed, 26 Jul 2017 02:42:35 +0000 (02:42 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev am:
59aadea809
am:
9e7262732c
Change-Id: I79ce0e73daf319f0cf5ee5fd3e3b3df6ad3a1be2
Android Build Merger (Role) [Wed, 26 Jul 2017 02:42:11 +0000 (02:42 +0000)]
Merge "Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am:
192e7ccf45 am:
af35c76897" into oc-mr1-dev-plus-aosp
Lucas Dupin [Wed, 26 Jul 2017 02:42:03 +0000 (02:42 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev am:
59aadea809
am:
a35d4bc639
Change-Id: I949028d0efda4b01141346bb008b32eed8cb4a76
Kevin Chyn [Wed, 26 Jul 2017 02:40:27 +0000 (02:40 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am:
192e7ccf45
am:
af35c76897
Change-Id: If0df54f19b6eee4975c378e2ec647c76387df93e
Kevin Chyn [Wed, 26 Jul 2017 02:39:16 +0000 (02:39 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev am:
192e7ccf45
am:
e54f5bac63
Change-Id: I31c34152803581cddcaadd58d67ff4e7d821a3e1
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:30:25 +0000 (02:30 +0000)]
Merge "Themable volume and power dialogs" into oc-dr1-dev
am:
59aadea809
Change-Id: I14947611e687399221701b82401fd0efcee09e11
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:28:11 +0000 (02:28 +0000)]
Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
am:
192e7ccf45
Change-Id: I22f3e2968a724bd6c63b5f9696d1115d571efaf8
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
Todd Kennedy [Wed, 26 Jul 2017 01:22:20 +0000 (01:22 +0000)]
Merge "compressed images on system partition" into oc-mr1-dev
am:
94902c46ba
Change-Id: If75e5600436193b69386eb4d3f563e9bd6242caf
TreeHugger Robot [Wed, 26 Jul 2017 01:09:33 +0000 (01:09 +0000)]
Merge "compressed images on system partition" into oc-mr1-dev
George Burgess IV [Wed, 26 Jul 2017 01:03:50 +0000 (01:03 +0000)]
Merge "Silence a memory leak warning from the static analyzer" am:
f44ebf5fcb am:
20674ac1eb am:
b759691046
am:
89c254612e
Change-Id: I6ee0208f290e46e1053907e853149dd5b506e2d5
Christine Franks [Wed, 26 Jul 2017 00:50:49 +0000 (00:50 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev am:
4ac942f140
am:
cb03504d21
Change-Id: Ib1849c5f7d7bf5fcdf403cec73db3848ac12f2cb
George Burgess IV [Wed, 26 Jul 2017 00:50:07 +0000 (00:50 +0000)]
Merge "Silence a memory leak warning from the static analyzer" am:
f44ebf5fcb am:
20674ac1eb
am:
b759691046
Change-Id: I6cc8b3e3e610e12e0df592b615556c5b8b1e45ea
Christine Franks [Thu, 20 Jul 2017 21:01:55 +0000 (14:01 -0700)]
Remove RetailDemoModeServiceInternal
Bug:
62712426
Test: make -j100
Change-Id: I0b852aef30a8cadcda08fcff1dcf861aac2a4d7e
George Burgess IV [Wed, 26 Jul 2017 00:37:03 +0000 (00:37 +0000)]
Merge "Silence a memory leak warning from the static analyzer" am:
f44ebf5fcb
am:
20674ac1eb
Change-Id: I0f0efff718ae96adcc30ef6554aaccc96da66b0a
Christine Franks [Wed, 26 Jul 2017 00:33:14 +0000 (00:33 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev am:
4ac942f140 -s ours
am:
5c74928b71
Change-Id: Iea9ce7b698a0743169ac948f2c62d3942e25fb3c
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
George Burgess IV [Wed, 26 Jul 2017 00:26:12 +0000 (00:26 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
am:
f44ebf5fcb
Change-Id: Ic0b97fb0689b4d322aa6ed25fe55ec192bff07a5
Jason Monk [Wed, 26 Jul 2017 00:21:11 +0000 (00:21 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev am:
18cb24ba33
am:
43a7e94d4b
Change-Id: I41d228458b4a75e4754593b542adac8d6709bda0
Christine Franks [Wed, 26 Jul 2017 00:16:28 +0000 (00:16 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
am:
4ac942f140
Change-Id: I3d09e6fe436ae1ced8f9ed88e919f1d9bb5e52db
Selim Cinek [Wed, 26 Jul 2017 00:15:02 +0000 (00:15 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev am:
e06e3f97fc
am:
49cdbaa25f
Change-Id: Ie282d7a84ec75de60d507b3f88c1eea614e6fb41
Treehugger Robot [Wed, 26 Jul 2017 00:12:51 +0000 (00:12 +0000)]
Merge "Silence a memory leak warning from the static analyzer"
Sundeep Ghuman [Wed, 26 Jul 2017 00:12:21 +0000 (00:12 +0000)]
Merge "Do not evict scan results in cold start." into oc-dr1-dev am:
d68b6dc56b
am:
2a75be2d58
Change-Id: Ic8f449741ebd7e0d59460ad745ff384bf3f13a00
Jason Monk [Wed, 26 Jul 2017 00:07:57 +0000 (00:07 +0000)]
Merge "Fix RTL for Nav icons" into oc-dr1-dev am:
bad473d147
am:
0cbfa21cdd
Change-Id: I8c981c9cea32eb6f53b0f6117eabe408d16affab
Christine Franks [Wed, 26 Jul 2017 00:07:14 +0000 (00:07 +0000)]
Merge "DO NOT MERGE - Remove RetailDemoModeServiceInternal" into oc-dr1-dev
Makoto Onuki [Wed, 26 Jul 2017 00:05:00 +0000 (00:05 +0000)]
Merge "Don't unbind from the sync adapter before cancelSync()." into oc-dr1-dev am:
906d8f57bf
am:
98ae1bdf6a
Change-Id: I052b89bdd712efcdd466f76191ff1aa47cb19b85
Bill Yi [Wed, 26 Jul 2017 00:01:33 +0000 (00:01 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
edfb7279ee -s ours
am:
a75fd73c2d -s ours
Change-Id: Icf92d8c400964d248c5e1af7262aa2ed69de54f6
Bill Yi [Tue, 25 Jul 2017 23:58:03 +0000 (23:58 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am:
f969869726 -s ours
am:
5b87d8bf42 -s ours
Change-Id: I4b667cdfef0c2115e7f141204d1f385aff77fb4a
Winson Chung [Tue, 25 Jul 2017 23:52:10 +0000 (23:52 +0000)]
Merge "Prevent NPE, add logging for tracking down root issue." into oc-dr1-dev am:
cb9f6de368
am:
45f96a350a
Change-Id: I76d640f5bd8387390f2cf3fdb87703e0f2d686d1
Alison Cichowlas [Tue, 25 Jul 2017 23:48:51 +0000 (23:48 +0000)]
Merge "Make back button dismiss power dialog, by making dialog focusable." into oc-dr1-dev am:
5110b31dda
am:
3cb54e4aaa
Change-Id: I13032f8c54094cb36ac2d842b6345ae0bdd78a33
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
Android Build Merger (Role) [Tue, 25 Jul 2017 23:46:07 +0000 (23:46 +0000)]
Merge "Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev am:
b63b011419 am:
2a7356e339" into oc-mr1-dev-plus-aosp
Andrew Sapperstein [Tue, 25 Jul 2017 23:42:30 +0000 (23:42 +0000)]
Merge "Use config_headlineFontFeatureSettings for lockscreen clock" into oc-dr1-dev am:
b63b011419
am:
2a7356e339
Change-Id: Ia1b8fb7be215e8ddb69ad1008230a5fba4864e73
Android Build Merger (Role) [Tue, 25 Jul 2017 23:40:53 +0000 (23:40 +0000)]
Merge "Merge "Ambient indicator text color" into oc-dr1-dev am:
5c6c7586cd am:
f7fd8bb284 -s ours" into oc-mr1-dev-plus-aosp
Lucas Dupin [Tue, 25 Jul 2017 23:37:33 +0000 (23:37 +0000)]
Merge "Ambient indicator text color" into oc-dr1-dev am:
5c6c7586cd
am:
f7fd8bb284 -s ours
Change-Id: I8ce79cd689db94a3fcb8d210dcf85c51efd4993f
Jason Monk [Tue, 25 Jul 2017 23:37:23 +0000 (23:37 +0000)]
Merge "Add confirmation dialog when turning off cell data from QS" into oc-dr1-dev am:
18cb24ba33
am:
54de77e1c6
Change-Id: Ibacd61d3671d75fcba7e13813f40c48dc444da4c
Android Build Merger (Role) [Tue, 25 Jul 2017 23:34:40 +0000 (23:34 +0000)]
Merge "Merge "Changing the way the media image scales" into oc-dr1-dev am:
e06e3f97fc am:
d0644e4493" into oc-mr1-dev-plus-aosp
Selim Cinek [Tue, 25 Jul 2017 23:32:40 +0000 (23:32 +0000)]
Merge "Changing the way the media image scales" into oc-dr1-dev am:
e06e3f97fc
am:
d0644e4493
Change-Id: I35883ffb6ff260bd101578333b9543621903e40c
Android Build Merger (Role) [Tue, 25 Jul 2017 23:32:18 +0000 (23:32 +0000)]
Merge "Merge "Do not evict scan results in cold start." into oc-dr1-dev am:
d68b6dc56b am:
f5b7da9b32" into oc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 25 Jul 2017 23:31:49 +0000 (23:31 +0000)]
Merge "Merge "Fix jank when switching themes" into oc-dr1-dev am:
a1f64b0a91 am:
667c29d0be -s ours" into oc-mr1-dev-plus-aosp
OSDN Git Service
