Mike J. Chen
a565754a81
Merge "Update default android boot animation png files"
2014-06-10 00:55:07 +00:00
Adam Lesinski
961dda7796
Creating an empty package should be succesfull
...
Bug: 15473436
Change-Id: I788deb21a1298281c508429bab635aa713803984
2014-06-09 17:10:29 -07:00
Mike J. Chen
784184e75d
Update default android boot animation png files
...
Bug 15143975
Change-Id: I11c9f43aaec4ebff9d291084fc8f997f15c46ddd
Signed-off-by: Mike J. Chen <mjchen@google.com>
2014-06-09 15:54:00 -07:00
vandwalle
6123315ad4
Merge "remember and report network score"
2014-06-09 22:30:26 +00:00
Chris Craik
cb9851d4fe
Merge "Annotated the drawing commands."
2014-06-09 22:22:11 +00:00
vandwalle
2ab9089dfa
remember and report network score
...
Change-Id: Iccb2ec603bc9c0d3cf1976d0cc3f343cb1096494
2014-06-09 14:50:47 -07:00
Jeff Brown
a2f61a39ea
Merge "Add @SystemApi annotation to internal permissions."
2014-06-09 21:05:43 +00:00
Jeff Brown
96c2e9f1cb
Merge "Add support for @SystemApi annotation to aapt."
2014-06-09 21:05:17 +00:00
Antonio Calabrese
ff7215aa0c
Annotated the drawing commands.
...
Change-Id: I4eeb35ecaf4aa16e0924b5215351fce79c68369b
2014-06-09 13:37:00 -07:00
RoboErik
e252909394
am 6580a31d: Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev
...
* commit '6580a31db0727dfffba99069f4866ad01fc88cfb':
Adds listeners for changes to the list of active sessions
2014-06-09 19:29:58 +00:00
RoboErik
03df2c5153
am 91ead28f: Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev
...
* commit '91ead28f8e0d22df8c4eaed4295e8c0e1e21e35f':
b/15388389 Add volume handling support to MediaRouter
2014-06-09 19:29:53 +00:00
RoboErik
58af2199a5
am ddbdcd09: Merge "Add a way to get the package/pid of the session" into lmp-preview-dev
...
* commit 'ddbdcd092d1b71b987d680a8b1a5140832625410':
Add a way to get the package/pid of the session
2014-06-09 19:29:48 +00:00
RoboErik
5f670bd65c
am 7d0b1256: Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev
...
* commit '7d0b1256e3a08a1b0a98f217eb9a0e9f5809f57e':
b/15452153 Send 0 delta volume requests
2014-06-09 19:29:42 +00:00
Jae Seo
8799179638
am a6b44fe7: Merge "Fix a typo in TvContract" into lmp-preview-dev
...
* commit 'a6b44fe7d3ab727de2b82d73209efdc9bdb57b41':
Fix a typo in TvContract
2014-06-09 19:29:28 +00:00
Jerome Poichet
7fc1e22150
am 576563c3: Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev
...
* commit '576563c3d37ba58bc94e87aa385d92dc79498003':
Using Manufacturer and not brand for device name
2014-06-09 19:29:23 +00:00
Jae Seo
9aea9c93c5
am 73fe04a4: Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev
...
* commit '73fe04a41f88eb9e4a9da8e229351ce8458d0e0d':
TIF: Address the feedback from the API review - 3/3
2014-06-09 19:29:17 +00:00
Dan Sandler
0d99a507b2
am 6e73d4a9: Fix mangled XML.
...
* commit '6e73d4a9d9d1031d302a7e1f21939c9239c0549d':
Fix mangled XML.
2014-06-09 19:29:08 +00:00
Dan Sandler
f730eab54c
am d8349135: Pour one out for the old notification ticker.
...
* commit 'd8349135a3189d4d4fd4180b0bffd2a987d4379d':
Pour one out for the old notification ticker.
2014-06-09 19:29:02 +00:00
Daniel Sandler
d343aff26d
am e7078cf9: Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
...
* commit 'e7078cf9c41f5e3581a80b2129ae77719b0f69a4':
Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
2014-06-09 19:28:56 +00:00
RoboErik
a3d8188556
Merge "Adds listeners for changes to the list of active sessions" into lmp-preview-dev
2014-06-09 19:07:49 +00:00
RoboErik
55f6ab4c81
Merge "b/15388389 Add volume handling support to MediaRouter" into lmp-preview-dev
2014-06-09 19:07:34 +00:00
RoboErik
20685929a4
Merge "Add a way to get the package/pid of the session" into lmp-preview-dev
2014-06-09 19:07:20 +00:00
RoboErik
b6b31f2741
Merge "b/15452153 Send 0 delta volume requests" into lmp-preview-dev
2014-06-09 19:07:10 +00:00
Jae Seo
085eefd184
Merge "Fix a typo in TvContract" into lmp-preview-dev
2014-06-09 18:43:27 +00:00
Jerome Poichet
cbe8e35bda
Merge "Using Manufacturer and not brand for device name" into lmp-preview-dev
2014-06-09 18:42:20 +00:00
Jae Seo
182dc33e9e
Merge "TIF: Address the feedback from the API review - 3/3" into lmp-preview-dev
2014-06-09 18:38:43 +00:00
Julia Reynolds
dc920984f2
Merge "Allow profile and device owners to change and get the master volume mute state."
2014-06-09 18:25:06 +00:00
Julia Reynolds
4a21b25fad
Allow profile and device owners to change and get the master volume mute state.
...
Also protect muting master volume with op code OP_AUDIO_MASTER_VOLUME.
Bug: 13585918
Change-Id: I91fe7ee60cd291cca15966b3127c0bb8a4828f6a
2014-06-09 14:18:01 -04:00
Ed Heyl
f914a89073
fix conflict markers
...
Change-Id: I0b95da6a8cb461dfaf7db026b6d190e2dcbe6935
2014-06-09 10:59:22 -07:00
Jae Seo
f30ea53306
Fix a typo in TvContract
...
Assigned a new value to TYPE_ATSC_M_H so that it differs from TYPE_ATSC_C.
Change-Id: I65494fdf625a3b4840c9e8cfa4b728214d63e6df
2014-06-09 17:50:07 +00:00
Adam Connors
b6d305ecf4
am ef4dfabe: API Review: rename FEATURE_MANAGEDPROFILES
...
* commit 'ef4dfabe22df2ce86cdf732c4a27ce8dcd8fad51':
API Review: rename FEATURE_MANAGEDPROFILES
2014-06-09 17:44:50 +00:00
Ji-Hwan Lee
8d396392cc
am 9a904962: Merge "Set mBound only when bind succeeds" into lmp-preview-dev
...
* commit '9a9049626d214a6329090abbba8e067ef3005c2e':
Set mBound only when bind succeeds
2014-06-09 17:44:43 +00:00
Wonsik Kim
32c67ee119
am 8be96a6f: Merge "Make TvInputs aware of whether it\'s hardware-based or not" into lmp-preview-dev
...
* commit '8be96a6ffa5ce1783310fe490f615ff323d1d5ed':
Make TvInputs aware of whether it's hardware-based or not
2014-06-09 17:44:37 +00:00
Jinsuk Kim
4d93ea5bb3
am 2a7a13e4: Merge "Remove HdmiCecService" into lmp-preview-dev
...
* commit '2a7a13e4a18803b8527deca0b6ca29b6e326671f':
2014-06-09 17:44:35 +00:00
Ed Heyl
c852fdca39
Merge "merge 4ce22057, regen api/current.txt"
2014-06-09 17:43:00 +00:00
Ed Heyl
5adb67d4ce
merge 4ce22057, regen api/current.txt
...
Change-Id: I39186b5c4d41753c729c5d1ee7ee96b03a45c514
2014-06-09 10:41:21 -07:00
Kristian Monsen
ab4bb06bec
Merge "Update ViewLocationHolder#compareTo to properly implement Comparable"
2014-06-09 17:38:02 +00:00
Julia Reynolds
03f5ff482e
Merge "Unhide UserManager.hasUserRestriction()."
2014-06-09 17:21:37 +00:00
Jay Civelli
9d46e3ea4f
Merge "Adding a method to know if there is a connection to a BluetoothDevice."
2014-06-09 17:05:51 +00:00
Dan Sandler
19dba9a37d
Fix mangled XML.
...
Bug: 14588447
Change-Id: I95b46952dcba65cb71d8d28635f92554a1a128b7
2014-06-09 17:02:50 +00:00
Dan Sandler
44c0dfd52f
Pour one out for the old notification ticker.
...
Heads-up notifications are what it always wanted to be,
anyway.
Bug: 14588447
Change-Id: I64aa1ed85fb162d8577468019e68df9de183a992
2014-06-09 16:55:02 +00:00
Daniel Sandler
01df1c680a
Move CATEGORY_NOTIFICATION_PREFERENCES to Notification.
...
It sprouts an additional INTENT_ prefix to distinguish it
from the Notification.category constants in the same file.
Bug: 15022240
Change-Id: Icbc09bfc5ce78964272def66934fe4a7c848e12b
2014-06-09 16:53:51 +00:00
Elliott Hughes
f928103269
am ef00c16d: am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
...
* commit 'ef00c16d62cf2217c44658ad9894810322551d28':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
2014-06-09 16:37:31 +00:00
Elliott Hughes
ef00c16d62
am de1f0023: am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
...
* commit 'de1f00231f23937de41e671be987475fbdf9afc9':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
2014-06-09 16:33:39 +00:00
Elliott Hughes
de1f00231f
am 2a1ed46d: Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
...
* commit '2a1ed46decbc8e21a39367a4b7770111392167c3':
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
2014-06-09 16:30:03 +00:00
Elliott Hughes
2a1ed46dec
Merge "Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt."
2014-06-09 16:26:28 +00:00
Elliott Hughes
e0f2fa33d7
Fix sense of NULL test in android_media_MediaScanner_extractAlbumArt.
...
Change-Id: I1acb4d5df71daa47ea87813db3941fd3c676cfb5
2014-06-09 09:22:58 -07:00
Dongwon Kang
0a5b778495
am c523b768: Merge "Make TvView keep the volume value and set later once the connecation is made." into lmp-preview-dev
...
* commit 'c523b768331f8e3e1d355dd688f47946702cb425':
Make TvView keep the volume value and set later once the connecation is made.
2014-06-09 15:55:56 +00:00
Bryan Mawhinney
aa00ae0a67
am 99017c01: Merge "Fix issue preventing aapt from stripping all unwanted densities" into lmp-preview-dev
...
* commit '99017c01bac525ca4b5b10768052ced398b4a493':
Fix issue preventing aapt from stripping all unwanted densities
2014-06-09 15:55:43 +00:00
Deepanshu Gupta
75814c19d3
am e23620e6: Merge "Build LayoutLib with Java 6" into lmp-preview-dev
...
* commit 'e23620e684ae73558e42a51f93004c8de07ba8d5':
Build LayoutLib with Java 6
2014-06-09 15:55:24 +00:00