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

5666 Commits

Author SHA1 Message Date
Santos Cordon
e7f6bfbc51 am 07d545e0: am e0b7e4cf: Merge "Add permissions for the InCallUI Split." into klp-dev 
* commit '07d545e08d615865860a0f73b7eabfd149754893':
  Add permissions for the InCallUI Split.
 2013-09-11 17:23:04 -07:00
Alexander Ray
4c980cc6ae am b0049151: am 7563d423: Merge "Add consumer IR framework" into klp-dev 
* commit 'b0049151f7c1f2ffa7481ac7c6f6baf7a548c5e8':
  Add consumer IR framework
 2013-09-11 17:23:01 -07:00
Sandeep Siddhartha
6f64688bc8 am 6c5e9fb4: am f702286c: Merge "Remove HotwordRecognition APIs" into klp-dev 
* commit '6c5e9fb4c4215f76a8a1fd8d72eee1154deb1039':
  Remove HotwordRecognition APIs
 2013-09-11 17:22:55 -07:00
Igor Murashkin
33069f40e5 am 47869404: am 2cad64c0: Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 
* commit '47869404cb8233c536a0a5d2c5ce4d0089e39882':
  Surface: Change OutOfResourcesException to be a runtime exception
 2013-09-11 17:22:40 -07:00
Santos Cordon
e0b7e4cf45 Merge "Add permissions for the InCallUI Split." into klp-dev 2013-09-11 19:08:34 +00: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
Igor Murashkin
2cad64c0fb Merge "Surface: Change OutOfResourcesException to be a runtime exception" into klp-dev 2013-09-11 18:28:07 +00:00
Sandeep Siddhartha
65a6ba3478 Remove HotwordRecognition APIs 
- and its usage from Keyguard

Bug: 10708010
Change-Id: Ic4a695a1d0e9312706a3b4ff01e59e2567b6ad9c
 2013-09-11 11:01:13 -07:00
Adam Skory
d3f96c8436 Update api/current.txt 
Needed to run make update-api after
the merge resolution http://ag/357417

Change-Id: I46746646905a6684988baff448d6f131f7b84ac0
 2013-09-11 18:11:55 +01:00
Erik Gilling
51e95df8f2 Add consumer IR framework 
Change-Id: I786c00db0cce61ef75e4edc24e90f2cdcba6dbfb
 2013-09-11 09:52:47 -07:00
Adam Skory
a7cda03a47 resolved conflicts for merge of 7d17de35 to master 
Conflicts:
	core/res/res/values/public.xml

Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
 2013-09-11 16:16:19 +01:00
Adam Skory
86d9c457de Merge "Revert services assist context in KitKat" into klp-dev 2013-09-11 11:27:50 +00:00
Adam Skory
7140a25f01 Revert services assist context in KitKat 
Reverts extension to assist context API to query
foreground services for assist context data.

Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.

Bug: 10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
 2013-09-11 12:04:58 +01:00
Tor Norbye
78d0005027 Merge "Add @NotNull, @Nullable, and @IntDef/@StringDef annotations" 2013-09-11 01:24:02 +00:00
Alan Viverette
b1e91e37a3 Merge "Add public attr for fragmentBreadCrumbStyle, apply in constructor" 2013-09-10 23:03:42 +00:00
Alan Viverette
aaca5d888a Add public attr for fragmentBreadCrumbStyle, apply in constructor 
BUG: 10680808
Change-Id: I7c22c1ff0b91892e62ea6bf6a311d33df6f13d78
 2013-09-10 15:04:10 -07:00
Zhijun He
b87857b50b am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev 
* commit '487a8fc9d487a68159c57b4de896ba7be88f1c2b':
  MediaMuxer: Add setLocation API
 2013-09-10 12:48:13 -07:00
Zhijun He
82d11f8e94 Merge "MediaMuxer: Add setLocation API" into klp-dev 2013-09-10 19:41:11 +00:00
Santos Cordon
4f7ffa90d1 Add permissions for the InCallUI Split. 
Change-Id: I7e45aeebbe8873f99fe897272390fb06f1840d2d
 2013-09-10 10:43:05 -07:00
Martijn Coenen
468b6e753f am 6343075f: am 9720d5e1: Merge "Remove legacy HCE APIs." into klp-dev 
* commit '6343075fbf1fef40d421d060b807e8cbc08849cf':
  Remove legacy HCE APIs.
 2013-09-10 10:13:14 -07:00
Martijn Coenen
9720d5e11c Merge "Remove legacy HCE APIs." into klp-dev 2013-09-10 17:04:32 +00:00
Glenn Kasten
83fa7d08c5 am 10779b12: am d9f4e0cf: Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 
* commit '10779b12eec870f428345d192f200dd0a7ad40bc':
  AudioTrack.getTimestamp() return type is now boolean
 2013-09-10 09:42:15 -07:00
Glenn Kasten
d9f4e0cf2c Merge "AudioTrack.getTimestamp() return type is now boolean" into klp-dev 2013-09-10 16:36:23 +00:00
Zhijun He
cfd47481d1 MediaMuxer: Add setLocation API 
This API could be used for camera recording when MediaMuxer is used to write
output media file.

Bug: 10594784
Change-Id: Ide2d6e1d87b246100a5def49bfb8646dc984a512
 2013-09-10 07:52:25 -07:00
Igor Murashkin
a86ab640f7 Surface: Change OutOfResourcesException to be a runtime exception 
- Deprecates SurfaceTexture.OutOfResourcesException, it wasn't used
- Make all JNI code throw only Surface.OutOfResourcesException
- Get rid of redundant SurfaceControl.OutOfResourcesException

Bug: 10566539
Change-Id: I58126260771b9ccff6a69c672ce7719b9f98138d
 2013-09-09 21:53:59 -07:00
Jeff Sharkey
d04e0c0adb am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* commit '78bb372fb70b7c383ae4ab158734666de9ce8e95':
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-09 21:45:11 -07:00
Jeff Sharkey
af9272349f Merge changes I7b3f4c68,I9f022a08 into klp-dev 
* changes:
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.
 2013-09-10 04:40:41 +00:00
Alan Viverette
5b73e36507 Merge "Add View constructor that supplies a default style resource" 2013-09-10 02:04:22 +00:00
Alan Viverette
617feb99a0 Add View constructor that supplies a default style resource 
Also updates the constructor of every class that extends View.

BUG: 10676369
Change-Id: Ifaf27bf82028d180afa4931c0e906df88d858ac3
 2013-09-09 18:09:13 -07:00
Jeff Sharkey
b7757a6b32 Rename offer() to add(), remove/hide some APIs. 
Change MatrixCursor offer() to add() based on review feedback.  Remove
some now-unused XML metadata.  Hide document creation, since it's not
supported in initial version.

Bug: 10577809, 10461706, 10678563
Change-Id: I7b3f4c6899c28f633471ef816bee22bf032aa0d2
 2013-09-09 17:55:10 -07:00
Sandeep Siddhartha
8f86b844d2 am e6139bf0: am 85e7177a: Merge "Move public consts to HotwordRecognitionService" into klp-dev 
* commit 'e6139bf08680120cf1437621f2aadabd82a50197':
  Move public consts to HotwordRecognitionService
 2013-09-09 16:32:43 -07:00
Sandeep Siddhartha
85e7177abe Merge "Move public consts to HotwordRecognitionService" into klp-dev 2013-09-09 23:25:27 +00:00
Chet Haase
01ed358ce0 am be4b4824: am bce89a42: Merge "Add updateListener to ViewPropertyAnimator" into klp-dev 
* commit 'be4b48240e2e498ad32894ae9ab9716ecfedcf45':
  Add updateListener to ViewPropertyAnimator
 2013-09-09 16:09:55 -07:00
Chet Haase
bce89a4269 Merge "Add updateListener to ViewPropertyAnimator" into klp-dev 2013-09-09 23:03:28 +00:00
Glenn Kasten
596fb8e796 AudioTrack.getTimestamp() return type is now boolean 
Change-Id: Ie231652dc0959343f0726dcb985b6715bfe014f6
 2013-09-09 15:19:12 -07:00
Alan Viverette
4e17981cdc am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev 
* commit 'b198dbaf19fcad86f81226aa06644db41d6028e4':
  Add WebVTT caption renderer
 2013-09-09 14:14:33 -07:00
Alan Viverette
013634cc44 Merge "Add WebVTT caption renderer" into klp-dev 2013-09-09 20:31:14 +00:00
Chet Haase
87f4ae67c8 Add updateListener to ViewPropertyAnimator 
New method setUpdateListener() on ViewPropertyAnimator that will
send out update events to the provided listener.

Issue #10118113 Offer update listener on ViewPropertyAnimator

Change-Id: Ib9f8fc6dbbc3c1c58113246d9a3b01e7ac27b14c
 2013-09-09 10:44:07 -07:00
Jeff Sharkey
184c4a096a am 7c4f1492: am 30590646: Merge "Remember mode and sort on per-directory basis." into klp-dev 
* commit '7c4f14924e465b3cbbea7a79192343c97142d9a1':
  Remember mode and sort on per-directory basis.
 2013-09-09 10:09:50 -07:00
Jeff Sharkey
d182bb641f Remember mode and sort on per-directory basis. 
Persist the last user-selected list/grid mode and sort order for
each directory.  Remembered user choice always overrides provider
hinting.

Filter out recent documents that don't match requested MIME type, and
show recents in grid mode when picking images.  Hide mode and sort
order in recents.

Add hinting flag for backend to indicate a directory would like to be
sorted by last modified.  Include explicit root in DocumentStack and
clearly mark derived fields.

Bug: 10392047, 10608506
Change-Id: I2dd3a0e4112852ebf87e7dbb08b3781c86587dcf
 2013-09-09 09:16:09 -07:00
Narayan Kamath
0033539a43 resolved conflicts for merge of ab98aec6 to master 
Change-Id: I773bce338ebc42f7428d9942d22ed140bcfbf3d9
 2013-09-09 09:59:31 +01:00
Dianne Hackborn
4b98978157 Merge "Work on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-08 19:31:06 +00:00
Eric Laurent
3ad98d992d am 533587d8: am 9f4a392e: Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev 
* commit '533587d805892572a837098ec196d1710a5187bb':
  Unhide AudioTimestamp and getTimestamp
 2013-09-06 19:22:13 -07:00
Glenn Kasten
5e8f278f08 Unhide AudioTimestamp and getTimestamp 
Change-Id: I56687f42f83c4be7dc3fd1baa81a13e71113f22e
 2013-09-06 19:11:29 -07:00
Sandeep Siddhartha
1f0ef2cc33 Move public consts to HotwordRecognitionService 
- The HotwordRecognitionService is the only public component of
  Hotword recognition allowing others to implement hotword recognition
- The client API is not available for use by all, hence the consts need
  to be moved to the service class.
- Ideally we'd have retained the public consts in the client side API
  (HotwordRecognizer)

Change-Id: Ibd0d1c0d0514ec4e8f7c284e22c5fa6b7ef3df26
 2013-09-06 18:12:11 -07:00
Alan Viverette
d43daf361e Add WebVTT caption renderer 
Currently missing support for region anchor points, robust layout
when snapping to lines, and vertical text.

BUG: 10260603
Change-Id: I3463b4aa0039442159144e66922d67f5dfee58ed
 2013-09-06 18:06:23 -07:00
Sandeep Siddhartha
b10e269c36 am fc25c935: am c7deeffb: Updating current.txt after unhiding HotwordRecognition API 
* commit 'fc25c935ab468f327f3fe42649269671667e7974':
  Updating current.txt after unhiding HotwordRecognition API
 2013-09-06 16:51:08 -07:00
Dianne Hackborn
38ed2a471a Work on issue #10130785: Restore silence and vibrate settings... 
...in settings > sound

Add a new ContentProvider API to canonicalize URIs, so they can
be transported across backup/restore.

Change-Id: Ie5af3662f6822a32310e49c7f1e1ff084986c56e
 2013-09-06 16:39:59 -07:00
Sandeep Siddhartha
c7deeffb0c Updating current.txt after unhiding HotwordRecognition API 
Change-Id: Ib9975c857cba2ac0fbadc85ae5f44d278943238e
 2013-09-06 16:39:52 -07:00