git.osdn.net Git - android-x86/frameworks-base.git/log

Alan Viverette [Thu, 21 Apr 2016 21:31:32 +0000 (21:31 +0000)]

Merge "API review feedback for ProgressBar" into nyc-dev am: 5500bb1d6d
am: c27d18d681

* commit 'c27d18d681b3b2e70640b0267b019ce174260799':

Change-Id: I52fd632de8392eaf775b11a3fbbb16a825f99a80

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:31:30 +0000 (21:31 +0000)]

Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d
am: 37ab66ab37

* commit '37ab66ab37b09fb56a5d9d9f809d956b78e637d6':

Change-Id: I1fedad600d0b5598ecd91929cd9dc1212d504216

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:29:22 +0000 (21:29 +0000)]

Merge "API review feedback for ProgressBar" into nyc-dev am: 5500bb1d6d
am: c1a3af4546

* commit 'c1a3af4546782846ef94e4ffd960133107707a88':
API review feedback for ProgressBar

Change-Id: I0bdf04c9e8a276479976d8647d208a7d95a4f506

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:29:18 +0000 (21:29 +0000)]

Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev am: e84393674d
am: d1fb914324

* commit 'd1fb9143244dcb46b28a0edbae88f8f5815d31bf':
Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I0eca2b999be91c6c38df392ef62a4177ce20069f

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:27:06 +0000 (21:27 +0000)]

Merge "API review feedback for ProgressBar" into nyc-dev
am: 5500bb1d6d

* commit '5500bb1d6d5d5c49f7bb5d81b48a707f1ade75ab':
API review feedback for ProgressBar

Change-Id: If6e1d8d9211b86030d8a678b6030df4cc50c9e77

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:27:03 +0000 (21:27 +0000)]

Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev
am: e84393674d

* commit 'e84393674da0f5ecce2ee1074fc79c856f549623':
Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:27:03 +0000 (21:27 +0000)]

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:27:02 +0000 (21:27 +0000)]

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:21:55 +0000 (21:21 +0000)]

Merge "API review feedback for ProgressBar" into nyc-dev

commit | commitdiff | tree

Alan Viverette [Thu, 21 Apr 2016 21:21:33 +0000 (21:21 +0000)]

Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 21:10:55 +0000 (21:10 +0000)]

Merge "Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4 am: a51eb55a24" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 21:10:32 +0000 (21:10 +0000)]

Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4
am: a51eb55a24

* commit 'a51eb55a24c21d74e81619b988b17a39c85275cf':

Change-Id: Iade7f309c2202d41e171467b8f95778ad1e2892e

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 21:08:55 +0000 (21:08 +0000)]

Merge "Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4 am: a51eb55a24" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 21:08:35 +0000 (21:08 +0000)]

Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4
am: a51eb55a24

* commit 'a51eb55a24c21d74e81619b988b17a39c85275cf':
add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I3c4a3e7a7bbff6af38ff7e831fda6d20fcb62971

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 21:08:33 +0000 (21:08 +0000)]

Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev am: 22d91b0eb4
am: b99a507ec0

* commit 'b99a507ec06be926972f8920ce88ffac48632125':
add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I0b7175c11ff9698d912136ecc1a4502e89f237a6

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 21:06:24 +0000 (21:06 +0000)]

Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev
am: 22d91b0eb4

* commit '22d91b0eb40137e6236d7af5d2857df97648d15b':
add @RemotableViewMethod to TextView#setEnabled b/28304068

Change-Id: I7d8f610e543ad1ef9937b342c04feb75774c0b23

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 21:06:21 +0000 (21:06 +0000)]

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 21:04:23 +0000 (21:04 +0000)]

Merge "add @RemotableViewMethod to TextView#setEnabled b/28304068" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:59:43 +0000 (20:59 +0000)]

Merge "Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am: 5da7a4a3f0 am: 0f1ed72a9a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 20:59:22 +0000 (20:59 +0000)]

Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am: 5da7a4a3f0
am: 0f1ed72a9a

* commit '0f1ed72a9af60ebff6416165546630b42fd6f108':

Change-Id: I7897a148a4fb67d2151573f142dda3a7553aad74

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:57:51 +0000 (20:57 +0000)]

Merge "Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am: 5da7a4a3f0 am: 0f1ed72a9a" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 20:57:27 +0000 (20:57 +0000)]

Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am: 5da7a4a3f0
am: 0f1ed72a9a

* commit '0f1ed72a9af60ebff6416165546630b42fd6f108':
Make sure don't adjust IME when docked left-right

Change-Id: I5881b9d04e2a37ffab815a96e0d711dd3bb2ea69

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 20:57:25 +0000 (20:57 +0000)]

Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev am: 5da7a4a3f0
am: b35794163c

* commit 'b35794163ca40981967073f616edb28e6ca52706':
Make sure don't adjust IME when docked left-right

Change-Id: I2f7f195c855ed838079b06747e7e8ae8380e676f

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 20:55:11 +0000 (20:55 +0000)]

Merge "Make sure don\'t adjust IME when docked left-right" into nyc-dev
am: 5da7a4a3f0

* commit '5da7a4a3f078b2a770fc36be8a3c0d9c522525f8':
Make sure don't adjust IME when docked left-right

Change-Id: I581b424e672807830a3937a1f9ed0797b6210089

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 20:55:10 +0000 (20:55 +0000)]

commit | commitdiff | tree

Hyunyoung Song [Thu, 21 Apr 2016 20:41:56 +0000 (13:41 -0700)]

add @RemotableViewMethod to TextView#setEnabled
b/28304068

Change-Id: Ia5464030a65c87dacdd75e5be331da017d7ef593

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:40:32 +0000 (20:40 +0000)]

Merge "Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8 am: d0a55f2ecb" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:40:19 +0000 (20:40 +0000)]

Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da am: f19fdfb08d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 20:39:54 +0000 (20:39 +0000)]

Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8
am: d0a55f2ecb

* commit 'd0a55f2ecb3371291ef086f737c1f5722ee995e7':

Change-Id: I248e7e08680695e7103ab099b4ecbdc088b9dfca

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:39:51 +0000 (20:39 +0000)]

Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da
am: f19fdfb08d

* commit 'f19fdfb08d1baee6738587eb2b68a993ff2dee6e':

Change-Id: I6c9141c0b764cdf80b43f60861ea77b684ef8196

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:38:06 +0000 (20:38 +0000)]

Merge "Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8 am: d0a55f2ecb" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:37:53 +0000 (20:37 +0000)]

Merge "Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da am: f19fdfb08d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 20:37:19 +0000 (20:37 +0000)]

Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8
am: d0a55f2ecb

* commit 'd0a55f2ecb3371291ef086f737c1f5722ee995e7':
Remove pre-N db after successful migration

Change-Id: Ieabdea8b1093f46fcf54e43f0773c0c7175f0428

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 20:37:16 +0000 (20:37 +0000)]

Merge "Remove pre-N db after successful migration" into nyc-dev am: cdb5fcf7b8
am: 8a7414ea55

* commit '8a7414ea5550514920a09183727775ae92608810':
Remove pre-N db after successful migration

Change-Id: I93e2f2db8b6d23d3d483593317a9e2befd5c22d2

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:37:16 +0000 (20:37 +0000)]

Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da
am: f19fdfb08d

* commit 'f19fdfb08d1baee6738587eb2b68a993ff2dee6e':
QS: Use current tile state when removing custom tiles

Change-Id: I6f504f461e3cfe83011c50d0afdac8030f06e28e

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:37:14 +0000 (20:37 +0000)]

Merge "QS: Use current tile state when removing custom tiles" into nyc-dev am: 53c116f5da
am: 644cbd668f

* commit '644cbd668f2bd6ce2da90b445e918c445b71c851':
QS: Use current tile state when removing custom tiles

Change-Id: I1669594028b9321ddd424e2ea3aadf601b92a94c

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 20:35:26 +0000 (20:35 +0000)]

Merge "Make sure don't adjust IME when docked left-right" into nyc-dev

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 20:35:05 +0000 (20:35 +0000)]

Merge "Remove pre-N db after successful migration" into nyc-dev
am: cdb5fcf7b8

* commit 'cdb5fcf7b81de81793995097b017c001be2a4264':
Remove pre-N db after successful migration

Change-Id: I3c45a3bc5bf26fccf5fd8b09e0d8e1989b8832a0

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 20:35:02 +0000 (20:35 +0000)]

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:35:02 +0000 (20:35 +0000)]

Merge "QS: Use current tile state when removing custom tiles" into nyc-dev
am: 53c116f5da

* commit '53c116f5da0c5a8d0da5f046b892d7a106d4937a':
QS: Use current tile state when removing custom tiles

Change-Id: I73edc9a6029ed38e41abd0d8908a345b4631ad1e

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:35:00 +0000 (20:35 +0000)]

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 20:30:37 +0000 (20:30 +0000)]

Merge "Remove pre-N db after successful migration" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:26:30 +0000 (20:26 +0000)]

Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a am: 767c3e0df1" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:26:09 +0000 (20:26 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a
am: 767c3e0df1

* commit '767c3e0df1849b760b7f6b5011afaa06bcd92846':

Change-Id: I0011e7a74ba9bbb812a3dd49f70ed45733d0bf56

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:25:31 +0000 (20:25 +0000)]

Merge "QS: Use current tile state when removing custom tiles" into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:32 +0000 (20:24 +0000)]

Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a am: 767c3e0df1" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:27 +0000 (20:24 +0000)]

Merge "Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a am: a179d2035c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 20:24:21 +0000 (20:24 +0000)]

Merge "Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb27 am: 608e919b3d" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:23:53 +0000 (20:23 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a
am: 767c3e0df1

* commit '767c3e0df1849b760b7f6b5011afaa06bcd92846':
Announce when volume controls appear and disappear.

Change-Id: I5e5e50ab49013cf390157ff5f97a59516cc5cd1a

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:23:50 +0000 (20:23 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb27
am: 608e919b3d

* commit '608e919b3d82faaec21c9e6e6a8bd47c150504fb':
Make Dismiss Icon under Cards show up only when focused.

Change-Id: Id61875edea2b596f13dc7938e85ae85462673428

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:23:49 +0000 (20:23 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev am: c14996393a
am: a179d2035c

* commit 'a179d2035cdbbbbafcae4ef9e21090b303f38510':
Announce when volume controls appear and disappear.

Change-Id: I530c4fd88f7c72dfa41a136366fa6ad0baa5641b

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:23:47 +0000 (20:23 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev am: 6efc5dcb27
am: 0565aa2491

* commit '0565aa2491e6c3e9fe2b0b4b9f6ee5766874f8d9':
Make Dismiss Icon under Cards show up only when focused.

Change-Id: Iacd94569365756dac206ff64d632927facb7f748

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:21:34 +0000 (20:21 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev
am: c14996393a

* commit 'c14996393a976c1ca9ac7cef01a052614a84a7f4':
Announce when volume controls appear and disappear.

Change-Id: I6ba293a46f1a51413e1ca5c5ae17b5756dc37993

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:21:32 +0000 (20:21 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev
am: 6efc5dcb27

* commit '6efc5dcb274d08ba7dc812c90089bc10a38b890e':
Make Dismiss Icon under Cards show up only when focused.

Change-Id: I5bdd6346c01c432d268bcc23379a2311be5a7069

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:21:31 +0000 (20:21 +0000)]

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:21:30 +0000 (20:21 +0000)]

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 20:18:27 +0000 (20:18 +0000)]

Merge "Announce when volume controls appear and disappear." into nyc-dev

commit | commitdiff | tree

Jason Monk [Thu, 21 Apr 2016 20:14:27 +0000 (16:14 -0400)]

QS: Use current tile state when removing custom tiles

Change-Id: If12415c051239348261386fb23e88d6725767ba0
Fixes: 27912532

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 20:06:29 +0000 (20:06 +0000)]

Merge "Make Dismiss Icon under Cards show up only when focused." into nyc-dev

commit | commitdiff | tree

Mihai Niță [Thu, 21 Apr 2016 20:05:56 +0000 (20:05 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d
am: f3aa91d9a4

* commit 'f3aa91d9a45ae4595540be46e11bc4132cb18568':

Change-Id: Icd8f84d874d39efb524cfd1fb990d5b1b71d2c4a

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 20:05:52 +0000 (20:05 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8
am: 674bedee2e

* commit '674bedee2ec388201b0482946bd5535c419c8f21':

Change-Id: I69081e1537c0c2624d4ad590095ce05572b0faef

commit | commitdiff | tree

Mihai Niță [Thu, 21 Apr 2016 20:03:38 +0000 (20:03 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev am: 344bd5c63d
am: 76dca16404

* commit '76dca1640402e43854feda311b1bfe174afea664':
Framework: change the TTS text to use the current locale

Change-Id: Iaabcdac0fd1bf8c6d3d6d3a9b7e87ca911518949

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 20:03:34 +0000 (20:03 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev am: 37696cccd8
am: ff54c9eeb2

* commit 'ff54c9eeb2eeebebcb8d14fd35dfcdcbafa187a6':
Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: Ie0530121ee8dc34ae41f89acb27eeaf41ddf3534

commit | commitdiff | tree

Mihai Nita [Thu, 21 Apr 2016 20:01:18 +0000 (20:01 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev
am: 344bd5c63d

* commit '344bd5c63dfbe9a6aaef68144d04d3613563c080':
Framework: change the TTS text to use the current locale

Change-Id: I23d1acfd0b53fddeec4e9ad183d90d1cf7a9708e

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 20:01:15 +0000 (20:01 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev
am: 37696cccd8

* commit '37696cccd8925ca6e4aa6f2ca6f29807066c7f1e':
Respect manually set HARDWARE_ACCELERATED flag.

Change-Id: I2b63fc161dc7dccf21080ad7dd27d9b958808ad1

commit | commitdiff | tree

Mihai Nita [Thu, 21 Apr 2016 20:01:14 +0000 (20:01 +0000)]

commit | commitdiff | tree

Robert Carr [Thu, 21 Apr 2016 20:01:13 +0000 (20:01 +0000)]

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 19:57:55 +0000 (12:57 -0700)]

Make sure don't adjust IME when docked left-right

bug: 28295645
Change-Id: Ia8f7f9a92fcc562bd672abae4d3ddfd6e6201a79

commit | commitdiff | tree

Mihai Niță [Thu, 21 Apr 2016 19:55:41 +0000 (19:55 +0000)]

Merge "Framework: change the TTS text to use the current locale" into nyc-dev

commit | commitdiff | tree

Rob Carr [Thu, 21 Apr 2016 19:52:01 +0000 (19:52 +0000)]

Merge "Respect manually set HARDWARE_ACCELERATED flag." into nyc-dev

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 19:20:36 +0000 (19:20 +0000)]

Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a am: 19ad9f3f9e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:20:16 +0000 (19:20 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a
am: 19ad9f3f9e

* commit '19ad9f3f9e544a2262881a1d35d233ecb36dc3a3':

Change-Id: I1492ed196a8895ea83cda3f602543dfb8042e76d

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 19:18:42 +0000 (19:18 +0000)]

Merge "Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a am: 19ad9f3f9e" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:18:06 +0000 (19:18 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a
am: 19ad9f3f9e

* commit '19ad9f3f9e544a2262881a1d35d233ecb36dc3a3':
Fix order of operation issue with ResStringPool

Change-Id: I7b19b7162ec9b5df54f503056781e636345d6533

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:18:04 +0000 (19:18 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev am: b53e8a7a8a
am: da749ed997

* commit 'da749ed997644b2ad5e3643768c13f92e839db62':
Fix order of operation issue with ResStringPool

Change-Id: I00fdd69046f77fbc5d4c41476adc2d0a2073d56a

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:15:47 +0000 (19:15 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev
am: b53e8a7a8a

* commit 'b53e8a7a8aa495289ab2872032f80501edd472ef':
Fix order of operation issue with ResStringPool

Change-Id: Idaca4dee242389680b82b9d58728d281a65f9116

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:15:45 +0000 (19:15 +0000)]

commit | commitdiff | tree

Adam Lesinski [Thu, 21 Apr 2016 19:08:38 +0000 (19:08 +0000)]

Merge "Fix order of operation issue with ResStringPool" into nyc-dev

commit | commitdiff | tree

Julia Reynolds [Thu, 21 Apr 2016 18:58:52 +0000 (14:58 -0400)]

Announce when volume controls appear and disappear.

Bug: 28120156
Change-Id: I4e17b9cf1cd4a442adb7513168c12e3af24c424f

commit | commitdiff | tree

Fyodor Kupolov [Thu, 21 Apr 2016 18:26:14 +0000 (11:26 -0700)]

Remove pre-N db after successful migration

Bug: 26279712
Change-Id: I53e4bd1b04b4ae6b94e8b5642d7f11a4edd6f1e4

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:30:59 +0000 (18:30 +0000)]

Merge "Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095 am: bdf90a2d1c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:30:36 +0000 (18:30 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: bdf90a2d1c

* commit 'bdf90a2d1c357cb6ebfa0101b06821553d7cd120':

Change-Id: I257fa1af4faea0833cc6f723aedd2185a6629898

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:29:06 +0000 (18:29 +0000)]

Merge "Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095 am: bdf90a2d1c" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:28:38 +0000 (18:28 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: 0bf32f0589

* commit '0bf32f0589efc3412af702ce370d7a79432e4ec7':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I30868022115cd389036efed24189f1f26c21c3af

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:28:35 +0000 (18:28 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev am: dc7ce84095
am: bdf90a2d1c

* commit 'bdf90a2d1c357cb6ebfa0101b06821553d7cd120':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I4f1410e6862e8ae9bfd288d4404bedab387237a7

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:26:21 +0000 (18:26 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev
am: dc7ce84095

* commit 'dc7ce840950398518cc116924b173eb7b7f3288a':
AudioManager: fix isBluetoothA2dpOn()

Change-Id: I7a655431e766701b2f02c468aae163554e47ecdb

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:26:19 +0000 (18:26 +0000)]

commit | commitdiff | tree

Eric Laurent [Thu, 21 Apr 2016 18:22:57 +0000 (18:22 +0000)]

Merge "AudioManager: fix isBluetoothA2dpOn()" into nyc-dev

commit | commitdiff | tree

Sid Soundararajan [Thu, 21 Apr 2016 18:20:52 +0000 (11:20 -0700)]

Make Dismiss Icon under Cards show up only when focused.

BUG: 28299529
Change-Id: I37cd029734da5de8416705746457151c22f64280

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:19:38 +0000 (18:19 +0000)]

Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:19:15 +0000 (18:19 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':

Change-Id: I00caf1bea81a1152eaa47c7a3c9e93c6345af61a

commit | commitdiff | tree

Android Build Merger (Role) [Thu, 21 Apr 2016 18:17:44 +0000 (18:17 +0000)]

Merge "Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe am: 31e3b5c065" into nyc-mr1-dev-plus-aosp

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:17:19 +0000 (18:17 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 31e3b5c065

* commit '31e3b5c065d596b5a1a8d0638183ac737414f913':
Fix dead surface/window left on screen

Change-Id: I46664a5f9ca48557fab650385409e445267b109d

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:17:11 +0000 (18:17 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev am: 289395b1fe
am: 786302f2fa

* commit '786302f2fa658740b1819bc53e3ca3e3f2b4e01e':
Fix dead surface/window left on screen

Change-Id: Ibba49102dbd1bdfe7aba4b5cf022b3c3c0098e9a

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:15:02 +0000 (18:15 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev
am: 289395b1fe

* commit '289395b1feca65fc758384bb2d5c12f1c78500c1':
Fix dead surface/window left on screen

Change-Id: Idd818246a5ada66abc24806529848d8d25a2e383

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 18:14:59 +0000 (18:14 +0000)]

commit | commitdiff | tree

Chong Zhang [Thu, 21 Apr 2016 17:58:50 +0000 (17:58 +0000)]

Merge "Fix dead surface/window left on screen" into nyc-dev

commit | commitdiff | tree

Daniel Nishi [Thu, 21 Apr 2016 17:57:04 +0000 (17:57 +0000)]

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev
am: 0cdb8177ea

* commit '0cdb8177eaa47a3a5d3c1ba5112bc3385b70c78a':
Add a branded VPN icon for quick settings and status bar.

Change-Id: I61b79cb9b3007116ad8b6c37987f511f1c623ddf

commit | commitdiff | tree

Daniel Nishi [Thu, 21 Apr 2016 17:39:59 +0000 (17:39 +0000)]

Merge "Add a branded VPN icon for quick settings and status bar." into nyc-mr1-dev

commit | commitdiff | tree

Yohei Yukawa [Thu, 21 Apr 2016 17:20:53 +0000 (17:20 +0000)]

Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev am: d67a1ca49b
am: e3512894af

* commit 'e3512894afbdc0f28b67e021edb76d0c5d13c2f7':

Change-Id: I6d9f12a9161fdd2ff0aaf0694ec21bdc500a69b5