110924 Commits

Author SHA1 Message Date
Kenny Root
1adbf6b900 am 61768c97: am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '61768c97d6e066d633afe61a790a24473f59572c':
  Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 11:44:05 -07:00
Kenny Root
61768c97d6 am 3870c570: Use hostname verifier directly instead of instance DO NOT MERGE
* commit '3870c570bbd438cefd09a061b9481314a15dd659':
  Use hostname verifier directly instead of instance DO NOT MERGE
2013-08-13 11:41:11 -07:00
Scott Main
9b97944858 am 261e00cb: am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit '261e00cb046db01b2bae9342f34ff99e99ada368':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 11:00:49 -07:00
Kenny Root
3870c570bb Use hostname verifier directly instead of instance DO NOT MERGE
Instead of local instance of the default HostnameVerifier, use it
directly from HttpsURLConnection. This avoids class preloading creating
an instance of it before it's necessary.

(cherry picked from commit 928ee1e48fa89302d02fdf8a8a2c7315d7195e7c)

Bug: 9984058
Change-Id: I79d8a934bfc390e4cd503fd592e21bc4e5446a7d
2013-08-13 11:00:10 -07:00
Scott Main
261e00cb04 am b478b10f: Revert "Doc change: collapse key fix." To resolve conflict. I\'ll fix it all later.
* commit 'b478b10f34a9fa9c6b42f54047eb9e77111a16c7':
  Revert "Doc change: collapse key fix." To resolve conflict. I'll fix it all later.
2013-08-13 10:57:31 -07:00
Romain Guy
820726d7c6 am 9955699d: Merge "Camera.applyToCanvas() now works with hardware canvases" into klp-dev
* commit '9955699d30eaab964549b8173fe9a52dca782877':
  Camera.applyToCanvas() now works with hardware canvases
2013-08-13 10:50:26 -07:00
Romain Guy
9955699d30 Merge "Camera.applyToCanvas() now works with hardware canvases" into klp-dev 2013-08-13 17:46:19 +00:00
Romain Guy
7fbbc3c9c3 Camera.applyToCanvas() now works with hardware canvases
Change-Id: I7f06b2a74ccc1941d51e12a0417028e094c1b669
2013-08-13 10:37:25 -07:00
John Spurlock
5d2268ad8d am e932e30e: Distinguish transient + transparent bar styles.
* commit 'e932e30eadb5978591316ffe3d21d60604c0cd91':
  Distinguish transient + transparent bar styles.
2013-08-13 10:34:49 -07:00
Lajos Molnar
80c4437ebf MediaCodecInfo.java: Added isFeatureSupported method to CodecCapabilities
Added isFeatureSupported method to CodecCapabilities, so that applications
can query whether codecs support various features.  For now
added one video-decoder feature:

FEATURE_AdaptivePlayback

Media playback applications can query it to see if the codec
supports seamless resolution changes during decoding.

Change-Id: I56b2cf1429f39f9b9e0243a990c95e7a64dd7ff7
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug: 7093648
2013-08-13 10:30:22 -07:00
John Spurlock
e932e30ead Distinguish transient + transparent bar styles.
Transient bars = 30% black scrim per spec (formerly view alpha).
Transparent nav bar = Simple gradient drawable from 50% to 0% black.
Transparent status bar = Fully transparent.

Smoother transitions between bar modes will be tricky due to
coordination with window manager, and thus deferred to a separate
future change.

Pre-baked assets instead of the gradient drawable will also be
part of a separate future change, this change is simply meant to
move closer to the final look and feel to minimize confusion for
those kicking the tires on the new flags.

Bug:10012887
Change-Id: I8c35a660187903224a6bfe604b5313e9115c4a73
2013-08-13 13:29:43 -04:00
John Spurlock
8fb569e86c am 34e13d90: Update transient navigation confirmation logic.
* commit '34e13d90eda9bfda7a70998d190a95c88aa3d3d1':
  Update transient navigation confirmation logic.
2013-08-13 10:24:24 -07:00
John Spurlock
34e13d90ed Update transient navigation confirmation logic.
Show the confirmation toast when hiding the transient
navigation bar only the first time per app, per reboot.

Hitting the power key while the transient nav is hidden
is taken as a signal of possible user confusion, so reshow
the prompt the next time.

This requires the confirmation prompt to live in policy
(not sysui).  It arguably should have been here in the first
place, since the transient bar state/policy was here, and
sysui should not have not been able to fail to display
the prompt correctly.

Also take this opportunity to remove a hack wrt positioning
the confirmation properly while the nav bar is transitioning.
Toasts now support LAYOUT_HIDE_NAVIGATION if applied to the
toast's view.

Bug: 10246225
Change-Id: Ieb6355e4ca975c0758918a39e3c2ec13da81c7f4
2013-08-13 13:18:14 -04:00
Craig Mautner
31678b52e4 Fix Configuration layout direction comparison.
If the Configuration layout direction is not changing don't indicate
that it has changed. When the indication is made incorrectly it
causes the window manager to believe that the configuration has
changed and it will start freezing the screen and setting up
animations. Bad jank is the result.

In Configuration.updateFrom() anytime that the screenLayouts were
different the code was setting ActivityInfo.CONFIG_LAYOUT_DIRECTION
in the return bitmask. Even if the only difference was between
UNDEFINED fields. This fix makes sure that the layout direction
field has actually changed before setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask.

In Configuration.diff() if the passed Configuration had
SCREENLAYOUT_LAYOUTDIR_UNDEFINED the code was setting
ActivityInfo.CONFIG_LAYOUT_DIRECTION in the return bitmask. This fix
makes sure that if the passed Configuration has fields set to
SCREENLAYOUT_*_UNDEFINED then corresponding bits will no longer be set
in the returned bitmask.

Fixes bug 10291622.
Fixes bug 10247094.

Change-Id: If26de662206fe85dc4671adbae39dfb99dc1038c
2013-08-13 09:23:13 -07:00
The Android Automerger
f1846ee1a4 merge in klp-release history after reset to klp-dev 2013-08-13 06:02:22 -07:00
Baligh Uddin
61c9706bac am 43e56c4a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '43e56c4a911c8d192b3e8cc1c6de664e8755cb73':
  Import translations. DO NOT MERGE
2013-08-13 00:33:35 -07:00
Baligh Uddin
dc5f592c03 am 78f5ef71: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
* commit '78f5ef7143bb00c49e181197445ff20c2c5076f6':
  Import translations. DO NOT MERGE
2013-08-13 00:30:01 -07:00
Baligh Uddin
43e56c4a91 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-13 07:29:07 +00:00
Baligh Uddin
78f5ef7143 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-08-13 07:25:29 +00:00
Svetoslav Ganov
51843f8aa9 am 371c46fe: Merge "Remove exceptions from the printer discovery session APIs." into klp-dev
* commit '371c46fe29ed4c1b700cc40d49cc50f0cb70ebfa':
  Remove exceptions from the printer discovery session APIs.
2013-08-12 22:35:59 -07:00
Svetoslav Ganov
371c46fe29 Merge "Remove exceptions from the printer discovery session APIs." into klp-dev 2013-08-13 05:31:24 +00:00
Svetoslav Ganov
18d9c3cc6c Remove exceptions from the printer discovery session APIs.
It is not possible for a client to check whether the session is not
closed and add/update/remove printers atomically. It is always possible
that in between the two method calls the session is closed. Therefore,
we cannot enforce the exceptions.

Change-Id: If0e89e4429c4c360515da8f4bbe0ea3781e8e8fd
2013-08-12 22:22:49 -07:00
Jeff Sharkey
02e4d16ed9 Add GIDs to packages.list, update SD card perms.
Write supplementary GIDs to packages.list for lower-level system
components to parse.

WRITE_EXTERNAL_STORAGE also implies sdcard_r GID. Switch to always
enforce READ_EXTERNAL_STORAGE permission. Update permission docs to
mention new behavior.

Change-Id: I316ba4b21beebb387ac05c80980ae9b38235b37d
2013-08-12 20:31:36 -07:00
Jose Lima
0d27bc2946 am 56e0d6b8: Merge "Allow configuration of Toast gravity settings" into klp-dev
* commit '56e0d6b86cd46095afae00781eb59c7ed5a7eab6':
  Allow configuration of Toast gravity settings
2013-08-12 19:27:47 -07:00
Jose Lima
56e0d6b86c Merge "Allow configuration of Toast gravity settings" into klp-dev 2013-08-13 02:24:35 +00:00
David Christie
8810a0c3c2 am 69b9eff1: Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network providers." into
* commit '69b9eff155254f1c274b8adbbf5501ddec4da089':
  Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means.  Quick settings will no longeer explicitly enable/disable gps and network providers.
2013-08-12 18:47:21 -07:00
Kristian Monsen
c319ddd9ec am 4c737496: Merge "Change the exception msg" into klp-dev
* commit '4c737496142085a7354e6aa663c09b5dd5a83633':
  Change the exception msg
2013-08-12 18:47:19 -07:00
David Christie
69b9eff155 Merge "Update Quick Settings to use new consolidated master location method. This is an effort to consolidate the logic of what the "master location switch" means. Quick settings will no longeer explicitly enable/disable gps and network providers." into klp-dev 2013-08-13 01:44:42 +00:00
Kristian Monsen
4c73749614 Merge "Change the exception msg" into klp-dev 2013-08-13 01:35:29 +00:00
Selim Gurun
1eb8b726d3 Change the exception msg
Change the exception msg to better identify the webview version.

Change-Id: I64c9a433144f9aa0362ad6c9217da92acbb655bc
2013-08-12 18:29:33 -07:00
Vinit Deshapnde
f76c1685a5 am 049cbd64: Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev
* commit '049cbd64a21b85fd2cd975302b389d4b1579e2eb':
  Fix a bug in single socket connection to Wifi Supplicant
2013-08-12 18:11:34 -07:00
keunyoung
72d29c2d0d am ddbfdfa5: Merge "fix race condition when a new display is added" into klp-dev
* commit 'ddbfdfa530a02e75402ff9c570c4420b94811b8e':
  fix race condition when a new display is added
2013-08-12 18:11:31 -07:00
Michael Wright
aad6212810 am 51b4a40e: Merge "Expose vendor and product IDs for InputDevices" into klp-dev
* commit '51b4a40ef505962becb450f9f1b3170b11082dcb':
  Expose vendor and product IDs for InputDevices
2013-08-12 18:11:28 -07:00
Vinit Deshapnde
049cbd64a2 Merge "Fix a bug in single socket connection to Wifi Supplicant" into klp-dev 2013-08-13 00:11:25 +00:00
keunyoung
ddbfdfa530 Merge "fix race condition when a new display is added" into klp-dev 2013-08-13 00:08:15 +00:00
Michael Wright
51b4a40ef5 Merge "Expose vendor and product IDs for InputDevices" into klp-dev 2013-08-13 00:04:08 +00:00
Michael Wright
54e56946d1 Expose vendor and product IDs for InputDevices
Change-Id: I08665a41e474cbedd10b342eeae20d2ca7c03ac0
2013-08-12 16:39:59 -07:00
keunyoung
1eb0637f2a fix race condition when a new display is added
- When a new display is added, display add event triggers handleDisplayAddedLocked in
  WindowManagerService asynchronously.
- After creating virtual display, application can move on and call addWindow before
  handleDisplayAddedLock is called.
- Application's addWindow leads into creating a new DisplayContent, and a window will be added there.
- But when handleDisplayAddedLocked is called later, it will create a new DisplayContent for the
  display, and the window added by the application will be lost.
- This CL tries to fix the issue by checking the presence of DisplayContent before creating a new
  one.

bug: 9975297

Change-Id: I9fac7ffb57c3e1effa8f0e950539cfae73e7e1c6
2013-08-12 16:21:14 -07:00
Victoria Lease
4b982e4975 am ebec4b6e: Merge "fix kBW_Format glyphs" into klp-dev
* commit 'ebec4b6e381b9035a37e7fccc88be564a90bd4ec':
  fix kBW_Format glyphs
2013-08-12 15:56:06 -07:00
Vinit Deshapnde
4b2766a3d8 Fix a bug in single socket connection to Wifi Supplicant
My change to post messages without IFACE=<iface> prefix to all interfaces
was correct; but messages sent with IFACE=p2p-p2p0-0 et al were being sent
to p2p monitor only. This change mimics that to resolve some issues
introduced by the single socket change.

Bug: 10257602
Change-Id: Ia6164cb3cfd11c2a0a7b011eceaeabfd9677f62c
2013-08-12 15:54:01 -07:00
Victoria Lease
ebec4b6e38 Merge "fix kBW_Format glyphs" into klp-dev 2013-08-12 22:39:26 +00:00
Victoria Lease
723b2feb92 fix kBW_Format glyphs
Oops! kBW_Format was omitted from a couple of switch statements,
resulting in glyphs in that format being invisible.

Bug: 10206452
Change-Id: Ib2aa52250aeeecc0de1b1b78e3d0f568f368c73e
2013-08-12 15:12:49 -07:00
Romain Guy
76bf4d6dbe am d1f6b624: Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev
* commit 'd1f6b6245c546f95a44d0252544ea9e2028a33b4':
  Take text alignment into account to compue text bounds Bug #10258621
2013-08-12 14:26:56 -07:00
Alan Viverette
1e68ffc72f am 890db42b: Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev
* commit '890db42b0d4873bf3a19cd784bb7497db2add22e':
  Not create context menu when mouse right click outside list/grid items
2013-08-12 14:26:52 -07:00
Svetoslav
beb7b44962 am b9b1701d: Merge "Make PrintFileDocumentAdapter non-final." into klp-dev
* commit 'b9b1701dca28ab70ad94ed9e0e6a0dc3913135cb':
  Make PrintFileDocumentAdapter non-final.
2013-08-12 14:26:46 -07:00
Romain Guy
d1f6b6245c Merge "Take text alignment into account to compue text bounds Bug #10258621" into klp-dev 2013-08-12 20:52:13 +00:00
Alan Viverette
890db42b0d Merge "Not create context menu when mouse right click outside list/grid items" into klp-dev 2013-08-12 20:47:39 +00:00
Svetoslav
b9b1701dca Merge "Make PrintFileDocumentAdapter non-final." into klp-dev 2013-08-12 20:34:12 +00:00
Svetoslav
9abf735387 Make PrintFileDocumentAdapter non-final.
Change-Id: I89a46bf766f5270dfaba7482b7b7cd997e19821a
2013-08-12 13:32:52 -07:00
Alan Viverette
b339cc5bcb Not create context menu when mouse right click outside list/grid items
Even if mouse right click outside of list/grid items, a context menu
is made. But there is no item of the list, so a context menu info is
null. Then, NullPointerException happens at onCreateContextMenu()
using a context menu info.
For fixing the problem, check mTouchMoude and mMotionPosition to
distingusih where is clicked, on a list item or not, before
performButtonActionOnTouchDown() which makes a context menu.

Manually merged from AOSP contribution.

Change-Id: I778be73df36abbfd4ba9534d8e7a1ece6844ed40
Author: henrik baard <henrik.baard@sonymobile.com>
2013-08-12 13:29:15 -07:00