115358 Commits

Author SHA1 Message Date
Deepanshu Gupta
78cfdf31b7 Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005
2013-11-13 18:15:51 +05:30
Jeff Brown
e7ae644522 Finalize assets for screen casting.
Extend wifi display connection timeout.

Show a notification while connecting to wifi display.

Ensure that remote display providers are really trusted before
connecting to them.

Bug: 11257292
Change-Id: Iad0caaa30d7946df818bc75ade071f2e377f8a53
2013-11-13 02:17:53 -08:00
Jean Chalard
f86e81c4ff [DO NOT MERGE] Improve documentation for InputType and EditorInfo.
Bug: 11245912
Change-Id: If00bb540f25b176da803af0e02fc1ce1b46537e1
2013-11-13 15:29:16 +09:00
Jean Chalard
d952ac4c17 am 218ecd43: Fix the docs build
* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build
2013-11-12 22:27:47 -08:00
Jean Chalard
218ecd4394 Fix the docs build
Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505
2013-11-13 15:20:58 +09:00
Jean Chalard
383ef79d14 am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.
2013-11-12 21:22:03 -08:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
Dirk Dougherty
0deaa273bd am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs
* commit 'ee8f2a647eb08ab39d6f622cef3cdad20d79463a':
  Doc change: Update Play for Edu docs for full launch.
2013-11-13 04:45:12 +00:00
Dirk Dougherty
ee8f2a647e Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs 2013-11-13 04:25:53 +00:00
Dirk Dougherty
4dfd8b48ff Doc change: Update Play for Edu docs for full launch.
Change-Id: I50a1bfa6087383a5e7a10051e9a73ada96980297
2013-11-12 20:07:07 -08:00
The Android Automerger
b9480186c9 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 20:00:43 -08:00
Jim Miller
c816b8eedb Enable fast camera transition when launched from navbar
This reduces the camera transition timeout to 0 if launched
from the navigation bar.  The transition cannot be aborted once
launched.

Change-Id: I7c376fbb90fd51cd301ef49fbd3411370bc2e4b5
2013-11-12 19:52:12 -08:00
Daniel Sandler
5c6a781eaf DessertCase fixes:
- No more crashing on first launch of the easter egg
- Use IMMERSIVE_STICKY to avoid getting stuck with bars

Bug: 11319125
Change-Id: I4522feb36c29be8446715ba67d454a2012d181ca
2013-11-12 22:32:03 -05:00
Scott Main
bb14698164 am 29610421: Merge "Revised some text while reading up on traceview. this is what\'s left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs
* commit '29610421a32501661d6c20136c76ec426d6500fb':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f
2013-11-13 02:53:40 +00:00
Scott Main
29610421a3 Merge "Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f" into klp-docs 2013-11-13 02:50:50 +00:00
Scott Main
c468240c1a Revised some text while reading up on traceview.
this is what's left of this older CL that was left for dead:
I5528b476d8110df51d45aaf690d878f72bc75c9f

Change-Id: I42f784d693c0a2a2e2e8ed4c582cbc10180191e7
2013-11-12 18:49:21 -08:00
Jim Miller
aa89847f4e Reduce camera launch time by about 250ms.
This reduces the amount of time available to the user to cancel
launching the camera in order to improve average launch time.

It also increases the threshhold for flings and motions to prevent
unintentional launches which are costly in terms of falsing.

Fixes bug b/11657355

Change-Id: I852abbe3ce8ddddcb65f3a48a2f8111d20126189
2013-11-12 18:14:26 -08:00
Daniel Sandler
b65da9e720 Bespoke, handcrafted, artisanal assist affordance assets.
Bug: 11243771
Change-Id: I6eb320ca78ccafc435259d30df95582aa7e3c53c
2013-11-12 20:54:31 -05:00
Daniel Sandler
29787f6ed9 Switch DeadZone to Slog.
Should help us identify stray clicks further back in time
thanks to the longer system log buffer.

Bug: 11273982
Change-Id: Ie2bf445622afff3dbc903adad6c0497954fa5fe0
2013-11-12 20:33:34 -05:00
The Android Automerger
56dd9f0a10 merge in klp-mr1-release history after reset to klp-dev 2013-11-12 17:24:36 -08:00
Adam Powell
086370c971 am 2229ca03: Fix an action bar accessibility regression
* commit '2229ca031a326491feea5832e5337e9f8a602dca':
  Fix an action bar accessibility regression
2013-11-12 17:05:56 -08:00
Adam Powell
2229ca031a Fix an action bar accessibility regression
A previous fix introduced a problem with building content descriptions
for accessibility of the home/up button in one code path while setting
display options flags. Correct the issue and also refresh content
descriptions immediately when setting related attributes one at a
time.

Bug 11542264

Change-Id: I40d07036d1026e8e40c77c47ac377c82edd827b4
2013-11-12 16:23:29 -08:00
Svetoslav
57b296f5a9 Update the PrintDocumentAdapter docs.
This change adds some clarification when a cancellation will be
requested during a layout or write. It also clarifies from which
thread the layout and write callbacks can be invoked.

Change-Id: Id20ff04c6fca8315849ed4a6c329da1b12bb6836
2013-11-12 16:21:00 -08:00
Craig Mautner
679ba4e86e am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev
* commit '6cd206b2aa0039c215fc0a4cc487471c4b3f1496':
  Relayout windows that handle their own config change.
2013-11-12 15:58:28 -08:00
Dirk Dougherty
b0d1d3fcda am 2a91ecb1: Doc change: More updates to the design guidelines.
* commit '2a91ecb12982799001278752fc56464f9ececc60':
  Doc change: More updates to the design guidelines.
2013-11-12 23:57:28 +00:00
Craig Mautner
6cd206b2aa Merge "Relayout windows that handle their own config change." into klp-dev 2013-11-12 23:56:21 +00:00
Dirk Dougherty
2a91ecb129 Doc change: More updates to the design guidelines.
Change-Id: Ia21cc7bfc97e7347f4dfa5d9d25d87c4be70be9d
2013-11-12 23:50:50 +00:00
Vinit Deshapnde
4038724a53 Get rid of a race in NsdService in stopResolveService and getAddrInfo
Both requests are made using same id; and there is a chance that
stopResolve() is not fully completed when getAddrInfo() is issued. That
results getAddrInfo() failure, because both are using same requestId.

This change fixes this problem by creating a new unique id to call
getAddrInfo() with.

Bug: 11597153
Change-Id: I56bd78740e8a40bd31c52705dc797486aff53a50
2013-11-12 15:36:37 -08:00
Amith Yamasani
f174b51626 am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev
* commit '48dab493b927f4a71687ccd557084ccee195de73':
  Fix inconsistency in reporting device admin active state.
2013-11-12 14:51:06 -08:00
Amith Yamasani
48dab493b9 Merge "Fix inconsistency in reporting device admin active state." into klp-dev 2013-11-12 22:47:55 +00:00
Craig Mautner
5d9f547720 Relayout windows that handle their own config change.
If a window claims to handle its own configuration change then we
won't destroy and recreate its window on a configuration change.
Normally that recreation triggers the first layout following
orientation change because mHaveFrame is false. Windows that handle
their own configuration changes never got a relayout pass following a
change in orientation.

This change passes the configuration changes that an application
handles into the AppWindowToken. If the app says it handles
orientation or screen size changes then a relayout will occur when the
configuration has changed.

Fixes bug 11647107.

Change-Id: Ie8d49fd050442ebbdcf0b805087894e3a2fc4be9
2013-11-12 14:02:52 -08:00
Christopher Tate
087044c902 Support preferred activities with zero or one scheme in the filter
Also use the existing full PreferredActivity match machinery instead
of the existing direct comparison now that the intent filters can
be more flexible.

Bug 11482259

Change-Id: Icb649ca60ecfbdb9ee3c256ee512d3f3f989e05f
2013-11-12 12:23:10 -08:00
Adam Koch
c6a6539c27 am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs
* commit 'e95c167c98157c3b91847a969980c1f293eb1e3f':
  Bitmapfun Sample: Minor updates/fixes.
2013-11-12 19:53:17 +00:00
Adam Koch
e95c167c98 Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs 2013-11-12 19:47:46 +00:00
Scott Main
fe326adc6a am 45d93219: fix typo in caption and XML spacing
* commit '45d9321963a51470dc1aadf6ec9193cb881eed06':
  fix typo in caption and XML spacing
2013-11-12 19:33:43 +00:00
Craig Mautner
449b32e844 am c641de01: Merge "Add event logging for tasks and stacks." into klp-dev
* commit 'c641de017ae0b15bbc13f43fd14fca6b1523ec02':
  Add event logging for tasks and stacks.
2013-11-12 11:20:19 -08:00
Craig Mautner
c641de017a Merge "Add event logging for tasks and stacks." into klp-dev 2013-11-12 19:15:23 +00:00
Fabrice Di Meglio
db976ea0fc am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev
* commit '3f183a234bef643080d4f9dce44bcaa68e5d4694':
  Fix bug #11586041 Regression: text truncation in Clock
2013-11-12 11:06:47 -08:00
Fabrice Di Meglio
3f183a234b Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev 2013-11-12 19:03:48 +00:00
Scott Main
45d9321963 fix typo in caption and XML spacing
Change-Id: I28adb9e6b5fb96f9f25a62766a197bb0a06bfdd0
2013-11-12 10:54:53 -08:00
Glenn Kasten
adfbc5b255 am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev
* commit '8a0d133cd7a7f7a9fb5289198d2be25e021788f5':
  Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)
2013-11-12 10:45:00 -08:00
Glenn Kasten
8a0d133cd7 Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev 2013-11-12 18:40:42 +00:00
Eino-Ville Talvala
ed676b2197 am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev
* commit '4d12d8bef6d04c16fc18f10437ffc49bcdfabf9b':
  Camera2: Add support for partial result metadata quirk
2013-11-12 10:29:18 -08:00
Eino-Ville Talvala
4d12d8bef6 Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 2013-11-12 18:27:06 +00:00
Craig Mautner
2c2549c5f4 Add event logging for tasks and stacks.
Also remove crufty write-only DisplayContent.mStackHistory.

Change-Id: I62b2b53dc02377c5d0d3b79df70b1990eed87d23
2013-11-12 09:57:00 -08:00
Scott Main
7774d8e723 am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
* commit '44895333dad66be0ab5350b039d828f3da2a1b73':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630
2013-11-12 17:56:03 +00:00
Scott Main
44895333da clarify that ANDROID_ID is unique for each user in multi-user environment.
bug: 8073630

Change-Id: Iff18e892a1e0422a85edd83f97ba4285f2171f74
2013-11-12 09:23:13 -08:00
John Spurlock
41f6464b3f Ensure wallpaper hint is at least as large as the display.
Bug:11332853
Bug:11606952
Change-Id: I1840d7b723015c379da8eab7e22aa478d56adeb3
2013-11-12 10:28:14 -05:00
Jeff Brown
854395add8 am c481a634: Merge "UI tweaks." into klp-dev
* commit 'c481a634f4db6e95bc03b22b72414ba12da99f4b':
  UI tweaks.
2013-11-11 22:01:22 -08:00
Jeff Brown
c481a634f4 Merge "UI tweaks." into klp-dev 2013-11-12 05:57:48 +00:00