OSDN Git Service
Jeff Sharkey [Sun, 22 Sep 2013 19:55:19 +0000 (19:55 +0000)]
Merge "Create unique files, root ordering, UI bugs." into klp-dev
Igor Murashkin [Sun, 22 Sep 2013 16:54:11 +0000 (16:54 +0000)]
Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev
Robert Greenwalt [Sun, 22 Sep 2013 15:59:00 +0000 (15:59 +0000)]
Merge "Fix BatchScan request coalesing" into klp-dev
Igor Murashkin [Tue, 10 Sep 2013 19:15:54 +0000 (12:15 -0700)]
camera2: Rename CameraProperties to CameraCharacteristics
Bug:
10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
Igor Murashkin [Sun, 22 Sep 2013 02:44:06 +0000 (02:44 +0000)]
Merge "camera2: Add capture sequences and capture failures" into klp-dev
Jeff Sharkey [Sat, 21 Sep 2013 20:57:33 +0000 (13:57 -0700)]
Create unique files, root ordering, UI bugs.
When a file already exists on disk, try adding a counter suffix to
make a unique name. Move services near top of roots list, just below
recents. Remove "Documents" root.
Increase number of recents allowed from single provider, and add more
logging to diagnose wedged loaders.
When launching GET_CONTENT apps, wait for successful result before
relaying result; canceled requests now return to DocumentsUI.
Add CloseGuard to ContentProviderClients, since leaked instances can
keep the remote process alive.
Fix UI bug around trailing breadcrumbs. Fix bug that dropped Recents
from roots list. Add up action to Settings activity. Give our
activity a default icon while waiting for async roots to load.
Bug:
10818683,
10819461,
10819461,
10819196,
10860199
Change-Id: I7b9e26b1cf8353dd3175458b23da2b4bda6c5831
Wink Saville [Sat, 21 Sep 2013 18:52:42 +0000 (11:52 -0700)]
Merge commit '
53221120' into fix-merge-conflict
* commit '
53221120':
Do not always call setIsConnectedToProvisioningNetwork(false)
Conflicts:
core/java/android/net/MobileDataStateTracker.java
Change-Id: I497b57cb96d0f3b3bce4f4e1cbc5febcc6421597
Wink Saville [Sat, 21 Sep 2013 18:33:53 +0000 (11:33 -0700)]
am
ab8cabf1: am
1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit '
ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
Do not always call setIsConnectedToProvisioningNetwork(false)
Wink Saville [Sat, 21 Sep 2013 18:30:33 +0000 (11:30 -0700)]
am
1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit '
1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
Do not always call setIsConnectedToProvisioningNetwork(false)
Wink Saville [Sat, 21 Sep 2013 16:01:19 +0000 (09:01 -0700)]
Do not always call setIsConnectedToProvisioningNetwork(false)
Previously I was calling setIsConnectedToProvisioningNetwork(false) always,
but all MDST's receive every broadcast. Thus we could over write an MDST's
mNetworkInfo.mIsConnectedToProvisioningNetwork to false, unless the MDST
that was set to true was last, i.e the code was order dependent.
If the provisioning networks value was false instead of true
when handleMobileProvisioningAction was called we wouldn't invoke
mdst.enableMobileProvisioning because network info would be null.
Thus the provisioning network would never transition to CONNECTED and
a default route wouldn't get setup and the browser couldn't access the
website.
Now setIsConnectedToProvisioningNetwork is only set to false when the
apnType matches and we won't indiscriminately change it and are not
order dependent.
Bug:
10853805
Change-Id: I68a4f9bdf5dc18d90f4cdef7a60811f57be67261
Jonathan Dixon [Sat, 21 Sep 2013 03:41:32 +0000 (03:41 +0000)]
Merge "WebView: add an API method to control web contents debugging" into klp-dev
Svetoslav Ganov [Sat, 21 Sep 2013 02:39:58 +0000 (02:39 +0000)]
Merge "Update android.print.PrintAttributes documentation" into klp-dev
David Friedman [Sat, 21 Sep 2013 02:11:45 +0000 (19:11 -0700)]
am
22423446: am
217683d9: am
e1243728: Merge "Fixed typo: Added missing word. Bug
10617080 Fixed typo:" into jb-mr2-docs
* commit '
224234461cd7752a179ad631d9c8c3cdb3964898':
Fixed typo: Added missing word. Bug
10617080 Fixed typo:
David Friedman [Sat, 21 Sep 2013 02:09:17 +0000 (19:09 -0700)]
am
217683d9: am
e1243728: Merge "Fixed typo: Added missing word. Bug
10617080 Fixed typo:" into jb-mr2-docs
* commit '
217683d95d0be42c738b2844b289f2207e36b70f':
Fixed typo: Added missing word. Bug
10617080 Fixed typo:
David Friedman [Sat, 21 Sep 2013 02:05:55 +0000 (19:05 -0700)]
am
e1243728: Merge "Fixed typo: Added missing word. Bug
10617080 Fixed typo:" into jb-mr2-docs
* commit '
e12437284fcf94aed4ac5c2e10401b70fb1be086':
Fixed typo: Added missing word. Bug
10617080 Fixed typo:
David Friedman [Sat, 21 Sep 2013 02:02:45 +0000 (02:02 +0000)]
Merge "Fixed typo: Added missing word. Bug
10617080 Fixed typo:" into jb-mr2-docs
Igor Murashkin [Thu, 5 Sep 2013 19:22:00 +0000 (12:22 -0700)]
camera2: Add capture sequences and capture failures
- CaptureResult#getRequest is used to tie a result to a request (for convenience)
- Add new CaptureFailure class to describe capture failure
- Results/frame numbers also return frame numbers, sequence ids
- Captures now all return the sequence id
- A sequence id onComplete is available in the CaptureListener
Bug:
10360518
Change-Id: I9ebaa45698c718a1185b5ae920b7975925fe2f60
Dianne Hackborn [Sat, 21 Sep 2013 01:52:04 +0000 (01:52 +0000)]
Merge "Fix issue #
10863270: procstats UI is showing all green" into klp-dev
Dianne Hackborn [Sat, 21 Sep 2013 01:45:43 +0000 (18:45 -0700)]
Fix issue #
10863270: procstats UI is showing all green
Gah I messed up when refactoring so it would always be told
RAM is low.
Also slightly tune the low memory parameters to go into low
memory states a bit more aggressively.
Change-Id: I5f970349760ad349d515a85c266ab21b387ee353
David Friedman [Fri, 20 Sep 2013 06:48:53 +0000 (23:48 -0700)]
Fixed typo: Added missing word.
Bug
10617080
Fixed typo:
"Determine if AccountManager for You"
-->
"Determine if AccountManager is for You"
Change-Id: I5b8f1368dad72bbbeb581132f480baf46a029be8
Dianne Hackborn [Sat, 21 Sep 2013 01:25:18 +0000 (01:25 +0000)]
Merge "Shut. Up." into klp-dev
Dianne Hackborn [Sat, 21 Sep 2013 01:21:26 +0000 (01:21 +0000)]
Merge "Fix issue #
10807048: Groupon: The application crash when user rotates..." into klp-dev
Dianne Hackborn [Sat, 21 Sep 2013 01:19:00 +0000 (18:19 -0700)]
Shut. Up.
Change-Id: Id047ab2308903a527bebf80bdacdb01ec51de051
Svetoslav [Sat, 21 Sep 2013 01:15:47 +0000 (01:15 +0000)]
Merge "Offer to enable a print service after it is installed." into klp-dev
Dianne Hackborn [Sat, 21 Sep 2013 01:13:52 +0000 (18:13 -0700)]
Fix issue #
10807048: Groupon: The application crash when user rotates...
...device to another mode (portrait or landscape) on Main page.
So, it turns out that Bundle claimed to have an invariant that either
mParcelledData or mMap would hold its data, never both. The new
implementation on top of ArrayMap assumed this was the case. However,
there is one situation where it is not true: an application can take
an existing Bundle that contains data, and call readFromParcel() on it.
The implementation of readFromParcel() would just pull out the
parceled data and stuff it in to mParcelledData for later unparceling,
even if that Bundle already had a non-empty mMap.
To fix this, we just look for this case in readFromParcel() and
immediately unparcel at that point into the existing map, using a
new unparcelling method that doesn't rely on the target map being
empty.
Change-Id: Ib816b6876a6cd2760b7a3372c7a79ca2f12dfeba
Svetoslav [Fri, 20 Sep 2013 23:25:52 +0000 (16:25 -0700)]
Offer to enable a print service after it is installed.
The user has to explicitly enable a print service from the settings UI
before using it. Usually, users very rarely if at all interact with print
services, therefore all print service management task are performed from
the print settings. We also have to get user consent warning that the
user's data is about to be given to a third-party app. We now post a
notification allowing the user to go directly to the settings screen to
turn the service on.
bug:
10447510
Change-Id: Iea56c0825f0bf38328ad94912f0ea5576e9339b3
Chris Craik [Sat, 21 Sep 2013 00:33:36 +0000 (00:33 +0000)]
Merge "Correct bitmap merging logic" into klp-dev
Chris Craik [Sat, 21 Sep 2013 00:13:18 +0000 (17:13 -0700)]
Correct bitmap merging logic
bug:
10863163
This fixes two issues
The check for pure translation was incorrect. It was fixed and renamed
for clarity.
Certain matrix paths weren't setting kTypePositiveScale. For
simplicity (and because positive scale is simple to check) removed
flag in favor of dynamic checking.
Change-Id: Ic5ce235653ef49a68b8b242bd89fc2e95874ecc9
Raph Levien [Fri, 20 Sep 2013 23:27:57 +0000 (23:27 +0000)]
Merge "Fix for "Can't place cursor after combining accent"" into klp-dev
Igor Murashkin [Fri, 20 Sep 2013 23:21:50 +0000 (23:21 +0000)]
Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev
destradaa [Fri, 20 Sep 2013 23:18:14 +0000 (23:18 +0000)]
Merge "Ensure access to the map of geofence callbacks is synchronized in all cases Fix Java reference leak in the JNI layer" into klp-dev
Adam Lesinski [Fri, 20 Sep 2013 22:59:12 +0000 (22:59 +0000)]
Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev
Jeff Sharkey [Fri, 20 Sep 2013 22:56:07 +0000 (22:56 +0000)]
Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev
Glenn Kasten [Fri, 20 Sep 2013 22:38:18 +0000 (22:38 +0000)]
Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev
Robert Greenwalt [Fri, 20 Sep 2013 22:13:08 +0000 (15:13 -0700)]
Fix BatchScan request coalesing
bug:
10407896
Change-Id: Ic22c7d8b2a80d490d208570782a12e42d4690f5c
Raph Levien [Fri, 20 Sep 2013 22:11:52 +0000 (15:11 -0700)]
Fix for "Can't place cursor after combining accent"
This patch fixes behavior where attempting to place the cursor at
the end of a string where the last character is a combining accent
actually placed it before that accent. This was especially annoying
for editing Thai text, because it made it difficult to delete a
trailing tone mark.
Fixes bug
8947569 "Can't place cursor after combining accent" and bug
10398332 "[Thailand] Thai Language(IME) -- Can't delete Thai tone mark
while writing message"
Change-Id: Ida1933c8f0ab6cdb0200db39891e9389e4bdba86
destradaa [Fri, 20 Sep 2013 20:08:41 +0000 (13:08 -0700)]
Ensure access to the map of geofence callbacks is synchronized in all cases
Fix Java reference leak in the JNI layer
Bug:
10624887
Change-Id: I656973653d82c73a7ba2b51f22989ffed144c5df
Adam Lesinski [Fri, 20 Sep 2013 21:08:25 +0000 (14:08 -0700)]
Surfaces ParcelFileDescriptor#parseMode() as API
Moves ContentResolver#modeToMode() to ParcelFileDescriptor#parseMode()
bug:
10711271
Change-Id: I28a5de4ca70adfbec4caf739863b77f0fd7fd9a4
Jeff Sharkey [Wed, 18 Sep 2013 00:30:33 +0000 (17:30 -0700)]
Delegate mkdirs() to vold when lacking perms.
Apps without sdcard_r or sdcard_rw are still able to write to
their package-specific directory, but someone needs to first make
that directory on their behalf. This change will delegate the
mkdirs() call through to vold when an app fails to create directly.
MountService validates that the path belongs to the calling user, and
that it's actually on external storage, before passing to vold.
Update Environment to make app-vs-vold paths clearer.
Bug:
10577808
Change-Id: I43b4a77fd6d2b9af2a0d899790da8d9d89386776
Craig Mautner [Fri, 20 Sep 2013 21:28:14 +0000 (21:28 +0000)]
Merge "Remove over-aggressive stack movement." into klp-dev
Svetoslav [Fri, 20 Sep 2013 21:12:54 +0000 (21:12 +0000)]
Merge "PrintDocumentAdapter contract not followed on print." into klp-dev
Craig Mautner [Fri, 20 Sep 2013 20:42:49 +0000 (13:42 -0700)]
Remove over-aggressive stack movement.
Moving a task to the bottom was also moving its stack to the back.
Since chrome always finishes by calling moveTaskToBack this put
the home stack in front of the application stack and would cause
bizarre window layering effects.
Definitely fixes
10764463.
Maybe fixes
10678010.
Change-Id: Ic202ae4fad44b36a8444255764d2135fccd4743d
David Christie [Fri, 20 Sep 2013 20:04:04 +0000 (20:04 +0000)]
Merge "Clear names from externally supplied WorkSources to WifiManager (b/
10733757)" into klp-dev
Vinit Deshapnde [Fri, 20 Sep 2013 19:30:26 +0000 (19:30 +0000)]
Merge "Fix incorrect exception being thrown from WifiConfiguration" into klp-dev
Svetoslav [Fri, 20 Sep 2013 18:58:55 +0000 (11:58 -0700)]
PrintDocumentAdapter contract not followed on print.
1. Layout was not called after pressing the print button if the
print attributes did not change. This is not correct since the
previous layout calls were for preview purposes and the one
after pressing print is not for preview. Hence, we always have
to do this layout.
2. After layout we decide whether to ask the app to write some
pages. We ask for a write if we do not have the pages selected
by the user or the document changed (if the page count changed,
the document type changed, or the app told us that the content
changed). We were not computing correctly whether the document
changed since we compared the size but the document info the
app passes in after a layout does not have the size yet. We set
the size after a write. So for layout purposes we should ignore
the size. We only care if the page count, document type, or
content changed where the latter is reported by the app in
the layout callback.
3. We were not updating the PrintJob after setting the data
size of the printed document.
4. Disabled debugging.
bug:
10835370
Change-Id: Ic3b2871b4e954cdf610f8cf806de5fc6588a6bec
Svetoslav [Fri, 20 Sep 2013 18:59:39 +0000 (18:59 +0000)]
Merge "Null not handled when parsing media size resource id attribute." into klp-dev
Dirk Dougherty [Fri, 20 Sep 2013 18:51:37 +0000 (11:51 -0700)]
am
53b2a957: am
8ea8ff81: am
78ec732f: Doc change: Update Google Play Services reference docs.
* commit '
53b2a957d19f21cd377d5f93225820d63c6b51d9':
Doc change: Update Google Play Services reference docs.
Dirk Dougherty [Fri, 20 Sep 2013 18:48:52 +0000 (11:48 -0700)]
am
8ea8ff81: am
78ec732f: Doc change: Update Google Play Services reference docs.
* commit '
8ea8ff81a93f367af59e328bb365ca9560e264ec':
Doc change: Update Google Play Services reference docs.
Dirk Dougherty [Fri, 20 Sep 2013 18:46:23 +0000 (11:46 -0700)]
am
78ec732f: Doc change: Update Google Play Services reference docs.
* commit '
78ec732f73aedc6afd79c4f924345a5adb61dc54':
Doc change: Update Google Play Services reference docs.
David Christie [Fri, 20 Sep 2013 17:44:01 +0000 (10:44 -0700)]
Clear names from externally supplied WorkSources to WifiManager (b/
10733757)
Change-Id: I36102f13962df2093c1e35fb40081ead647eff32
Dirk Dougherty [Mon, 16 Sep 2013 17:37:40 +0000 (10:37 -0700)]
Doc change: Update Google Play Services reference docs.
Change-Id: Iaed2e01a18263000509f243e66a6b6b33037d6b9
Dianne Hackborn [Fri, 20 Sep 2013 18:23:07 +0000 (18:23 +0000)]
Merge "Fix issue #
10310128: CTS: android.security.cts.ServicePermissionsTest" into klp-dev
Chet Haase [Fri, 20 Sep 2013 18:22:54 +0000 (18:22 +0000)]
Merge "Add equals() and hashcode() to SpannableString" into klp-dev
Adam Lesinski [Fri, 20 Sep 2013 18:22:17 +0000 (18:22 +0000)]
Merge "Ensures that CompatibilityInfo is always set in Resources" into klp-dev
Glenn Kasten [Fri, 20 Sep 2013 18:10:28 +0000 (18:10 +0000)]
Revert "Workaround for slow AudioRecord destructor"
This reverts commit
8d87d7ba113ad90685f1d2669e65251a9b422a5a.
Change-Id: I78cbe73959d29fc0ff3153268503ae685cd0995c
Adam Lesinski [Fri, 20 Sep 2013 03:33:15 +0000 (20:33 -0700)]
Ensures that CompatibilityInfo is always set in Resources
- Adds null checks when setting mCompatibilityInfo and uses default no-op
CompatibilityInfo object instead of null
- Removes null checks when calling methods on mCompatibilityInfo since it is never
null
bug:
10204942
Change-Id: I36e88f5cdceb46b8b19fb902270ef74023a81546
Robert Greenwalt [Fri, 20 Sep 2013 17:55:44 +0000 (17:55 +0000)]
Merge "Supsend/resume batched scans around dhcp." into klp-dev
Dianne Hackborn [Fri, 20 Sep 2013 17:54:16 +0000 (10:54 -0700)]
Fix issue #
10310128: CTS: android.security.cts.ServicePermissionsTest
Change-Id: Id6432fc1b62db41c6c291ec08450c2fc37ced899
Robert Greenwalt [Fri, 20 Sep 2013 17:43:29 +0000 (17:43 +0000)]
Merge "Cleanup the shutdown of BatchedScans." into klp-dev
Svetoslav [Fri, 20 Sep 2013 17:43:24 +0000 (10:43 -0700)]
Null not handled when parsing media size resource id attribute.
bug:
10835715
Change-Id: I0c9c1120c26e68b4c582599bbda3753d0e443d8c
Robert Greenwalt [Fri, 20 Sep 2013 00:30:19 +0000 (17:30 -0700)]
Supsend/resume batched scans around dhcp.
Scanning while dhcp is running breaks dhcp, so stop the batched scans
when we need dhcp and start it up again after.
bug:
10691401
Change-Id: Ifdeb6f35cfe4509b90fed1e1e694d0c107f24a7e
Vinit Deshapnde [Fri, 20 Sep 2013 17:12:30 +0000 (10:12 -0700)]
Fix incorrect exception being thrown from WifiConfiguration
Bug:
10817189
Change-Id: Ib2985f50080cb9d983a6de6ce668223e8782c3b6
Scott Main [Fri, 20 Sep 2013 17:10:22 +0000 (10:10 -0700)]
am
8f6ed205: am
208e6079: am
0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
* commit '
8f6ed205a2523a8170cdd3e824170fd77c4fd65a':
add custom head tag to verify developers@android.com as site owner
Scott Main [Fri, 20 Sep 2013 17:07:46 +0000 (10:07 -0700)]
am
208e6079: am
0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
* commit '
208e6079b4ccd161de198553319d285711564ea2':
add custom head tag to verify developers@android.com as site owner
Scott Main [Fri, 20 Sep 2013 17:04:26 +0000 (10:04 -0700)]
am
0333302a: Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
* commit '
0333302ad7162f66404c08e1c6c5b6b767aa78b3':
add custom head tag to verify developers@android.com as site owner
Scott Main [Fri, 20 Sep 2013 16:58:38 +0000 (16:58 +0000)]
Merge "add custom head tag to verify developers@android.com as site owner" into jb-mr2-docs
Robert Greenwalt [Fri, 20 Sep 2013 00:27:43 +0000 (17:27 -0700)]
Cleanup the shutdown of BatchedScans.
Fixes binder-death as well as disambiguation when an app has multiple requests in.
bug:
10641931
Change-Id: Ib701d531fa51e7e2a027848cfdfcad3b47056923
John Spurlock [Fri, 20 Sep 2013 16:25:30 +0000 (16:25 +0000)]
Merge "Include starting windows in the sysui vis calculation." into klp-dev
Scott Main [Fri, 20 Sep 2013 16:10:08 +0000 (09:10 -0700)]
add custom head tag to verify developers@android.com as site owner
Change-Id: I1a79669ab1e30de152354fafe5e397d5d1598f15
John Spurlock [Fri, 20 Sep 2013 16:04:47 +0000 (12:04 -0400)]
Include starting windows in the sysui vis calculation.
Sysui vis needs to be recomputed in the same code path as showing/
hiding the system bar (code path = finishPostLayoutPolicyLw) so
it can perform the new fade in/fade out to transparent modes at
the correct time.
Turns out no new state tracking is required, we already keep track
of this window as mTopFullscreenOpaqueWindowState.
So prefer mFocusedWindow when computing sysui vis as before,
but if null fallback to mTopFullscreenOpaqueWindowState.
Bug:
10561554
Change-Id: I492766989a67fdac4f030451dcf00f6741a556c0
Maggie Benthall [Fri, 20 Sep 2013 14:30:29 +0000 (14:30 +0000)]
Merge "UX compliance for CA Cert warning tile in QuickSettings" into klp-dev
Daniel Sandler [Fri, 20 Sep 2013 04:26:29 +0000 (00:26 -0400)]
Put soundpooled sounds in the right place.
Bug:
10846839
Change-Id: I5318c2d54ea0e25fa74bbafc35fb4f7a2883b351
Jim Miller [Fri, 20 Sep 2013 03:01:56 +0000 (20:01 -0700)]
Fix the build - replace broken assets.
Change-Id: If039dee6d7e663d6abacd5239557d4d0a07fc912
Jeff Sharkey [Thu, 19 Sep 2013 22:25:56 +0000 (15:25 -0700)]
Load RootInfo in background, invalidation.
Move all RootInfo queries to background threads to avoid janking
the UI. Update passes happen on spawed task, which swaps out updated
cache results when finished. Support partial updates when only a
single package/authority has changed. Watch for change notifications
for roots, since flags can change over time.
Ignore stopped packages when in background, but query them for roots
when launching any picker UI.
Optimize management launches by treating as one-shot requests that
don't need to wait for all RootInfo.
Bug:
10600454,
10745490
Change-Id: Ibc7b15688ef6b41bd7e9dd0d7564b501e60e49a9
Michael Jurka [Fri, 20 Sep 2013 02:33:47 +0000 (02:33 +0000)]
Merge "Fix default wallpaper dimensions" into klp-dev
Michael Jurka [Fri, 20 Sep 2013 02:32:20 +0000 (04:32 +0200)]
Fix default wallpaper dimensions
Bug:
10834711
Christopher Tate [Fri, 20 Sep 2013 02:16:10 +0000 (02:16 +0000)]
Merge "Don't back up apps in the 'stopped' state" into klp-dev
Igor Murashkin [Wed, 11 Sep 2013 02:35:24 +0000 (19:35 -0700)]
camera2: Add more camera device states, make #openCamera async.
* Move CAMERA_IN_USE, MAX_CAMERAS_IN_USE to StateListener#onError
* Copy CAMERA_DISABLED to StateListener#onError
Bug:
10360518
Change-Id: Idd8cf42e1511d12682018588b2b413116cf65116
Jim Miller [Fri, 20 Sep 2013 01:33:28 +0000 (01:33 +0000)]
Merge "Add camera affordance to navigation bar on phones" into klp-dev
Svetoslav Ganov [Fri, 30 Aug 2013 00:42:07 +0000 (17:42 -0700)]
Update android.print.PrintAttributes documentation
bug:
10550844
Change-Id: Ic1bbb2cb6ab55826eb66242f6002b7165aff37a4
Conflicts:
core/java/android/print/PrintAttributes.java
Svetoslav [Fri, 20 Sep 2013 01:14:02 +0000 (01:14 +0000)]
Merge "Move PdfDocument to android.graphics.pdf" into klp-dev
Craig Mautner [Fri, 20 Sep 2013 00:51:20 +0000 (00:51 +0000)]
Merge "Only show launcher for the bottom activity in a task" into klp-dev
David Braun [Fri, 20 Sep 2013 00:26:32 +0000 (00:26 +0000)]
Merge "Add config setting for default sms app." into klp-dev
Craig Mautner [Fri, 20 Sep 2013 00:19:51 +0000 (17:19 -0700)]
Only show launcher for the bottom activity in a task
When transitioning from activity-over-launcher to task-over-launcher
ensureActivitiesVisibleLocked() was too aggressive in showing the
launcher. If there were any non-fullscreen activities in a task that
sits over the launcher then the launcher would be shown.
This fix adds a test to make sure the launcher will only be shown if
the bottommost activity in such a task is non-fullscreen.
Fixes bug
10840919.
Change-Id: I5dcd63be3fa2865ae38cbb921332937dfa4b5d47
Chet Haase [Wed, 18 Sep 2013 22:12:35 +0000 (15:12 -0700)]
Add equals() and hashcode() to SpannableString
ActionBar uses a transition to animate text changes. This transition
depends on testing the equality of start/end text values in CharSequence
objects. Without equals(), SpannableString will return false for objects
whose references are different, but whose text is exactly the same.
This CL adds the equals() method, and the accompanying hashcode method,
to ensure that two Spanned implementations will always be equal
if their text and span data are equal.
Issue #
10760075 Wrong unread count in actionbar
Change-Id: I5e77d40dd302eca035e8c56d40f3cd0aef8e6424
Jim Miller [Wed, 11 Sep 2013 01:37:01 +0000 (18:37 -0700)]
Add camera affordance to navigation bar on phones
This adds a camera button on phones that can be used to show
and launch the camera.
- Minor refactoring of touch event dispatch in PagedView.
- Disables usability hints when keyguard loads.
- Only add a touch handler for camera icon once during layout.
- Update after review.
- Updated with latest UX camera and camera background assets
Change-Id: I09cd5cb0e501fd0f4659bea96d00c92b07f805c4
Svetoslav [Wed, 18 Sep 2013 22:58:28 +0000 (15:58 -0700)]
Move PdfDocument to android.graphics.pdf
1. Move PdfDocument to android.graphics.pdf.
2. Changed the PdfDocument as per API concil request.
3. Updated the documentation.
bug:
10461180
bug:
10552565
bug:
10681585
bug:
10552336
Change-Id: I08e15b34cf37bb064248c887e6f59808019cafe8
Christopher Tate [Fri, 20 Sep 2013 00:12:27 +0000 (17:12 -0700)]
Don't back up apps in the 'stopped' state
E.g. right after install from the Play Store, or after a force stop.
Bug
10845317
Change-Id: I7764ce61caa77136ca2758657f111928f9740fc0
Glenn Kasten [Fri, 20 Sep 2013 00:08:58 +0000 (00:08 +0000)]
Merge "Workaround for slow AudioRecord destructor" into klp-dev
Joe Fernandez [Thu, 19 Sep 2013 23:50:16 +0000 (16:50 -0700)]
am
41c3c2b6: am
6e3b21cc: am
72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
* commit '
41c3c2b687fa19d10c450a6d4b0b9f9a707a3854':
docs: Fix for SDK 22.2.1 Windows download checksum and size
Joe Fernandez [Thu, 19 Sep 2013 23:47:56 +0000 (16:47 -0700)]
am
6e3b21cc: am
72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
* commit '
6e3b21cc83da2b227704b9a6b0cbad258ea5bd84':
docs: Fix for SDK 22.2.1 Windows download checksum and size
Glenn Kasten [Thu, 19 Sep 2013 23:42:19 +0000 (16:42 -0700)]
Workaround for slow AudioRecord destructor
Bug:
10816117
Change-Id: If59028bc7dc7abb84e1e3642c721c2629653631f
Joe Fernandez [Thu, 19 Sep 2013 23:44:58 +0000 (16:44 -0700)]
am
72f65780: Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
* commit '
72f65780c77f9c0c306fcb53efeb62fbeba3899c':
docs: Fix for SDK 22.2.1 Windows download checksum and size
Joe Fernandez [Thu, 19 Sep 2013 23:44:44 +0000 (16:44 -0700)]
am
354b4fef: am
0d8f0849: am
1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes
* commit '
354b4fef036ef9e57d79bf70a6988be92a9813eb':
docs: Google APIs emulator 18 r3 - Platform Release Notes
Ed Heyl [Thu, 19 Sep 2013 23:43:25 +0000 (23:43 +0000)]
Merge "fix typo" into klp-dev
Joe Fernandez [Thu, 19 Sep 2013 23:41:39 +0000 (23:41 +0000)]
Merge "docs: Fix for SDK 22.2.1 Windows download checksum and size" into jb-mr2-docs
Joe Fernandez [Thu, 19 Sep 2013 23:41:07 +0000 (16:41 -0700)]
am
0d8f0849: am
1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes
* commit '
0d8f0849ff842ed7ce16f183207ed7ebbc7bac7e':
docs: Google APIs emulator 18 r3 - Platform Release Notes
Joe Fernandez [Thu, 19 Sep 2013 23:38:06 +0000 (16:38 -0700)]
am
1d65500d: docs: Google APIs emulator 18 r3 - Platform Release Notes
* commit '
1d65500d6e16e497774dbff3b5d94cfd5256d118':
docs: Google APIs emulator 18 r3 - Platform Release Notes
Joe Fernandez [Thu, 19 Sep 2013 23:31:30 +0000 (16:31 -0700)]
docs: Fix for SDK 22.2.1 Windows download checksum and size
external bug: http://b.android.com/60257
Change-Id: I399d21fd792c7c9a1bfac4402bc76fa23d45415b
Ed Heyl [Thu, 19 Sep 2013 23:25:57 +0000 (16:25 -0700)]
fix typo
Change-Id: I97df15ea7d349e0224e1830d7327dde87e840a51