110497 Commits

Author SHA1 Message Date
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
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
Romain Guy
b15b446f42 Take text alignment into account to compue text bounds
Bug #10258621

Change-Id: I91abf1829a1814410ce8c0c2c17d888031987f18
2013-08-12 13:25:29 -07:00
Chet Haase
54276ad3da am cd89feb9: Merge "pause/resume for Animators" into klp-dev
* commit 'cd89feb9d14d6ed5d832d563a754048ab79134e2':
  pause/resume for Animators
2013-08-12 13:01:19 -07:00
Chet Haase
cd89feb9d1 Merge "pause/resume for Animators" into klp-dev 2013-08-12 19:57:23 +00:00
Craig Mautner
afa1231e75 am b6da9115: Merge "Remove incorrect warning." into klp-dev
* commit 'b6da9115eee23eef8cbe278dff886fef53e20e62':
  Remove incorrect warning.
2013-08-12 12:48:24 -07:00
Craig Mautner
b6da9115ee Merge "Remove incorrect warning." into klp-dev 2013-08-12 19:43:25 +00:00
Craig Mautner
61574705d3 Remove incorrect warning.
The warning about an ActivityRecord not being assigned a task was
incorrect in the location modified by this fix. In this case an
existing ActivityRecord is relaunched so it is not necessary to
assign the task to the passed ActivityRecord.

Addresses the warning associated with bug 10181389.

Change-Id: I76d5066c320bf9da2663bc34bcaca801ad4953bc
2013-08-12 12:29:40 -07:00
Katie McCormick
dfa36da5ca am 076d3787: am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '076d378760a2575a6836dc12642c52b79048b638':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:28:32 -07:00
Katie McCormick
076d378760 am 6441b9bd: am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit '6441b9bd19c9226ad1e6c01008b79a51baf75cff':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:25:41 -07:00
Katie McCormick
6441b9bd19 am e5007896: am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit 'e50078961ab0134ff5bcf57a9e8cc4b04027f942':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:21:47 -07:00
Katie McCormick
e50078961a am e78b4f53: Doc change: collapse key fix... clean version of kmccormick\'s change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
* commit 'e78b4f53392d25eda4a121670aca518df9615f71':
  Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:18:45 -07:00
Katie McCormick
e78b4f5339 Doc change: collapse key fix... clean version of kmccormick's change from I620150b14ecd59db05f40c4422f8e2d09e05ebcb
Change-Id: I620150b14ecd59db05f40c4422f8e2d09e05ebcb
2013-08-12 12:07:26 -07:00
Chet Haase
8aa1ffb0ed pause/resume for Animators
It is now possible to pause Animator-based animations. Pausing an
animator causes it to hold the current time/value indefinitely, or
until end/cancel/resume is called. When resume() is called, it continues
from where it left off.

There is a new listener interface on Animator, AnimatorPauseListener,
which can be used to listen to pause/resume events.

Change-Id: I77d1535e792fb7bf349f549a0ac0a0d85958cb47
2013-08-12 11:51:32 -07:00
Selim Gurun
ff1b3f0789 am 1232c51e: Merge "Add the API to support webview printing" into klp-dev
* commit '1232c51eed998bec13787d75204303502f9e195f':
  Add the API to support webview printing
2013-08-12 11:33:13 -07:00
Selim Gurun
1232c51eed Merge "Add the API to support webview printing" into klp-dev 2013-08-12 18:27:38 +00:00
Romain Guy
98e50c50f5 am 964f2b30: Merge "Update Bitmap.createBitmap() documentation" into klp-dev
* commit '964f2b3028d0107a9cb6ac25e1e5b3abd8344868':
  Update Bitmap.createBitmap() documentation
2013-08-12 11:17:52 -07:00
Romain Guy
964f2b3028 Merge "Update Bitmap.createBitmap() documentation" into klp-dev 2013-08-12 18:11:36 +00:00