109940 Commits

Author SHA1 Message Date
Zhijun He
111fd86c7a Merge "MediaFrameworkTest: Add camera capture result callback test" 2013-08-02 23:38:24 +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
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
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
Fabrice Di Meglio
1714426bd2 Merge "Update Framework resources for RTL support" 2013-08-02 20:52:31 +00: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
Chris Craik
5e49b307eb 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
2013-08-02 11:29:22 -07:00
Jeff Sharkey
aaabfe9587 Merge "Reference docs by ROOT_ID and DOC_ID; recents." 2013-08-02 18:10:09 +00:00
Jeff Sharkey
92d7e697a8 Reference docs by ROOT_ID and DOC_ID; recents.
The same document may be present with different sematics under
multiple storage roots, so always reference using both ROOT_ID and
DOC_ID.  This enables backends to revoke permissions for an entire
root, such as when an account is removed.

Start building provider to remember recently accessed documents.

Change-Id: I75befa2e61393dec12fcc7fd27f631fcddae46fa
2013-08-02 11:05:11 -07:00
David Christie
df2cab2fc4 Fix build breakage
Change-Id: Ia684fb55db301fdadaa3aae93f82b2cdcfc200af
2013-08-02 10:54:55 -07:00
David Christie
474daa2b78 Merge "Add WorkSource capability to AlarmManager." 2013-08-02 17:17:38 +00:00
Derek Sollenberger
e242e2f236 Merge "Changes needed to support Skia at r10377." 2013-08-02 17:03:37 +00:00
Jean-Michel Trivi
045b309af7 Merge "Remove whitespace in IAudioService.aidl" 2013-08-02 17:01:26 +00:00
Elliott Hughes
e899d7c029 am 5d6b7db5: am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
* commit '5d6b7db5d9cb7de5cee45dd35af18e179f01d583':
  When wifi wants ASCII lowercasing, it needs to ask for it.
2013-08-02 09:50:44 -07:00
Elliott Hughes
5d6b7db5d9 am 20c911ba: Merge "When wifi wants ASCII lowercasing, it needs to ask for it."
* commit '20c911ba071957ff5907d9a7854e7eab1cdaf907':
  When wifi wants ASCII lowercasing, it needs to ask for it.
2013-08-02 09:46:04 -07:00
Elliott Hughes
20c911ba07 Merge "When wifi wants ASCII lowercasing, it needs to ask for it." 2013-08-02 16:39:59 +00:00
Baligh Uddin
7342c66afc Merge "Import translations. DO NOT MERGE" 2013-08-02 16:29:12 +00:00
Baligh Uddin
60840d3858 Merge "Import translations. DO NOT MERGE" 2013-08-02 16:28:13 +00:00
Baligh Uddin
2be0a50dd6 Merge "Import translations. DO NOT MERGE" 2013-08-02 16:26:58 +00:00
Baligh Uddin
b44d75af38 Merge "Import translations. DO NOT MERGE" 2013-08-02 16:26:15 +00:00
Elliott Hughes
ee00b353a4 When wifi wants ASCII lowercasing, it needs to 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: Ibf25d0bbc76015cf8353ec01ab2b743cbc2bde67
2013-08-02 09:07:54 -07:00
Satoshi Kataoka
02260e2141 Add a comment on the spell checker framework
Change-Id: Ibd826d68074d8524cbeaae296ce483f8b10c3d07
2013-08-02 16:22:04 +09:00
Satoshi Kataoka
cf3f35f322 Merge "Update the comment of Settings.ACTION_USER_DICTIONARY_SETTINGS" 2013-08-02 03:44:58 +00:00
Dianne Hackborn
2fc3245537 Merge "Try to improve PSS collection." 2013-08-02 03:34:06 +00:00
Dianne Hackborn
f1cca18ae4 Try to improve PSS collection.
The goal is to collect PSS data from processes when they
are in as stable a state as possible.  We now have tables
for the durations to use for PSS collection based on
process state, and scheduling of collection is all driven
by process state changes.

Change-Id: I95e076f6971b9c093118e53dc8240fb3f5bad3b2
2013-08-01 20:28:36 -07:00
Satoshi Kataoka
1a4645d030 Merge "Small cleanup on InputMethodInfo" 2013-08-02 03:22:26 +00:00
Satoshi Kataoka
660e6c96e3 Small cleanup on InputMethodInfo
Change-Id: I7879a8d9fe83fcd7362ecc4ab60460a3212ac8c4
2013-08-02 11:55:57 +09:00
Fabrice Di Meglio
25a5526e69 Update Framework resources for RTL support
- use "android:autoMirrored" when needed
- remove non needed resources and save about 227k

See bug #7034321 Need Drawable RTL support

Change-Id: Iaa4a62ae1894e2cd221714a91a5c0cd145385bb9
2013-08-01 17:40:23 -07:00
Adam Powell
066f2107a1 Merge "Fix a regression where android:windowContentOverlay did not draw properly." 2013-08-01 23:20:51 +00:00
David Christie
ec37970c0d Merge "Allow a particular LocationRequest to be excluded from AppOps monitoring as long as the client as the appropriate permission (UPDATE_DEVICE_STATS)." 2013-08-01 23:13:48 +00:00
Romain Guy
7d60f45664 Merge "Fix region clipping bugs See external bug #58344" 2013-08-01 23:09:21 +00:00
Adam Powell
9b0dc2894d Fix a regression where android:windowContentOverlay did not draw properly.
This was the victim of an earlier refactoring. Have the
ActionBarOverlayLayout draw this directly over the content so that it
can stay properly in sync with any animations and also remove an extra
couple of views from the decor layout.

Some apps now expect the broken behavior in default themes. Protect
them from themselves until they bump their targetSdkVersion.

Public bug https://code.google.com/p/android/issues/detail?id=58280

Change-Id: I4284503577e322f3e68d4a7fabda8441d3749b98
2013-08-01 16:02:02 -07:00