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

109970 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Baptiste Queru
1f8eddbe34 am d07347ed: am 83485dc9: Merge "be more robust with handling unknown sensors" 
* commit 'd07347eddb85fc8838071fa68c9e324eb1ae8384':
  be more robust with handling unknown sensors
 2013-08-02 17:58:37 -07:00
Elliott Hughes
89a8250e24 am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it." 
* commit '710f3e2cc6bc2cdc2f2cddb2190823ea31efd52a':
  If frameworks wants ASCII casing, it should explicity ask for it.
 2013-08-02 17:58:33 -07:00
Elliott Hughes
a81dcd03dc am b56f10aa: am 32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it." 
* commit 'b56f10aa66914aeb880c624ed6e938e1941ff820':
  If media wants ASCII lowercasing, it needs to ask for it.
 2013-08-02 17:58:31 -07:00
Dirk Dougherty
aef5721e7f am 966dc871: am 780795dc: am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit '966dc871ca4f1864e405d58bcc54c1f9bef703d7':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:58:28 -07:00
Scott Main
a7db519d26 am 24a32c98: am e0a85960: am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit '24a32c98a580281fd19f55747ea95bf554e344c3':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:58:24 -07:00
Martijn Coenen
badb063c81 Merge "NFC: Host-based card emulation APIs." 2013-08-03 00:49:03 +00:00
Jeff Sharkey
cf9d87c688 Merge "Track and persist directory stacks; recents work." 2013-08-03 00:43:00 +00:00
Jean-Baptiste Queru
d07347eddb am 83485dc9: Merge "be more robust with handling unknown sensors" 
* commit '83485dc920cdc4a6f3dd6797623f536c99f08a6c':
  be more robust with handling unknown sensors
 2013-08-02 17:41:59 -07:00
Elliott Hughes
710f3e2cc6 am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it." 
* commit '60ae2617b4b304fc3e45a441f87d1765714477ba':
  If frameworks wants ASCII casing, it should explicity ask for it.
 2013-08-02 17:41:57 -07:00
Elliott Hughes
b56f10aa66 am 32c308a5: Merge "If media wants ASCII lowercasing, it needs to ask for it." 
* commit '32c308a5f2051a62ab2fb3337d00d84e9035eb9a':
  If media wants ASCII lowercasing, it needs to ask for it.
 2013-08-02 17:41:54 -07:00
Dirk Dougherty
966dc871ca am 780795dc: am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit '780795dc198c05d5a1a181c58317dc6befec861d':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:41:05 -07:00
Scott Main
24a32c98a5 am e0a85960: am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit 'e0a8596020a10c1cf6347d89fea862d41629db04':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:41:02 -07:00
Jeff Sharkey
dc2963aeca Track and persist directory stacks; recents work. 
Move to manual tracking of directory navigation stack so we have Uri
data to persist, instead of opaque fragment backstack.  Remember
directory stacks across launches on a per-app basis.

Start recording recently opened and created files.  Uniform Uri
parameter extraction utility methods in contract.

Change-Id: I79ed30ee10272bf7c53d339e797639c993f649bb
 2013-08-02 17:39:38 -07:00
Dirk Dougherty
780795dc19 am b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 
* commit 'b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
  Doc change: refresh GCM reference docs.
 2013-08-02 17:38:31 -07:00
Scott Main
e0a8596020 am 9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 
* commit '9a0087f22754de40cd5be2a738600f9642a611cc':
  docs: OpenGL Training sample code fixes
 2013-08-02 17:38:28 -07:00
Martijn Coenen
a7397883de NFC: Host-based card emulation APIs. 
- New INfcCardEmulation interface to allow apps to interface
  with card emulation system.
- New BIND_NFC_SERVICE permission to prevent malicious apps
  from binding to card emulation services.
- ApduServiceInfo is now in the framework.
- Added constants to Settings.Secure for storing defaults.
- Modified XML grammar a bit.

Change-Id: I56b3fa6b42eb5dc132c91c1386ab1e6bac779059
 2013-08-02 17:22:53 -07:00
Jean-Baptiste Queru
83485dc920 Merge "be more robust with handling unknown sensors" 2013-08-03 00:13:24 +00:00
Brian Carlstrom
c5e32ef628 Merge "Teach PackageManager to skip core-libart.jar" 2013-08-02 23:58:42 +00:00
Igor Murashkin
b7645acfd9 Merge "graphics: Update ImageFormat#YUV_420_888 javadoc" 2013-08-02 23:43:54 +00:00
Igor Murashkin
7a600ff65f graphics: Update ImageFormat#YUV_420_888 javadoc 
* Make it clear that the Y-plane is not interleaved for YUV_420_888
* Make it clear that the U/V plane have the same stride
* Make it clear what the order of Y/U/V planes is

Change-Id: Id85d7c68e84382149dbf0e8b4e965ba2988326fe
 2013-08-02 16:39:03 -07:00
Zhijun He
111fd86c7a Merge "MediaFrameworkTest: Add camera capture result callback test" 2013-08-02 23:38:24 +00:00
Dirk Dougherty
b6cb0437ef Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs 2013-08-02 22:49:11 +00:00
Tim Murray
881891c020 Merge "Handle updates to RS C++ API." 2013-08-02 22:34:21 +00:00
Tim Murray
250b1cfc83 Handle updates to RS C++ API. 
Change-Id: I73127fc7369643b94d4a49f31a516b50c74b54ac
 2013-08-02 15:31:29 -07:00
Scott Main
9a0087f227 Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs 2013-08-02 22:27:14 +00:00
Zhijun He
693e21d605 MediaFrameworkTest: Add camera capture result callback test 
Also refactor the code to reduce code duplication.

Change-Id: I428ad73510043ebf9e62cd7841bfdb683c96f9bc
 2013-08-02 15:24:45 -07:00
Elliott Hughes
60ae2617b4 Merge "If frameworks wants ASCII casing, it should explicity ask for it." 2013-08-02 22:13:07 +00:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it. 
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
 2013-08-02 15:12:32 -07:00
Scott Main
14617a83a6 am efd288a2: am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit 'efd288a2619addd490bc07766b2cd18e82ec2051':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:56:21 -07:00
Scott Main
efd288a261 am 2a666620: am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '2a6666207d0e0b7545cbd1f0a7f6754d5ca1587b':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:29:09 -07:00
Scott Main
2a6666207d am 1f196903: Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 
* commit '1f19690322523d5a28051c55353735513638ca39':
  add note to use "480" instead of "xxhdpi" (this should be temporary)
 2013-08-02 14:27:40 -07:00
Svetoslav Ganov
bb9b300787 Merge " First cut of the print notifications." 2013-08-02 21:24:38 +00:00
Scott Main
1f19690322 Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs 2013-08-02 21:23:55 +00:00
Svetoslav Ganov
4d79d7821d Merge "Revert "ssss"" 2013-08-02 21:22:59 +00:00
Svetoslav Ganov
8c43376ea8 First cut of the print notifications. 
1. Added notifications for a queued print job, for a started print job,
       for ongoing canceling a print job, and for a failed print job. The
       notifications for queued and started state have a cancel action. The
       notification for failed print job has a cancel and a restart action.

    2. Propagating failure message from the print service to the notifications.

    3. PrintJobConfigActivity was not setting the initial value for the
       print job copies and was not updating the UI immediately after creation.

    4. Refactored PrintJobConfigActivity to avoid using the hack to avoid
       reaction for item selection change in a spinner for an event that
       happened before the callback was registered.

    5. Removed the label attribute from PrinterInfo and now PrinterId is
       composed of the printer name and the service component name. This
       is nice since for restarting print jobs we do not need to store
       information about the printer except the printer id which is
       already part of the PrintJobInfo's data. Also the printer name
       is not expected to change anyway.

    6. Allowing cancellation of a queued print job. Also no print job is
       cancelled without asking the managing print service to do that.
       Before we were immediately canceling print jobs in queued state
       but it was possible for a buggy print service to not set the
       print job state to started before starting to do expensive work
       that will not be canceled.

    7. PrintServiceInfo was throwing an exception the the meta-data
       XML for the print service was not well-formed which would crash
       the system process. Now we just ignore not well-formed meta-data.

    8. Removed unused permissions from the PrintSpooler's manifest.

Change-Id: Iba2dd14b487f56e137b90d1da17c3033422ab5e6
 2013-08-02 14:22:22 -07:00
Svetoslav Ganov
e67b5e314f Revert "ssss" 
This reverts commit 650f0ee31bbd2a23dc64b60caba3a52e7665398c.

Change-Id: Iae83ca6ccb7feccb74069bf09cfb3150c03ec710
 2013-08-02 21:19:37 +00:00
Svetoslav Ganov
d347168f50 Merge "ssss" 2013-08-02 21:15:36 +00:00
Dmitry Shmidt
ec90545b5f dhcp: Get mtu property from dhcp results 
Change-Id: I1b032094e0945b27d98f7ac786247b7cc9d60131
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
 2013-08-02 14:07:50 -07:00
Joe Fernandez
ab1f29d935 docs: OpenGL Training sample code fixes 
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit 6da22f88434543e8796e0151f4bb11d74c16e847)
 2013-08-02 20:57:03 +00:00
Fabrice Di Meglio
1714426bd2 Merge "Update Framework resources for RTL support" 2013-08-02 20:52:31 +00:00
Mathias Agopian
80ba0a6bae be more robust with handling unknown sensors 
- add support for new sensors (post 4.3)
- don't crash when encountering an unknown sensor type
- clean-up

Bug: 9683153
Change-Id: Iecd883e8a7d0297be1bd2bd4f00c5cc3ffcbccfe
 2013-08-02 13:49:41 -07:00
Dave Burke
aa3b0ff3e1 am 0eab98dd: am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 
* commit '0eab98dd24b3a4272d5e9a41f353071f8508ec2a':
  Revert "Add version identifier to app ops."
 2013-08-02 13:44:17 -07:00
Dave Burke
0eab98dd24 am 019f4385: am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 
* commit '019f4385d17234324db23521149e1f1cb6d7d061':
  Revert "Add version identifier to app ops."
 2013-08-02 13:42:03 -07:00
Dave Burke
019f4385d1 am 7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 
* commit '7925e7cc089251afb2faceb3e81eea436647c572':
  Revert "Add version identifier to app ops."
 2013-08-02 13:39:12 -07:00
Dave Burke
7925e7cc08 Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev 2013-08-02 20:36:28 +00:00
Chris Craik
b213cec0ce Merge "Fix quickReject's handling of AA ramp geometry" 2013-08-02 20:34:38 +00:00
Svetoslav Ganov
650f0ee31b ssss 
Change-Id: I001c2ae5bc6caeac7e1a2223e221be69f6e6cb6c
 2013-08-02 13:31:20 -07:00
Dave Burke
0997c5bd79 Revert "Add version identifier to app ops." 
This reverts commit 483a6bbfc118409b9c46b226cf0aa6afdc4d9159.

Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
 2013-08-02 20:25:02 +00:00
David Christie
03ed0127da Modify quicksettings to have new location behavior. 
Location tile is always present, and long pressing
toggles the master location enabled switch.

Change-Id: I54d5ccaa3b04e14ebebd68f5fafa8e65311debb4
 2013-08-02 13:10:10 -07:00
Scott Main
d53f8abcf5 add note to use "480" instead of "xxhdpi" (this should be temporary) 
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
 2013-08-02 12:56:43 -07:00