227643 Commits

Author SHA1 Message Date
Alan Viverette
2ce4f73bf7 Merge "Snap AbsSeekBar touches to nearest progress tick" 2015-12-09 17:43:05 +00:00
Jeff Tinker
67b39bfa08 Merge "Remove unused MediaDrm.unprovisionDevice" 2015-12-09 17:07:35 +00:00
Roozbeh Pournader
3f74371155 Merge "Revert "Fix Build: Revert "Implement locale matching in LocalesList.""" 2015-12-09 17:06:10 +00:00
Jeff Tinker
dade24c12a Remove unused MediaDrm.unprovisionDevice
bug:25726218
Change-Id: Ibbd51aaa1ee4c21c9ec8b162fc6e378ab7ba6e7b
2015-12-09 09:02:31 -08:00
Geoff Mendal
25a70480bf Merge "Import translations. DO NOT MERGE" 2015-12-09 17:00:23 +00:00
Geoff Mendal
dd77586fbe Import translations. DO NOT MERGE
Change-Id: I9ae6a0c8d700e00989b9d16504fce1e13dcbdc64
Auto-generated-cl: translation import
2015-12-09 17:58:40 +01:00
Narayan Kamath
6f775a8d0f Merge "Track API changes to java.lang.ref.Reference." 2015-12-09 16:19:39 +00:00
Narayan Kamath
12f62b7ec1 Track API changes to java.lang.ref.Reference.
Change-Id: Iea25e3e0efec56106f44d42232e772cf36f76e68
2015-12-09 15:59:03 +00:00
Geoff Mendal
2a505d5353 Merge "Import translations. DO NOT MERGE" 2015-12-09 13:59:00 +00:00
Geoff Mendal
4074c62275 Merge "Import translations. DO NOT MERGE" 2015-12-09 13:56:41 +00:00
Geoff Mendal
43d3a684a2 Import translations. DO NOT MERGE
Change-Id: Ied4210296919bd005ab065b06d15823f306c4917
Auto-generated-cl: translation import
2015-12-09 05:52:15 -08:00
Geoff Mendal
84945e5e51 Import translations. DO NOT MERGE
Change-Id: I1b5951f177c1c02c9aa11dea03365253138b8a30
Auto-generated-cl: translation import
2015-12-09 05:50:28 -08:00
Geoff Mendal
65ced64afa Merge "Import translations. DO NOT MERGE" 2015-12-09 13:44:08 +00:00
Geoff Mendal
7e050948bf Import translations. DO NOT MERGE
Change-Id: I461b9fb136ac4ccb6ae9fb655a06da057c7fdca0
Auto-generated-cl: translation import
2015-12-09 05:40:42 -08:00
Geoff Mendal
99ea6d61eb Merge "Import translations. DO NOT MERGE" 2015-12-09 13:21:44 +00:00
Geoff Mendal
7a0a29aa89 Import translations. DO NOT MERGE
Change-Id: Idad1f411e8a8e621ad7c1886ae8eaa03b0d3eb17
Auto-generated-cl: translation import
2015-12-09 05:19:19 -08:00
Lorenzo Colitti
899d2af1df Merge "Add a new WakeupMessage class and use it in two places." 2015-12-09 13:08:21 +00:00
Niels Egberts
c9bd275db5 Merge "Fix checks for audio format." 2015-12-09 11:42:36 +00:00
Roozbeh Pournader
2591cc8630 Revert "Fix Build: Revert "Implement locale matching in LocalesList.""
This reverts commit 9c2f0d751d16360a2cd857b1db752f0009481b21.

The original commit, 17b2b2d45854b56de7aa6d1581526e45991274d4, had
missed adding api/test-current.txt.

Change-Id: I26a6325b3cee4c2412ee599f002cc6addb35d36f
2015-12-08 22:28:30 -08:00
Insun Kang
9dd66417ea MediaRouter: Add getDeviceType() to RouteInfo
Bug: 24777080
Change-Id: I5d7b44ec84371fbb9560578ece439e1a00dcdd50
2015-12-09 14:04:09 +09:00
Zhijun He
540d98427a Merge "media: improve ImageReader/Writer native memory management" 2015-12-09 04:41:12 +00:00
Daichi Hirono
dc89e079ce Merge "Grant USB device permission by using system permission." 2015-12-09 04:04:47 +00:00
Selim Cinek
4041249f2f And suddenly notification children appeared
Bug: 22760612
Change-Id: I0b708368c9c8e06af36184e736d181b2818d29b8
2015-12-08 19:51:24 -08:00
Seigo Nonaka
3899902fe7 Merge "Introduce cache mechanism for LocaleList." 2015-12-09 03:28:21 +00:00
Ian Pedowitz
adf2b4d669 Merge "Fix Build: Revert "Implement locale matching in LocalesList."" 2015-12-09 02:36:29 +00:00
Daichi Hirono
c79f854baf Merge "Enable MtpDocumentsProvider by default." 2015-12-09 02:19:48 +00:00
Daichi Hirono
b863990a01 Enable MtpDocumentsProvider by default.
BUG=20274999

Change-Id: I35941df66fea4ab703f8f1de3c69b6f4dd2be9a0
2015-12-09 11:18:32 +09:00
Ian Pedowitz
9c2f0d751d Fix Build: Revert "Implement locale matching in LocalesList."
This reverts commit 17b2b2d45854b56de7aa6d1581526e45991274d4.

Change-Id: I93c010054648a7127172a16c6ef3eb5f13604fd7
2015-12-09 02:17:32 +00:00
Daichi Hirono
4751880a4d Grant USB device permission by using system permission.
Previously it skips the device permission check by referring package
name. The CL removes the special case and use general MANAGE_USB
system-only permission to skip USB device permission dialog.

BUG=26048722

Change-Id: I3702393a50696209499d1e5f6549dab9fb2cefe4
2015-12-09 11:15:25 +09:00
Selim Cinek
f37a0a0601 Merge changes from topic 'groups'
* changes:
  Changed the appearance of the notification children
  Removed the devider above the actions
  Collapsing groups now on the lockscreen
  Fixed a bug where groups were layouted too small
  Fixed a small measuring but with the notification header
  Fixed a bug where legacy icons where incorrectly colored
  Removed duplicate content from group notification header
2015-12-09 01:25:30 +00:00
Roozbeh Pournader
7ed26b10e7 Merge "Implement locale matching in LocalesList." 2015-12-09 01:03:31 +00:00
Daichi Hirono
58ea989a4f Merge "Turn MtpDocumentsService foreground when devices are opend." 2015-12-09 01:02:05 +00:00
Jorim Jaggi
c2f262bc1a Only take screenshot when hiding activities
So we don't take screenshots when just switching focus between
activities or when docking activities.

Bug: 26070919
Bug: 25845255
Change-Id: Ie924c5f72f4168806b949ad10df7ef139cd280cc
2015-12-09 00:59:37 +00:00
Rubin Xu
315574621a Merge "Hide work apps from recents when profile is turned off" 2015-12-09 00:55:28 +00:00
Roozbeh Pournader
1168548de3 Merge "Fix null locale edge cases in Configuration and Resources" 2015-12-09 00:49:39 +00:00
Chet Haase
4610eeff9c Revert "Add support for partial view layouts"
This reverts commit c55d5072ac52cee1811b52406419228fa81119ce.

There were several bugs related to incorrect handling of various
layout issues (layout not being run on containers/views that needed
it), reverting to take another run at it outside of master.

Issue #25980198  requestLayout() sometimes doesn't result in measure/layout for view

Change-Id: Ic0e159cbcf6171652d8fd1bee9ae44a3977cea04
2015-12-08 16:45:23 -08:00
Selim Cinek
7b83639c34 Changed the appearance of the notification children
Some further tuning to the layout

Change-Id: Ifb3797e9982d718a30954adb9e1901eb2a1fa75d
2015-12-08 16:25:00 -08:00
Selim Cinek
bde0d4fe35 Removed the devider above the actions
The templates had a divider line above
the actions. this is now gone.

Change-Id: I85e8c773c4c49d9eaeceb20915cc98941d537ee6
2015-12-08 16:25:00 -08:00
Selim Cinek
9c4c41461d Collapsing groups now on the lockscreen
No more expanded weirdness on the lockscreen

Change-Id: Ia2c40741acc19a1d62bca2c61b0260dc52d3e8e1
2015-12-08 16:25:00 -08:00
Selim Cinek
da42d65ea5 Fixed a bug where groups were layouted too small
If the group was a group of custom views it
was layouted too small.

Change-Id: I88778c9a162e6f3012140d1e7864d66f13da2b1d
2015-12-08 16:25:00 -08:00
Selim Cinek
7a7c63ab35 Fixed a small measuring but with the notification header
Change-Id: I64e3504516110f245624b037e534d208d57d8250
2015-12-08 16:25:00 -08:00
Selim Cinek
a53f85a59a Fixed a bug where legacy icons where incorrectly colored
Because we were unconditionally applying the color when
set to dark

Change-Id: I4321a81fcd0f04f921752a5dcb8c3cbd47af36b7
2015-12-08 16:25:00 -08:00
Selim Cinek
ea4bef7386 Removed duplicate content from group notification header
Previously the headers all had duplicate content, which is
now optimized to look visually more appealing.

Change-Id: I38ed8db1985fd8a9470888e1b7e1e6b0f2e23b19
2015-12-08 16:25:00 -08:00
Filip Gruszczynski
d427047d98 Merge "Remove Window.setDecorView API." 2015-12-09 00:13:42 +00:00
Tony Mak
4b97eecf11 Merge "Add Email.ENTEPRISE_CONTENT_FILTER_URI" 2015-12-09 00:11:53 +00:00
Filip Gruszczynski
9b81e406b0 Remove Window.setDecorView API.
We currently don't have a strong use case for this.

Change-Id: I106aaf1224d7934964d9b92628fd3cdd42507c46
2015-12-08 16:07:02 -08:00
Felipe Leme
811e636046 Merge "Improved test cases so they handle the initial warning." 2015-12-08 23:51:38 +00:00
Christopher Wiley
f26709c7af Merge "Rethrow remote\'s ServiceSpecificException" am: 85eaca25fe
am: b7b3415899

* commit 'b7b341589929b9d8c46f772c253803c97ac1ffb0':
  Rethrow remote's ServiceSpecificException
2015-12-08 23:32:36 +00:00
Christopher Wiley
b7b3415899 Merge "Rethrow remote\'s ServiceSpecificException"
am: 85eaca25fe

* commit '85eaca25fe2a89f883e9a87d8f411cfb315f3e03':
  Rethrow remote's ServiceSpecificException
2015-12-08 23:26:40 +00:00
Christopher Wiley
85eaca25fe Merge "Rethrow remote's ServiceSpecificException" 2015-12-08 23:15:52 +00:00