OSDN Git Service
Jeff Brown [Mon, 5 Aug 2013 21:06:50 +0000 (14:06 -0700)]
Add string that was accidentally deleted.
Change-Id: I575cc0a26ab2e701a97d9fedadfb5d54d6f0d2e1
Baligh Uddin [Mon, 5 Aug 2013 19:55:15 +0000 (19:55 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 5 Aug 2013 19:53:51 +0000 (19:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Jean-Baptiste Queru [Mon, 5 Aug 2013 19:51:45 +0000 (19:51 +0000)]
Merge "Revert "Revert "be more robust with handling unknown sensors"""
Alan Viverette [Mon, 5 Aug 2013 19:28:19 +0000 (12:28 -0700)]
Fix build, updates current APIs
Change-Id: I34deb72207e6eb7c37dd57d781a66582cef62b95
Alan Viverette [Mon, 5 Aug 2013 18:32:20 +0000 (18:32 +0000)]
Merge "Move caption style to its own class, add presets"
Svetoslav Ganov [Mon, 5 Aug 2013 18:28:36 +0000 (18:28 +0000)]
Merge "Disable print dialog spinners if there is only one option."
Svetoslav Ganov [Mon, 5 Aug 2013 18:26:16 +0000 (11:26 -0700)]
Disable print dialog spinners if there is only one option.
Change-Id: Ic9a46c737b592aeb6f78c962a7f9d53391a2b164
Elliott Hughes [Mon, 5 Aug 2013 18:10:06 +0000 (11:10 -0700)]
am
eab8e18d: am
8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '
eab8e18d8f6f34a9d35fbb120148956789ad48a2':
If graphics wants ASCII lowercasing, it needs to ask for it.
Elliott Hughes [Mon, 5 Aug 2013 18:07:13 +0000 (11:07 -0700)]
am
8a736129: Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
* commit '
8a736129faa9e41b5f33c42bbeae1f68cb42d38f':
If graphics wants ASCII lowercasing, it needs to ask for it.
Jean-Baptiste Queru [Mon, 5 Aug 2013 18:03:28 +0000 (11:03 -0700)]
Revert "Revert "be more robust with handling unknown sensors""
This reverts commit
17548b3c70fe4f29d33367a61300f5323f5efe99.
Elliott Hughes [Mon, 5 Aug 2013 18:01:33 +0000 (18:01 +0000)]
Merge "If graphics wants ASCII lowercasing, it needs to ask for it."
Glenn Kasten [Mon, 5 Aug 2013 18:01:26 +0000 (18:01 +0000)]
Merge "Replace run-time PCM encodings by compile-time constants"
Amith Yamasani [Mon, 5 Aug 2013 17:58:45 +0000 (17:58 +0000)]
Merge "Don't check for valid fragment when switching to another fragment"
Amith Yamasani [Mon, 5 Aug 2013 17:55:28 +0000 (10:55 -0700)]
Don't check for valid fragment when switching to another fragment
Bug:
10184429
Change-Id: I09b39682d907a1cd7ce140e0be0faaddfaba6bd1
Glenn Kasten [Mon, 5 Aug 2013 17:27:29 +0000 (17:27 +0000)]
Merge "Explicitly compare raw pointers to NULL"
Elliott Hughes [Mon, 5 Aug 2013 17:23:20 +0000 (17:23 +0000)]
Merge "Remove member "m" prefix from now local variables"
Baligh Uddin [Mon, 5 Aug 2013 16:47:33 +0000 (09:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0799c647e037d672f16c11d39489926a4938e71f
Auto-generated-cl: translation import
Baligh Uddin [Mon, 5 Aug 2013 16:40:55 +0000 (09:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I110088e783f0d1e6768cf72ab72ba5733c1648bf
Auto-generated-cl: translation import
Glenn Kasten [Mon, 5 Aug 2013 16:35:59 +0000 (16:35 +0000)]
Merge "Remove dead code in AudioTrack JNI"
Glenn Kasten [Mon, 5 Aug 2013 16:22:07 +0000 (16:22 +0000)]
Merge "Don't doubly initialize fields in constructor"
Glenn Kasten [Mon, 5 Aug 2013 16:18:25 +0000 (16:18 +0000)]
Merge "Clean up imports"
Glenn Kasten [Mon, 5 Aug 2013 15:55:33 +0000 (15:55 +0000)]
Merge "Clean up throws in AudioRecord and AudioTrack"
John Spurlock [Mon, 5 Aug 2013 13:18:53 +0000 (13:18 +0000)]
Merge "Collapse/disable shade when hiding status bar window."
Satoshi Kataoka [Mon, 5 Aug 2013 08:12:28 +0000 (17:12 +0900)]
Open an internal utility of InputMethodUtils
Change-Id: I240e914bc21efce8554145619c403d547a17ad19
Svetoslav Ganov [Mon, 5 Aug 2013 04:08:46 +0000 (04:08 +0000)]
Merge "Polish the print spooler loading of stored print jobs."
Svetoslav Ganov [Mon, 5 Aug 2013 03:17:52 +0000 (20:17 -0700)]
Polish the print spooler loading of stored print jobs.
1. The singleton print spooler isntance is created when the print spooler
service gets a connection to the system and is destroyed when this
connection is removed. Note that if the spooler has work, then the
connection to the system will not be removed.
When the spooler is created, it reads the stored state and notifies the
system which in turn dispatches this to the print services.
When the system connects to the spooler and passes it a connection, we
schedule a delayed check whether there is work for the spooler. We do
not handle this immediately to avoid intermitted spinning on and off
of the spooler process if a client makes a sequence of queries while
the spooler has really no work.
2. Fixed a bug in the NotificationManagerService where adding a notification
and removing it immediately after that does not remove the notification.
The code that is adding a notification is run on a handler thread while
the code to remove it on the calling thread. This creates a race and
erroneous results. Now the removal is also scheduled on the handler.
3. Many small fixes here and there.
Change-Id: I6415c253139fa6616393fbe23c659d031a29e1f6
Chris Wren [Sun, 4 Aug 2013 05:04:35 +0000 (01:04 -0400)]
disable notification scorer by default.
Bug:
10163077
Change-Id: Icd03786dfe59cb26281738ae0be28d14cb5741f9
Craig Mautner [Sat, 3 Aug 2013 22:32:04 +0000 (22:32 +0000)]
Merge "Add force default orientation."
Dianne Hackborn [Sat, 3 Aug 2013 06:43:31 +0000 (23:43 -0700)]
resolved conflicts for merge of
c8911ddd to master
Change-Id: I790b547268a23848577199256fc5abc9bdb7abb8
Jeff Brown [Sat, 3 Aug 2013 04:11:14 +0000 (21:11 -0700)]
Add debug message to help diagnose a presentation bug.
Bug:
10154780
Change-Id: I0e711a6316cb231ec48fc31d87b8cbd5d857c2f8
Jeff Brown [Sat, 3 Aug 2013 02:03:49 +0000 (19:03 -0700)]
Support public virtual displays.
Refactor the new private virtual display API to also support
creating public virtual displays with various characteristics.
This feature requires special permissions and is only intended
for use by the system.
Change-Id: I44dd19f37cf76ea6d6e313afe42f4a412bd96663
Brian Carlstrom [Sat, 3 Aug 2013 02:49:15 +0000 (19:49 -0700)]
Remove member "m" prefix from now local variables
Change-Id: I7808cafc1f74c47fcd9d9a4b6a90fb50951457b1
Jeff Brown [Sat, 3 Aug 2013 01:14:46 +0000 (18:14 -0700)]
Add support for secure overlay displays for development.
Change-Id: I426115ec5a3fbda52a481097731abc8b3d9013a4
Dianne Hackborn [Sat, 3 Aug 2013 02:32:13 +0000 (19:32 -0700)]
am
373a2f15: am
607b414d: Add new app ops method to reset all op modes.
* commit '
373a2f15667956ff8a00ba59b42972b9c930af92':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:08 +0000 (19:30 -0700)]
am
607b414d: Add new app ops method to reset all op modes.
* commit '
607b414d0444067e166fa54d8ea37563f2715ea3':
Add new app ops method to reset all op modes.
Dianne Hackborn [Sat, 3 Aug 2013 01:10:10 +0000 (18:10 -0700)]
Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:58:40 +0000 (17:58 -0700)]
am
ae311f4c: am
17548b3c: Revert "be more robust with handling unknown sensors"
* commit '
ae311f4c5f86779bb681b9fa8c1122dc174fea72':
Revert "be more robust with handling unknown sensors"
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:58:37 +0000 (17:58 -0700)]
am
d07347ed: am
83485dc9: Merge "be more robust with handling unknown sensors"
* commit '
d07347eddb85fc8838071fa68c9e324eb1ae8384':
be more robust with handling unknown sensors
Elliott Hughes [Sat, 3 Aug 2013 00:58:33 +0000 (17:58 -0700)]
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.
Elliott Hughes [Sat, 3 Aug 2013 00:58:31 +0000 (17:58 -0700)]
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.
Dirk Dougherty [Sat, 3 Aug 2013 00:58:28 +0000 (17:58 -0700)]
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.
Scott Main [Sat, 3 Aug 2013 00:58:24 +0000 (17:58 -0700)]
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
Martijn Coenen [Sat, 3 Aug 2013 00:49:02 +0000 (00:49 +0000)]
Merge "NFC: Host-based card emulation APIs."
Jeff Sharkey [Sat, 3 Aug 2013 00:43:00 +0000 (00:43 +0000)]
Merge "Track and persist directory stacks; recents work."
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:42:02 +0000 (17:42 -0700)]
am
17548b3c: Revert "be more robust with handling unknown sensors"
* commit '
17548b3c70fe4f29d33367a61300f5323f5efe99':
Revert "be more robust with handling unknown sensors"
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:41:59 +0000 (17:41 -0700)]
am
83485dc9: Merge "be more robust with handling unknown sensors"
* commit '
83485dc920cdc4a6f3dd6797623f536c99f08a6c':
be more robust with handling unknown sensors
Elliott Hughes [Sat, 3 Aug 2013 00:41:57 +0000 (17:41 -0700)]
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.
Elliott Hughes [Sat, 3 Aug 2013 00:41:54 +0000 (17:41 -0700)]
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.
Dirk Dougherty [Sat, 3 Aug 2013 00:41:05 +0000 (17:41 -0700)]
am
780795dc: am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
780795dc198c05d5a1a181c58317dc6befec861d':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:41:02 +0000 (17:41 -0700)]
am
e0a85960: am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
e0a8596020a10c1cf6347d89fea862d41629db04':
docs: OpenGL Training sample code fixes
Jeff Sharkey [Fri, 2 Aug 2013 22:55:26 +0000 (15:55 -0700)]
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
Dirk Dougherty [Sat, 3 Aug 2013 00:38:31 +0000 (17:38 -0700)]
am
b6cb0437: Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
* commit '
b6cb0437ef0677aa4b58bb76a77dd4fdae8258e0':
Doc change: refresh GCM reference docs.
Scott Main [Sat, 3 Aug 2013 00:38:28 +0000 (17:38 -0700)]
am
9a0087f2: Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
* commit '
9a0087f22754de40cd5be2a738600f9642a611cc':
docs: OpenGL Training sample code fixes
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:31:54 +0000 (17:31 -0700)]
Revert "be more robust with handling unknown sensors"
This reverts commit
80ba0a6baec17d5ac5a1e6f9e4b84f7d013d07e6.
Martijn Coenen [Wed, 31 Jul 2013 03:07:47 +0000 (20:07 -0700)]
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
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:13:24 +0000 (00:13 +0000)]
Merge "be more robust with handling unknown sensors"
Brian Carlstrom [Fri, 2 Aug 2013 23:58:42 +0000 (23:58 +0000)]
Merge "Teach PackageManager to skip core-libart.jar"
Alan Viverette [Fri, 2 Aug 2013 23:45:03 +0000 (16:45 -0700)]
Move caption style to its own class, add presets
BUG:
9926077
Change-Id: I14e809c5a95103e57d30f4273399e9914af52b56
Igor Murashkin [Fri, 2 Aug 2013 23:43:54 +0000 (23:43 +0000)]
Merge "graphics: Update ImageFormat#YUV_420_888 javadoc"
Igor Murashkin [Wed, 31 Jul 2013 23:46:10 +0000 (16:46 -0700)]
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
Zhijun He [Fri, 2 Aug 2013 23:38:24 +0000 (23:38 +0000)]
Merge "MediaFrameworkTest: Add camera capture result callback test"
Craig Mautner [Thu, 1 Aug 2013 17:06:34 +0000 (10:06 -0700)]
Add force default orientation.
Devices can be configured to remain in their default landscape or
portrait orientation by setting config_forceDefaultOrientation true
in overlay/.../values/config.xml.
Activities that desire to run in the non-default orientation are
supported by creating a logical display within the physical display.
Transitions to and from the activity perform a crossfade rather than
the normal rotation animation.
Also, improve SurfaceTrace debug output.
Fixes bug
9695710.
Change-Id: I053e136cd2b9ae200028595f245b6ada5927cfe9
Dirk Dougherty [Fri, 2 Aug 2013 22:49:11 +0000 (22:49 +0000)]
Merge "Doc change: refresh GCM reference docs." into jb-mr2-docs
Tim Murray [Fri, 2 Aug 2013 22:34:21 +0000 (22:34 +0000)]
Merge "Handle updates to RS C++ API."
Tim Murray [Thu, 1 Aug 2013 21:49:22 +0000 (14:49 -0700)]
Handle updates to RS C++ API.
Change-Id: I73127fc7369643b94d4a49f31a516b50c74b54ac
Scott Main [Fri, 2 Aug 2013 22:27:13 +0000 (22:27 +0000)]
Merge "docs: OpenGL Training sample code fixes" into jb-mr2-docs
Zhijun He [Wed, 31 Jul 2013 21:16:14 +0000 (14:16 -0700)]
MediaFrameworkTest: Add camera capture result callback test
Also refactor the code to reduce code duplication.
Change-Id: I428ad73510043ebf9e62cd7841bfdb683c96f9bc
Elliott Hughes [Fri, 2 Aug 2013 22:13:07 +0000 (22:13 +0000)]
Merge "If frameworks wants ASCII casing, it should explicity ask for it."
Elliott Hughes [Fri, 2 Aug 2013 17:00:44 +0000 (10:00 -0700)]
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
Glenn Kasten [Fri, 19 Jul 2013 00:03:14 +0000 (17:03 -0700)]
Don't doubly initialize fields in constructor
Change-Id: Id3b4911a7954a5a908764683cc7b8d8515d4482a
Glenn Kasten [Fri, 19 Jul 2013 00:08:21 +0000 (17:08 -0700)]
Clean up throws in AudioRecord and AudioTrack
Remove dead assignments to member fields in constructor prior to throw.
Execution doesn't continue execution, so no need to initialize fields.
throw doesn't need parentheses.
Fix indentation.
Change-Id: I2bf1b8bfa2c836e53a41eea67552cba40dc6fd43
Scott Main [Fri, 2 Aug 2013 21:56:21 +0000 (14:56 -0700)]
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)
Glenn Kasten [Mon, 22 Jul 2013 14:36:34 +0000 (07:36 -0700)]
Explicitly compare raw pointers to NULL
Change-Id: If76a15509d4121e391e28f26ca273cc00552efa8
Scott Main [Fri, 2 Aug 2013 21:29:09 +0000 (14:29 -0700)]
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)
Scott Main [Fri, 2 Aug 2013 21:27:40 +0000 (14:27 -0700)]
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)
Svetoslav Ganov [Fri, 2 Aug 2013 21:24:38 +0000 (21:24 +0000)]
Merge " First cut of the print notifications."
Scott Main [Fri, 2 Aug 2013 21:23:55 +0000 (21:23 +0000)]
Merge "add note to use "480" instead of "xxhdpi" (this should be temporary)" into jb-mr2-docs
Svetoslav Ganov [Fri, 2 Aug 2013 21:22:59 +0000 (21:22 +0000)]
Merge "Revert "ssss""
Svetoslav Ganov [Fri, 2 Aug 2013 21:22:19 +0000 (14:22 -0700)]
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
Svetoslav Ganov [Fri, 2 Aug 2013 21:19:37 +0000 (21:19 +0000)]
Revert "ssss"
This reverts commit
650f0ee31bbd2a23dc64b60caba3a52e7665398c.
Change-Id: Iae83ca6ccb7feccb74069bf09cfb3150c03ec710
Svetoslav Ganov [Fri, 2 Aug 2013 21:15:35 +0000 (21:15 +0000)]
Merge "ssss"
Dmitry Shmidt [Thu, 25 Jul 2013 00:42:56 +0000 (17:42 -0700)]
dhcp: Get mtu property from dhcp results
Change-Id: I1b032094e0945b27d98f7ac786247b7cc9d60131
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Joe Fernandez [Tue, 2 Oct 2012 18:03:45 +0000 (11:03 -0700)]
docs: OpenGL Training sample code fixes
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8
(cherry picked from commit
6da22f88434543e8796e0151f4bb11d74c16e847)
Fabrice Di Meglio [Fri, 2 Aug 2013 20:52:31 +0000 (20:52 +0000)]
Merge "Update Framework resources for RTL support"
Mathias Agopian [Wed, 3 Jul 2013 22:38:29 +0000 (15:38 -0700)]
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
Dave Burke [Fri, 2 Aug 2013 20:44:17 +0000 (13:44 -0700)]
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."
Dave Burke [Fri, 2 Aug 2013 20:42:03 +0000 (13:42 -0700)]
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."
Dave Burke [Fri, 2 Aug 2013 20:39:12 +0000 (13:39 -0700)]
am
7925e7cc: Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
* commit '
7925e7cc089251afb2faceb3e81eea436647c572':
Revert "Add version identifier to app ops."
Dave Burke [Fri, 2 Aug 2013 20:36:28 +0000 (20:36 +0000)]
Merge "Revert "Add version identifier to app ops."" into jb-mr2-dev
Chris Craik [Fri, 2 Aug 2013 20:34:38 +0000 (20:34 +0000)]
Merge "Fix quickReject's handling of AA ramp geometry"
Svetoslav Ganov [Fri, 2 Aug 2013 20:31:20 +0000 (13:31 -0700)]
ssss
Change-Id: I001c2ae5bc6caeac7e1a2223e221be69f6e6cb6c
Dave Burke [Fri, 2 Aug 2013 20:25:02 +0000 (20:25 +0000)]
Revert "Add version identifier to app ops."
This reverts commit
483a6bbfc118409b9c46b226cf0aa6afdc4d9159.
Change-Id: I91d6b8b8d1789089bf9764e734f7fe59d03151a2
David Christie [Wed, 31 Jul 2013 01:11:23 +0000 (18:11 -0700)]
Modify quicksettings to have new location behavior.
Location tile is always present, and long pressing
toggles the master location enabled switch.
Change-Id: I54d5ccaa3b04e14ebebd68f5fafa8e65311debb4
Scott Main [Fri, 2 Aug 2013 19:53:50 +0000 (12:53 -0700)]
add note to use "480" instead of "xxhdpi" (this should be temporary)
Change-Id: I6552f1cc420d3278f363df8e0640d59eba1fd180
Glenn Kasten [Fri, 2 Aug 2013 19:38:19 +0000 (12:38 -0700)]
Clean up imports
No need to import java.lang.*;
these imports are implicit in the language.
Change-Id: Ia903fb9546f2a295605dbc80ba69c4e6778627d6
Glenn Kasten [Thu, 1 Aug 2013 14:26:04 +0000 (07:26 -0700)]
Replace run-time PCM encodings by compile-time constants
Change-Id: I2ab9103f3666d88eb1c7292307cc0a90a6482af6
Glenn Kasten [Thu, 1 Aug 2013 14:26:22 +0000 (07:26 -0700)]
Remove dead code in AudioTrack JNI
Change-Id: I17103485cdefdf2d1dbda8d1993e64c80d4e952e
Chris Craik [Wed, 31 Jul 2013 02:05:20 +0000 (19:05 -0700)]
Fix quickReject's handling of AA ramp geometry
By having quickReject round out the window-space geometry bounds, we
prevent the AA perimeter (which falls outside the local bounds passed
in) from drawing outside the clip.
Change-Id: I8ee36be9039a9c47906815ee2f0dbaa5eb910b82
Jeff Sharkey [Fri, 2 Aug 2013 18:10:09 +0000 (18:10 +0000)]
Merge "Reference docs by ROOT_ID and DOC_ID; recents."