112253 Commits

Author SHA1 Message Date
Svetoslav
a9f97a0a58 Merge "Page ranges not correct in come cases." into klp-dev 2013-09-23 16:53:52 +00:00
Dianne Hackborn
a3abca90ae Merge "Issue #10461551: KLP API Review: AppOpsManager" into klp-dev 2013-09-23 16:36:29 +00:00
Dianne Hackborn
9bb0ee9131 Issue #10461551: KLP API Review: AppOpsManager
Changed public constants from integers to strings.  Internally
everything is still integers, since we want that more efficient
representation for most things.

Changed the Callback interface to OnOpChangedListener.  We also
have a private versin that again takes an int, and tricks to
make both work.

Reworked the class documentation to be appropriate to the SDK
(as much as it can be); most of the existing documentation is
moved to the private implementation.  Also added documentation
of the MODE constants.

Change-Id: I4f7e73cc99fe66beff9194e960e072e2aa9458f8
2013-09-23 09:35:21 -07:00
Baligh Uddin
3bb62b4cfd Import translations. DO NOT MERGE
Change-Id: If36e81ae6777299362efab7889f6f4013ee544d4
Auto-generated-cl: translation import
2013-09-23 09:26:49 -07:00
Baligh Uddin
e209e27112 Import translations. DO NOT MERGE
Change-Id: Ia5c6ae14529080f176a14f5b8b2307cc2aa39fed
Auto-generated-cl: translation import
2013-09-23 09:10:23 -07:00
Craig Mautner
10385a17cb Ensure that activities behind keyguard are paused.
TLDR: Having a resumed activity behind keyguard can cause the keyguard
not to be dismissed.

Swiping the home button to launch Google Now causes an ASSIST intent
to be launched. The ASSIST intent starts SearchActivity which then
launches GEL. If an activity is resumed behind the keyguard when this
happens then that activity will be paused.

Because that activity is PAUSING, ActivityStackSupervisor
startActivityLocked() doesn't call dismissKeyguard() immediately.
Instead dismissKeyguard will be called later when GEL switches from
not-visible to visible. However, if the paused activity happens to be
GEL then there is never a not-visible to visible transition and
dismissKeyguard never gets called.

This fix removes an unnecessary call to resumeTopActivitiesLocked
which was causing activities behind the lockscreen to be resumed.

This fixes bug 10732489 except immediately after boot. Pausing the
initial activity if the lockscreen is visible after boot is deferred
for another CL.

Change-Id: I323262596ae41bc5a2700bae5942f6a4fba80936
2013-09-23 09:05:15 -07:00
Derek Sollenberger
fe8e21fd80 Fix Java API error where requesting another style for a provided family fails
Internally the API uses the same code path as SkTypeface::CreateFromName which
returns NULL if the requested style is not supported by the existing family.
However, the existing Java API expects that we return the default font in the
requested style so this CL ensures that we do.

bug: 10860066
Change-Id: Ide3a0cc24015e97fa35aef283b42e7d7d11edd9c
2013-09-23 09:22:56 -04:00
Dianne Hackborn
f9b70ab87e Merge "Debug issue #10876433 java.lang.IllegalStateException..." into klp-dev 2013-09-22 23:48:29 +00:00
Dianne Hackborn
2be0093316 Debug issue #10876433 java.lang.IllegalStateException...
...in ActivityManagerService.updateLruProcessInternalLocked on bluetooth

Add more debug output to help track down what is going on.

Also fix a little problem where, when a service ANRs, if you ask to
wait and it still wasn't responding, the ANR dialog wouldn't be
shown again.

Change-Id: I5be2b1705a0a39ca2992624ae683945c5f38065d
2013-09-22 16:46:00 -07:00
Jeff Sharkey
dbfceb7ea0 Merge "Latest UX asset drop, grid padding." into klp-dev 2013-09-22 19:55:34 +00:00
Jeff Sharkey
5e1a5e5bad Merge "Create unique files, root ordering, UI bugs." into klp-dev 2013-09-22 19:55:19 +00:00
Igor Murashkin
3ba21e9795 Merge "camera2: Rename CameraProperties to CameraCharacteristics" into klp-dev 2013-09-22 16:54:11 +00:00
Robert Greenwalt
0983eadff2 Merge "Fix BatchScan request coalesing" into klp-dev 2013-09-22 15:59:01 +00:00
Igor Murashkin
68f40066c9 camera2: Rename CameraProperties to CameraCharacteristics
Bug: 10360518
Change-Id: I8667bdcc8c9528ace96dc675585f923004932641
2013-09-21 21:01:32 -07:00
Igor Murashkin
ca833c389b Merge "camera2: Add capture sequences and capture failures" into klp-dev 2013-09-22 02:44:06 +00:00
Jeff Sharkey
1feeddf518 Latest UX asset drop, grid padding.
Bring in latest asset drop.  Apply grid padding programmatically
instead of waiting for asset.  Remove alpha from directory animation.

Update save footer background to match spec.

Bug: 10700025
Change-Id: I8eef08f36d04767b78e91b23f72bdbebfbb02f58
2013-09-21 15:26:37 -07:00
Jeff Sharkey
5545f56f75 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
2013-09-21 14:07:16 -07:00
Wink Saville
56065891ab 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
2013-09-21 11:52:42 -07:00
Wink Saville
5322112004 am ab8cabf1: am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit 'ab8cabf1d3e5d5fd1fff17816fbc4ab19e8f1a8e':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 11:33:53 -07:00
Wink Saville
ab8cabf1d3 am 1e4f4618: Do not always call setIsConnectedToProvisioningNetwork(false)
* commit '1e4f461839ebd3c9d3dc62232c2eac7d8cbdc467':
  Do not always call setIsConnectedToProvisioningNetwork(false)
2013-09-21 11:30:33 -07:00
Svetoslav
a4f6409c97 Page ranges not correct in come cases.
1. The algorithm that determines whether a page range contains
   another one had a bug and in some cases misbehaved.

2. When print is pressed we do a final layout and if nothing
   changes and we have the requeted pages we skip the final
   write. However, in this case we did not update the print
   job with the pages to be printed but we have to since in
   the previous write we did not ask for all selected pages,
   rather for the first one to be shown as a preview. Now if
   we have all pages and nothing changed we update the print
   job pages.

bug:10530142

Change-Id: I10fb62ae5ae07b8e54d547fd4dca555a12451bc5
2013-09-21 11:25:36 -07:00
Wink Saville
1e4f461839 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
2013-09-21 09:01:19 -07:00
Jim Miller
f4db8f9973 Fit and finish for navbar camera affordance
- disable search gadget while interacting with camera
- clean up code that deals with warping to track both warp and swap views.
- fade camera and search icon when camera touched
- slide camera view on screen when camera is touched.
- fix fling of camera page to center in view when animation finishes.
- resolve stateful bug between edge swipe and camera button.

Bug 10332383

Change-Id: I8fc38148a01927bc7c228101308c3c4214113047
2013-09-20 20:50:00 -07:00
Jonathan Dixon
6c025eaf29 Merge "WebView: add an API method to control web contents debugging" into klp-dev 2013-09-21 03:41:33 +00:00
Svetoslav Ganov
678e907e09 Merge "Update android.print.PrintAttributes documentation" into klp-dev 2013-09-21 02:39:59 +00:00
David Friedman
ad5339274c 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:
2013-09-20 19:11:45 -07:00
David Friedman
224234461c 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:
2013-09-20 19:09:17 -07:00
David Friedman
217683d95d 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:
2013-09-20 19:05:55 -07:00
David Friedman
e12437284f Merge "Fixed typo: Added missing word. Bug 10617080 Fixed typo:" into jb-mr2-docs 2013-09-21 02:02:45 +00:00
Igor Murashkin
6bbf9dc5ae 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
2013-09-20 19:00:50 -07:00
Dianne Hackborn
88b6e69bc7 Merge "Fix issue #10863270: procstats UI is showing all green" into klp-dev 2013-09-21 01:52:04 +00:00
Dianne Hackborn
2610b7cb2a 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
2013-09-20 18:51:03 -07:00
David Friedman
5f1755961b Fixed typo: Added missing word.
Bug 10617080
Fixed typo:

"Determine if AccountManager for You"
-->
"Determine if AccountManager is for You"

Change-Id: I5b8f1368dad72bbbeb581132f480baf46a029be8
2013-09-20 18:33:30 -07:00
Dianne Hackborn
bb6fd7ff8c Merge "Shut. Up." into klp-dev 2013-09-21 01:25:18 +00:00
Dianne Hackborn
90d51b1abe Merge "Fix issue #10807048: Groupon: The application crash when user rotates..." into klp-dev 2013-09-21 01:21:26 +00:00
Dianne Hackborn
c30d92e224 Shut. Up.
Change-Id: Id047ab2308903a527bebf80bdacdb01ec51de051
2013-09-20 18:19:00 -07:00
Svetoslav
b39ce63d28 Merge "Offer to enable a print service after it is installed." into klp-dev 2013-09-21 01:15:47 +00:00
Dianne Hackborn
e784d1e4cf 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
2013-09-20 18:13:52 -07:00
Ken Sumrall
fefefbb175 Upload fsck logs to the dropbox when error found
If fsck made changes to the filesystem, then upload
the logs to the dropbox.  We can then get them into
Android Problem Reports.

Bug: 10021342

Change-Id: I202d2b2ba4060a2f379ca78f1b3f2c7a3f5796e0
2013-09-20 17:48:15 -07:00
Svetoslav
d8f391b4e0 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
2013-09-20 17:40:25 -07:00
Chris Craik
d8a84a8609 Merge "Correct bitmap merging logic" into klp-dev 2013-09-21 00:33:36 +00:00
Chris Craik
996fe65634 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
2013-09-20 17:25:31 -07:00
Raph Levien
7c1b10872f Merge "Fix for "Can't place cursor after combining accent"" into klp-dev 2013-09-20 23:27:57 +00:00
Igor Murashkin
ab98a0b116 Merge "camera2: Add more camera device states, make #openCamera async." into klp-dev 2013-09-20 23:21:51 +00:00
destradaa
47d620ac28 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 2013-09-20 23:18:15 +00:00
Adam Lesinski
d473ebb7c4 Merge "Surfaces ParcelFileDescriptor#parseMode() as API" into klp-dev 2013-09-20 22:59:12 +00:00
Jeff Sharkey
dfed244876 Merge "Delegate mkdirs() to vold when lacking perms." into klp-dev 2013-09-20 22:56:07 +00:00
Glenn Kasten
543de8746e Merge "Revert "Workaround for slow AudioRecord destructor"" into klp-dev 2013-09-20 22:38:19 +00:00
Robert Greenwalt
13820af302 Fix BatchScan request coalesing
bug:10407896
Change-Id: Ic22c7d8b2a80d490d208570782a12e42d4690f5c
2013-09-20 15:30:17 -07:00
Raph Levien
373b7a8d4e 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
2013-09-20 15:21:47 -07:00