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

113562 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenny Root
fa34d2ccba Revert "Reconcile differences between zip implementations" 
This reverts commit 9ffddc7eb50653cf60ce6b27a0e1945eed5b5ce1.

(cherry picked from commit 0c4b3646b0feb1bed89bf374ff03af797834d8c3)

Change-Id: Ifeba63511211bfc2b375f2205e319e91403b7d06
 2013-09-11 22:42:02 +00:00
Kenny Root
efbfe81d26 am 931f6f87: Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 
* commit '931f6f8767ee3b234914763262f1580695bcb208':
  Fix another off-by-one error in ZipFileRO
 2013-09-11 15:40:06 -07:00
Alex Ray
1e679441af consumer ir: clarify @link in documentation 
Change-Id: Ifebd0b550f5d9860697539646596a0b1cc782949
 2013-09-11 15:39:05 -07:00
Kenny Root
931f6f8767 Merge "Fix another off-by-one error in ZipFileRO" into klp-dev 2013-09-11 22:37:03 +00:00
Kenny Root
1c7cf90af4 Fix another off-by-one error in ZipFileRO 
Bug: 10424836
Change-Id: I491458bd31ef39e87127d061427b32a3d59ac807
 2013-09-11 15:28:39 -07:00
Chong Zhang
f8ca13b7a0 Pass subtitle track properties to SubtitleController 
Bug: 10326117
Change-Id: I387406adf3e1bd835b031dd5fbd2e1cdeaf2fe87
 2013-09-11 15:02:47 -07:00
Tor Norbye
d9273d6f28 Add typedefs and nullness annotations. 
This changeset adds in typedef annotations (custom annotations
marked with @IntDef) for various int parameters and return values
in the API. It also adds nullness annotations for cases where the
documentation explicitly mentioned null policy, or where it was
blindingly obvious from the context. Also fixed some typos in the
documentation.

Change-Id: Ica27c01368895818e26237544edd8483007155bb
 2013-09-11 14:55:38 -07:00
Zhijun He
10ccc3266e am e550446d: Merge "ImageReader: Skip size check for BLOB format" into klp-dev 
* commit 'e550446dcfb96e76715e77e044359b2769ca2676':
  ImageReader: Skip size check for BLOB format
 2013-09-11 14:45:49 -07:00
Xia Wang
0076729d38 Use setAirplaneMode() API for Connectivity Manager tests 
Change-Id: I2e35c58e4101b6b5fe9efdb5adad922402d38b6f
 2013-09-11 14:44:30 -07:00
Selim Gurun
a5c86c644b Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64
 2013-09-11 14:42:50 -07:00
Chet Haase
abd3d778e5 Hide translucent activity conversion API 
This API and functionality is not yet completely baked. It's worth
thinking more about this mechanism before exposing it as public API.

Issue #10461415 KLP API Review: Activity convert to translucent

Change-Id: I94d986b62443b3bfa7a9a19807ecebe36bf57e07
 2013-09-11 14:33:05 -07:00
Zhijun He
e550446dcf Merge "ImageReader: Skip size check for BLOB format" into klp-dev 2013-09-11 21:31:54 +00:00
destradaa
55a7077756 am f8a910fb: Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev 
* commit 'f8a910fbd5b72e3350740d224b36db49dc3170e6':
  Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information
 2013-09-11 14:17:52 -07:00
destradaa
f8a910fbd5 Merge "Fix exceptions in the Flp Hal layer: - JNI exception accessing a geofence method with wrong signature - FlpHardwareProvider exception when the monitoring status contains no location information" into klp-dev 2013-09-11 21:15:34 +00:00
Chet Haase
ff58f92a0a Add exclude() methods to Transition 
It would be useful for a transition to declare not just which
targets it wants to be run on, but also which targets it wants
to avoid. For example, you may not want to animate the items of
a ListView, or some other specific target in the view hierarchy.

This change adds various exclude*() methods which make it
possible to alter a transition to automatically ignore specific
views, ids, or classes in the hierarchy.

Issue #10692794 Transitions: Need API for excluding targets

Change-Id: If38025cdbee537a545e5a4268cbbd763af4622c5
 2013-09-11 13:53:43 -07:00
Adam Powell
18149fcf86 am 6847447d: Merge "Action bar refactoring and transitions" into klp-dev 
* commit '6847447da0b3e2e30e88838ec85244d1a0ee8927':
  Action bar refactoring and transitions
 2013-09-11 13:42:28 -07:00
Adam Powell
6847447da0 Merge "Action bar refactoring and transitions" into klp-dev 2013-09-11 20:38:41 +00:00
Jeff Sharkey
e2d76fa8c6 am cecccecc: Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* commit 'ceccceccffbd2668b98e21487f2323f80d2c7b98':
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 13:19:12 -07:00
Eino-Ville Talvala
70c2207c34 Camera2: Immutable metadata 
Make all camera metadata immutable once created; requests are
created using CameraRequest.Builder.

- Separate CameraMetadata implementation from interface
- Implement deep copying of metadata
- Requests/results/properties have-a native implementation

Bug: 10360518
Change-Id: Ia6300c237219d39f70c63156fa9ca666d951a36e
 2013-09-11 13:18:10 -07:00
Zhijun He
37682135da ImageReader: Skip size check for BLOB format 
HAL_PIXEL_FORMAT_BLOB is for JPEG capture, the buffer width/height by definition
shouldn't be the same as the image width/height.

Bug: 10360518
Change-Id: I32146a0e8e15439bb8fe199403db4ff37d1ab1af
 2013-09-11 13:18:00 -07:00
Jeff Sharkey
ceccceccff Merge changes Ib1274847,I2eb2a1bf into klp-dev 
* changes:
  Fix SDK build.
  Request all tethering interfaces, fix corruption.
 2013-09-11 20:16:59 +00:00
Amith Yamasani
ab7cbcef49 Change selection highlight for intent disambig dialog 
Use standard selection/activation highlights

Bug: 10529505
Change-Id: I81bc0a1a799f93dd6595d38c1a42d6d316e0d61a
 2013-09-11 13:06:23 -07:00
Kenny Root
d9141d939e am d292f790: Merge "Reconcile differences between zip implementations" into klp-dev 
* commit 'd292f790be5074998c1adc5feb4fea031d0d3d09':
  Reconcile differences between zip implementations
 2013-09-11 12:49:47 -07:00
Kenny Root
d292f790be Merge "Reconcile differences between zip implementations" into klp-dev 2013-09-11 19:47:13 +00:00
destradaa
839904eed8 Fix exceptions in the Flp Hal layer: 
- JNI exception accessing a geofence method with wrong signature
- FlpHardwareProvider exception when the monitoring status contains no location information

Bug: 10691492
Change-Id: I1959712912af712dc9dc344f20afd1112da46efc
 2013-09-11 12:42:51 -07:00
Eino-Ville Talvala
4af73c2153 Camera2: Listener rework and other API updates 
- Add Handlers to each callback-accepting function
 - Expand CameraDevice ErrorListener to CameraDeviceListener
   - Add idle callback
   - Split out disconnect error to its own callback
 - Add CameraDevice#getId
 - Rename CameraManager's listener to AvailabilityListener
 - Rename CameraManager register/unregister*Listener to
   add/remove*Listener
 - Rename getDeviceIdList to getCameraIdList

Bug: 10549567
Bug: 10549462
Change-Id: Idd2ae8ad8eb126f35a15d765306ada7c1cf74eea
 2013-09-11 12:41:27 -07:00
Tom O'Neill
0494832fc6 am 706113fa: Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 
* commit '706113fa2a82e5b613b8555120025b8472ffcbf3':
  Improve some javadoc related to isProviderEnabled() apis
 2013-09-11 12:23:39 -07:00
Tom O'Neill
706113fa2a Merge "Improve some javadoc related to isProviderEnabled() apis" into klp-dev 2013-09-11 19:20:16 +00:00
Santos Cordon
07d545e08d am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit 'e0b7e4cf455b21316661b158edee12ac5467995c':
  Add permissions for the InCallUI Split.
 2013-09-11 12:10:13 -07:00
Alexander Ray
b0049151f7 am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit '7563d42331ed7df7f026c8921ae990ce2fca9efd':
  Add consumer IR framework
 2013-09-11 12:10:06 -07:00
Santos Cordon
e0b7e4cf45 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-11 19:08:34 +00:00
Sandeep Siddhartha
6c5e9fb4c4 am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit 'f702286c94f0df9fc147135c19f12ef34e8594c9':
  Remove HotwordRecognition APIs
 2013-09-11 12:06:29 -07:00
Alexander Ray
7563d42331 Merge "Add consumer IR framework" into klp-dev 2013-09-11 19:05:38 +00:00
Sandeep Siddhartha
f702286c94 Merge "Remove HotwordRecognition APIs" into klp-dev 2013-09-11 19:01:51 +00:00
Baligh Uddin
86ad10f874 Import translations. DO NOT MERGE 
Change-Id: I2dfe3d6bca7948bce139f0f0f1404214ad8c99f2
Auto-generated-cl: translation import
 2013-09-11 11:51:26 -07:00
Baligh Uddin
38a3dfdb9e Import translations. DO NOT MERGE 
Change-Id: I6f30db92a5f2fa7f6c6073b6b9c530ae0436583b
Auto-generated-cl: translation import
 2013-09-11 11:49:10 -07:00
Baligh Uddin
243a2c4293 Import translations. DO NOT MERGE 
Change-Id: I92fdf6e34e65d70e813b5f3f5139659fb0eab2ce
Auto-generated-cl: translation import
 2013-09-11 11:46:30 -07:00
Baligh Uddin
ca892360a0 Import translations. DO NOT MERGE 
Change-Id: I41d53a68f479490dab20dc25d2d020ec098a1ff8
Auto-generated-cl: translation import
 2013-09-11 11:45:08 -07:00
Kenny Root
0d6c2d7b9d Reconcile differences between zip implementations 
Reconcile the difference between ZipFileRO and java.util.ZipFile to have
the same behavior.

Bug: 10424836
Change-Id: I6bde1bad7e20065ee650945fd43a913c05ce5ac7
 2013-09-11 11:44:40 -07:00
Igor Murashkin
47869404cb am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 
* commit '2cad64c0fbeba07bb546674e19cfb0166d7ec332':
  Surface: Change OutOfResourcesException to be a runtime exception
 2013-09-11 11:30:14 -07:00
Victoria Lease
5d345dbe31 am 444ae3a2: Merge "include Padauk in fallback chain" into klp-dev 
* commit '444ae3a2e66b4404fa715ab46403da09079dd572':
  include Padauk in fallback chain
 2013-09-11 11:30:11 -07:00
Amith Yamasani
dd9157ce31 am b926d484: Merge "Handle the case where the restore environment doesn\'t have the ringtone" into klp-dev 
* commit 'b926d484a76eda4152ba46d3ef517517226ca699':
  Handle the case where the restore environment doesn't have the ringtone
 2013-09-11 11:30:08 -07:00
Igor Murashkin
2cad64c0fb Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 2013-09-11 18:28:07 +00:00
Victoria Lease
444ae3a2e6 Merge "include Padauk in fallback chain" into klp-dev 2013-09-11 18:27:59 +00:00
Amith Yamasani
b926d484a7 Merge "Handle the case where the restore environment doesn't have the ringtone" into klp-dev 2013-09-11 18:27:53 +00:00
Baligh Uddin
e5147ca951 Import translations. DO NOT MERGE 
Change-Id: I218b96b7b7984751f31982cfcd6e574f6f0a813d
Auto-generated-cl: translation import
 2013-09-11 11:17:09 -07:00
Dianne Hackborn
33f92b6fe2 am c1cf491d: Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit 'c1cf491d160f8feb74b24d4ebb4e39324850cf61':
  More on issue #10130785: Restore silence and vibrate settings...
 2013-09-11 11:16:44 -07:00
Kenny Root
4a0be803a9 am b5f694f6: Merge "Revert "Reconcile differences between zip implementations"" into klp-dev 
* commit 'b5f694f683cb85b308f3733a3507a98fbff0532c':
  Revert "Reconcile differences between zip implementations"
 2013-09-11 11:16:40 -07:00
Baligh Uddin
caaf6979f3 Import translations. DO NOT MERGE 
Change-Id: I00a9521d0ac1e2463268295d1ea09f2894b1618c
Auto-generated-cl: translation import
 2013-09-11 11:15:47 -07:00
Dianne Hackborn
c1cf491d16 Merge "More on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-11 18:13:17 +00:00