drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,207 Commits 1 Branch 0 Tags
Commit Graph

139207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eino-Ville Talvala
b67a3b36fd Camera2: Many docs updates 
- Improve CameraManager.AvailabilityListener docs
- Fix references to createCaptureSession immediately returning a session
- Remove most docs from deprecated methods, to minimize confusion.
- Remove references to deprecated methods from non-deprecated methods.
- Improve acronym use in metadata keys, and other minor metadata doc fixes.
- Improve package-level docs.

Bug: 15394187
Bug: 15394241
Bug: 15394242
Bug: 15394526

Change-Id: I48de626a33ef9b834578f7bb890de9b98d3122d2
 2014-06-09 11:45:55 -07: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
Justin Koh
eba8782a1f Add NPE check to getSystemWindowInsets 
Bug: 15452706
Change-Id: Ica83593eadd0155e1370dba268a9f15ad0affa7d
 2014-06-09 11:31:53 -07:00
Justin Koh
a5de8479f4 Merge "Fix Browser when running on a platform without webview" into klp-modular-dev 2014-06-09 18:29:39 +00:00
Justin Koh
b4be02088f Fix Browser when running on a platform without webview 
Fix Browser: can't access the WebIconDatabase. Added build version checks so
that the icon database isn't used on devices <= KITKAT: the entire class is
deprecated as of JB MR2 anyway, according to the comments.
Bug: 15088030

Change-Id: I4403b1a429c08abb288f5ee3bae7eb2e23303916
 2014-06-09 11:28:53 -07: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
Alan Viverette
1b6e856e6f Optimize use of layers in ripple, update dialog styling 
BUG: 15474733
BUG: 15473856
Change-Id: I7c17865c7b2d4aad0fc3660ffac90e9f7ce8fda9
 2014-06-09 10:59:08 -07:00
Amit Mahajan
20c5ce50c4 Handle provisioning APN by turning off/on radio. 
The change is specific to AT&T as they want no signaling from device during provisioning.
I've tested following cases:
- expired AT&T SIM to make sure provisioning flow works as expected.
- airplane mode on/off with both active and expired AT&T SIM.
- wifi <-> mobile transitions work okay.
- LTE with Verizon SIM (basic sanity).

bug: 13190133

Change-Id: I215963174ae6000ae71d1dda693f95413f3d6e81
 2014-06-09 17:55:27 +00: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
Andrew Solovay
220cf297d8 docs: New "Verifying App Behavior on the Android Runtime (ART)" guide. 
Contains information for developers to make sure their apps work properly
with the ART runtime.

This doc is staged to:

http://asolovay.mtv:9001/guide/practices/verifying-apps-art.html

This is intended to be a companion to the newly-expanded "Introducing ART"
doc on source.android.com (http://ag/469776), which has general information
about ART's new features.

Change-Id: I77c6e552cfedb13dee1d256fec15926fffcbbbb3
 2014-06-09 10:10:27 -07: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
Baligh Uddin
def505b8c7 Import translations. DO NOT MERGE 
Change-Id: Ie599551c50a73956ce29f0b804b4f19fcbccb481
Auto-generated-cl: translation import
 2014-06-09 09:59:07 -07:00
Baligh Uddin
491ccba066 Import translations. DO NOT MERGE 
Change-Id: I92313110fcade06b93f8f6ec830765ca646d34b8
Auto-generated-cl: translation import
 2014-06-09 09:57:07 -07: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
Robert Ly
e70609c87e am 5cb18054: am e115755d: Merge "remove erroneous file" into klp-docs 
* commit '5cb180541332d652ed661559dfaa55a0fcc3751b':
  remove erroneous file
 2014-06-09 16:54:45 +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
Baligh Uddin
5be9a426fd Import translations. DO NOT MERGE 
Change-Id: I707193ee90e9d0d5cb8de2a9987cfe243dd7f440
Auto-generated-cl: translation import
 2014-06-09 09:50:11 -07:00
Baligh Uddin
dae2a8e286 Import translations. DO NOT MERGE 
Change-Id: Ibb4af035aae747ea8e66a50e208396149526f52b
Auto-generated-cl: translation import
 2014-06-09 09:49:18 -07: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
Santos Cordon
1a79c70e2b Support conference calling. (1/4) [DO NOT MERGE] 
Bug: 15006702
Change-Id: I2764ea242f783ba478c9eae86618dd33e9fc792a
 2014-06-09 09:33:30 -07: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
Baligh Uddin
b420b06598 Import translations. DO NOT MERGE 
Change-Id: I7e22e3a5e45e2e498f6960c6060e447024fe8d64
Auto-generated-cl: translation import
 2014-06-09 09:23:28 -07: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
Baligh Uddin
e44dae77f2 Import translations. DO NOT MERGE 
Change-Id: Iead37ea4585e5baa15f5754b0861be288acc283c
Auto-generated-cl: translation import
 2014-06-09 09:17:35 -07:00
Baligh Uddin
a16e758bf4 Import translations. DO NOT MERGE 
Change-Id: I4bb2c0a0efa01ecd7bca6087689c7d445602268a
Auto-generated-cl: translation import
 2014-06-09 09:15:49 -07:00
Baligh Uddin
12bfa7cd68 Import translations. DO NOT MERGE 
Change-Id: I471ee84c28b6ea15be4e54fd9ec2f7e262fa76ed
Auto-generated-cl: translation import
 2014-06-09 09:13:34 -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