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

109846 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
3523a06375 Remove outdated comment in MediaFocusControl 
The stream type is used in audio focus to better deal with
  RemoteControlClient/Display in the case of notifications
  during media playback. This comment is therefore outdated.

Change-Id: Ifa33bc4c0fbf065d8288ff5fdfaf1bc67b2a337e
 2013-08-01 14:36:32 -07:00
Sascha Prueter
930524ade2 am 95990fe4: am aa268f8f: am d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev 
* commit '95990fe4c38641ea574efe9224ae279db61cde0f':
  Add version identifier to app ops.
 2013-08-01 13:59:09 -07:00
Sascha Prueter
95990fe4c3 am aa268f8f: am d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev 
* commit 'aa268f8fb2855335fc0d4f181cbf91505448e5eb':
  Add version identifier to app ops.
 2013-08-01 13:55:43 -07:00
Sascha Prueter
aa268f8fb2 am d364859c: Merge "Add version identifier to app ops." into jb-mr2-dev 
* commit 'd364859ce657c6b096cadc703485ccef7979c582':
  Add version identifier to app ops.
 2013-08-01 13:52:55 -07:00
Sascha Prueter
d364859ce6 Merge "Add version identifier to app ops." into jb-mr2-dev 2013-08-01 20:50:02 +00:00
Amith Yamasani
8c80a476d9 Merge "Fix javadoc for new API" 2013-08-01 19:45:20 +00:00
Amith Yamasani
20915daf06 Fix javadoc for new API 
Change-Id: I31d3eb877552029a346f956414227aac42e5582b
 2013-08-01 12:44:01 -07:00
David Christie
e1f886f5e3 Merge "Add new app op to monitor high power location requests." 2013-08-01 19:24:53 +00:00
Scott Main
1a02c22d01 am 3e2b513c: am a7da9423: am 27c57555: fix misc broken links 
* commit '3e2b513cc21f5ae59bd7304aada2afabc54735cb':
  fix misc broken links
 2013-08-01 11:49:12 -07:00
Scott Main
31a6da4699 am a9e8364d: am 9cbfea76: am cc0be914: add search suggest tags for "tabs" 
* commit 'a9e8364ddec69abe5f61fb595491fb624b8eb031':
  add search suggest tags for "tabs"
 2013-08-01 11:49:05 -07:00
Scott Main
caf45e90f4 am a25f983d: am fb56b4f7: add search suggest tags for "tabs" 
* commit 'a25f983d3e3706f17299f3de6ff59acea18db3ac':
  add search suggest tags for "tabs"
 2013-08-01 11:49:02 -07:00
Scott Main
3e2b513cc2 am a7da9423: am 27c57555: fix misc broken links 
* commit 'a7da9423f368dca38eb6235bfcac94b446aa7bcd':
  fix misc broken links
 2013-08-01 11:46:23 -07:00
Scott Main
a9e8364dde am 9cbfea76: am cc0be914: add search suggest tags for "tabs" 
* commit '9cbfea760fe896638d7b4fec41f71abe0738d265':
  add search suggest tags for "tabs"
 2013-08-01 11:46:19 -07:00
Scott Main
a25f983d3e am fb56b4f7: add search suggest tags for "tabs" 
* commit 'fb56b4f7995cf7effffa2e18f26b40d9c4186482':
  add search suggest tags for "tabs"
 2013-08-01 11:46:16 -07:00
Scott Main
a7da9423f3 am 27c57555: fix misc broken links 
* commit '27c57555db9d626f0c20d68d75dd5a3e9832c9b9':
  fix misc broken links
 2013-08-01 11:42:31 -07:00
Scott Main
9cbfea760f am cc0be914: add search suggest tags for "tabs" 
* commit 'cc0be914a9d8f733a82ecb22d56169a32492cb8f':
  add search suggest tags for "tabs"
 2013-08-01 11:42:28 -07:00
Scott Main
fb56b4f799 add search suggest tags for "tabs" 
Change-Id: Ic80228c1293811d85a8177c8800e7c68b84fee4e
 2013-08-01 11:42:11 -07:00
Jeff Sharkey
3c1a1e4571 Merge "XML metadata for storage backend; custom icons." 2013-08-01 18:38:56 +00:00
Jeff Sharkey
7e258b31e7 XML metadata for storage backend; custom icons. 
Introduce XML metadata for storage backends, used to indicate if
custom roots should be queried, and provide any custom MIME type
icons inside that backend.

Parse metadata and resolve custom icons in UI.

Change-Id: Iec026c0b10845edff7a345d9389691ddf2c87a0e
 2013-08-01 11:34:56 -07:00
Scott Main
27c57555db fix misc broken links 
Change-Id: Iecd3462e752eddd0aa2feea3a7e9cf5ff2d92dd3
 2013-08-01 11:31:38 -07:00
Dianne Hackborn
483a6bbfc1 Add version identifier to app ops. 
All old versions drop their modes except for the notification op
(which is the only one there is currently a user-visible control for).

Change-Id: I9e09cebe63e9ea81f2adc01aef7d1a5a59f57a56
 2013-08-01 11:15:04 -07:00
Ben Murdoch
9c059d1ef0 Merge "Revert "Revert "Flag-flip: set chromium to be the default WebView""" 2013-08-01 18:14:33 +00:00
Amith Yamasani
3d38fa301c Merge "PreferenceActivity Fragment security" 2013-08-01 17:18:03 +00:00
Romain Guy
5d3dff1d66 Merge "Add missing alpha channel to built-in colors" 2013-08-01 16:46:04 +00:00
Romain Guy
86d3e03d38 Add missing alpha channel to built-in colors 
Change-Id: I911c17b623513b2715668d0f91604b28c32a969a
 2013-08-01 09:43:26 -07:00
Daniel Sandler
87d01e9e83 am 9e6f26a8: am f3e2f8fe: am 9eb434c3: Allow the user to block notifications for foreground services. 
* commit '9e6f26a8e1e69b1c49676d60a5ebe36c0a0f23f9':
  Allow the user to block notifications for foreground services.
 2013-08-01 09:35:16 -07:00
Daniel Sandler
9e6f26a8e1 am f3e2f8fe: am 9eb434c3: Allow the user to block notifications for foreground services. 
* commit 'f3e2f8feef1a22708cc7ce1a7bc5d914bb53933d':
  Allow the user to block notifications for foreground services.
 2013-08-01 09:32:40 -07:00
Daniel Sandler
f3e2f8feef am 9eb434c3: Allow the user to block notifications for foreground services. 
* commit '9eb434c3899ce4791ca58affcbe673e5a96ff6b9':
  Allow the user to block notifications for foreground services.
 2013-08-01 09:29:45 -07:00
Jean-Michel Trivi
9171db2798 Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE 
Unhide android.media.AudioManager.AUDIOFOCUS_GAIN_TRANSIENT_EXCLUSIVE
Update android.media.AudioManager.requestAudioFocus() javadoc for the
  new focus type.

Bug 8251963

Change-Id: I7cd69faaf5f0169ee462b91d0aaa75dc6b092107
 2013-08-01 09:19:58 -07:00
Jean-Michel Trivi
5813f240ec Merge "Notification muting conditional to exclusive audio focus request" 2013-08-01 16:07:08 +00:00
Victoria Lease
f296e317fb Merge "Support RGBA fonts and bitmap fonts (and RGBA bitmap fonts)" 2013-08-01 14:40:54 +00:00
Ben Murdoch
74c8f51220 Revert "Revert "Flag-flip: set chromium to be the default WebView"" 
Turn the flag back on.

This reverts commit c9f10b6be981ed4b0c4b2f0e2409d0626a3d4016.

Change-Id: I1a77bdf7f59a6868fd8ab30687062f34fc914bc6
 2013-08-01 12:14:53 +00:00
Satoshi Kataoka
2f3efcf107 Merge "Cleanup InputMethodSubtype and add "isAsciiCapable"." 2013-08-01 08:26:47 +00:00
Satoshi Kataoka
dc8abf6cee Cleanup InputMethodSubtype and add "isAsciiCapable". 
Bug: 8364845
Change-Id: Ic3ace4b6e0432d56696bcbc0be336aec1dc744a5
 2013-08-01 17:17:48 +09:00
Lorenzo Colitti
e1cd293151 Merge "Add accessors for all addresses and clarify compare* methods" 2013-08-01 06:44:29 +00:00
Daniel Sandler
9eb434c389 Allow the user to block notifications for foreground services. 
Stepping carefully around the fix in change Idc788527, we
perform security (and AppOps, and therefore user block)
checks against the uid passed to enqueueNotificationInternal
rather than the Binder caller.

Bug: 9502541
Change-Id: I91745db92823381df75721c1b8f11013a7fa4ecc
 2013-08-01 00:44:57 -04:00
Jeff Sharkey
f4b6daf0ae Merge "Sliding drawer for roots, move sorting, search." 2013-08-01 04:05:52 +00:00
Jeff Sharkey
bc2971d249 Sliding drawer for roots, move sorting, search. 
Move backend root exploration into sliding drawer, and adjust action
bar when moving between modes.  Moves sorting into action bar spinner
instead of separate dialog.  Also add initial search support.

Change-Id: I70189911ba56ae6bd93d5c503a8600acd6d6c0c5
 2013-07-31 21:03:09 -07:00
Satoshi Kataoka
fd5d153af8 Merge "Add a debug utility for InputMethodUtils" 2013-08-01 03:12:35 +00:00
Satoshi Kataoka
87c2914215 Add a debug utility for InputMethodUtils 
Change-Id: I59f6001bf20640e36e19b09cf117b8579120ba7d
 2013-08-01 11:57:27 +09:00
Svetoslav Ganov
53672be110 Merge "Iteration of the print sub-system." 2013-08-01 02:16:20 +00:00
Svetoslav Ganov
55b409a97c Iteration of the print sub-system. 
1. Added APIs for adding partially initialized PrintInfo objects
   enabling light-weight lookps for print serivces that want to
   populate the list of available printers without querying each
   of them for its capabilities. This includes APIs for the system
   to request from a print service to update certain printers.

2. Fixed a bug in PrinterId#equals().

3. Added equals and hasCode implementaion to PrinterInfo. Also
   the defaul in PrinterInfo are now an array instead of a
   SparseArray - cheaper.

4. Now PrintJobConfigActivity works with partially specified
   printers. Specifically, if such a printer is selected the
   activity is requesting from the print service to update
   the printer. We are currently not handling the timeout case.
   It also handles udpated pritners.

Change-Id: I5e83e924ef597c9e22cbd06a971d4f4d3bd3a9c1
 2013-07-31 18:59:53 -07:00
Adam Powell
e303900dbd Merge "Revert "Import xxhdpi framework drawables from UX export"" 2013-08-01 01:56:14 +00:00
Adam Powell
fb3d894fa8 Revert "Import xxhdpi framework drawables from UX export" 
This reverts commit 843c7b6b90e97686bc7d7ebaa48343c3bd99d98c.

Change-Id: I819525e3dfa70d83ea16bfca46db7375c6800aaa
 2013-08-01 01:55:19 +00:00
Elliott Hughes
2a805f9304 resolved conflicts for merge of 368d81fe to master 
Change-Id: I4bc59cd9a54cbc1b62ac135cf86dc73ac85968d5
 2013-07-31 18:25:47 -07:00
Dianne Hackborn
bf83e0dd12 Merge "Fix issue #10115327: MapCollections need to implement equals" 2013-08-01 01:14:57 +00:00
Elliott Hughes
368d81fe18 am c67b2ed5: Merge changes I80eaecff,Ia2b4f79b 
* commit 'c67b2ed50226c4758d0fc1434d39f6add6a0a533':
  Switch Process.myTid over to the libcore JNI too.
  Replace native Process getpid/getuid with calls to libcore equivalents.
 2013-07-31 17:57:22 -07:00
Dianne Hackborn
8b7bc13e21 Fix issue #10115327: MapCollections need to implement equals 
Change-Id: I8e7b6dd092442f3870aa1a36bd2a7cd974177146
 2013-07-31 17:52:07 -07:00
Adam Powell
c8f464c842 Merge "Import xxhdpi framework drawables from UX export" 2013-08-01 00:49:14 +00:00
Elliott Hughes
c67b2ed502 Merge changes I80eaecff,Ia2b4f79b 
* changes:
  Switch Process.myTid over to the libcore JNI too.
  Replace native Process getpid/getuid with calls to libcore equivalents.
 2013-08-01 00:49:09 +00:00