OSDN Git Service

android-x86/frameworks-base.git
10 years agoam 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
Svetoslav [Wed, 13 Nov 2013 21:38:21 +0000 (13:38 -0800)]
am 60020252: am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev

* commit '60020252db88825b0c0951de7fef6f07d68786a9':
  Update the PrintDocumentAdapter docs.

10 years agoam 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev
Svetoslav [Wed, 13 Nov 2013 21:34:00 +0000 (13:34 -0800)]
am 14f30080: Merge "Update the PrintDocumentAdapter docs." into klp-dev

* commit '14f300803b7d16a3c9632cb626529e873e4813f1':
  Update the PrintDocumentAdapter docs.

10 years agoMerge "Update the PrintDocumentAdapter docs." into klp-dev
Svetoslav [Wed, 13 Nov 2013 21:30:57 +0000 (21:30 +0000)]
Merge "Update the PrintDocumentAdapter docs." into klp-dev

10 years agoam 026d0684: am 90b7f631: Doc change: fix typo.
Dirk Dougherty [Wed, 13 Nov 2013 21:18:55 +0000 (13:18 -0800)]
am 026d0684: am 90b7f631: Doc change: fix typo.

* commit '026d06847b535da75626211bae400729deb80f9b':
  Doc change: fix typo.

10 years agoam 90b7f631: Doc change: fix typo.
Dirk Dougherty [Wed, 13 Nov 2013 21:15:42 +0000 (21:15 +0000)]
am 90b7f631: Doc change: fix typo.

* commit '90b7f6311849fb68d2bc5fa0affb86c7e5d3a3b0':
  Doc change: fix typo.

10 years agoam 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 13 Nov 2013 21:11:53 +0000 (13:11 -0800)]
am 814b0b73: (-s ours) am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '814b0b734772bfdbaa6b1888a253afc00c78bb58':
  Import translations. DO NOT MERGE

10 years agoam 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT...
Baligh Uddin [Wed, 13 Nov 2013 21:11:50 +0000 (13:11 -0800)]
am 4a0e3b9a: (-s ours) am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '4a0e3b9ac5cb9006a3efe951fcd7f7427d4726cc':
  Import translations. DO NOT MERGE

10 years agoDoc change: fix typo.
Dirk Dougherty [Wed, 13 Nov 2013 21:08:46 +0000 (13:08 -0800)]
Doc change: fix typo.

Change-Id: I74932b2dff099af1ba2bc048575586fd9e3593a5

10 years agoam 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 21:07:52 +0000 (13:07 -0800)]
am 2a22627e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '2a22627e179cdb767c709dc68d78b4903d9239f9':
  Import translations. DO NOT MERGE

10 years agoam 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 21:07:49 +0000 (13:07 -0800)]
am 5cc3ddf1: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '5cc3ddf16fee6d6aa8439e6ebcb3f3feeec98608':
  Import translations. DO NOT MERGE

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 21:04:25 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoMerge "Import translations. DO NOT MERGE" into klp-dev
Baligh Uddin [Wed, 13 Nov 2013 21:04:06 +0000 (21:04 +0000)]
Merge "Import translations. DO NOT MERGE" into klp-dev

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Nov 2013 20:24:32 +0000 (12:24 -0800)]
Import translations. DO NOT MERGE

Change-Id: I3b40e99b029a65ade59ec8f7ad06c0a143895269
Auto-generated-cl: translation import

10 years agoam e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme...
Christopher Tate [Wed, 13 Nov 2013 20:14:29 +0000 (12:14 -0800)]
am e995ad15: am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

* commit 'e995ad1559ac12a0ac5e2e56ce378b0b29f10f24':
  Support preferred activities with zero or one scheme in the filter

10 years agoam 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance...
Daniel Sandler [Wed, 13 Nov 2013 20:14:25 +0000 (12:14 -0800)]
am 2f4fb5ee: am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev

* commit '2f4fb5eef5ac5c08f7d30c75b56990ce5a729509':
  Bespoke, handcrafted, artisanal assist affordance assets.

10 years agoam 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 20:14:22 +0000 (12:14 -0800)]
am 80ffcb19: am 42498417: Merge "DessertCase fixes:" into klp-dev

* commit '80ffcb194b31839308bbe57c057611fd41cef5e1':
  DessertCase fixes:

10 years agoam 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 20:14:19 +0000 (12:14 -0800)]
am 6150abd8: am f554042a: Merge "Switch DeadZone to Slog." into klp-dev

* commit '6150abd8f9557a923e1e9753d5c35d241cd79411':
  Switch DeadZone to Slog.

10 years agoam 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveServic...
John Huang [Wed, 13 Nov 2013 20:14:16 +0000 (12:14 -0800)]
am 299e011e: am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev

* commit '299e011ebd7ce9593c203ecfc9f5eed45360a5ed':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo

10 years agoam 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filte...
Christopher Tate [Wed, 13 Nov 2013 20:07:22 +0000 (12:07 -0800)]
am 0b2c2b10: Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

* commit '0b2c2b10053afd7a525dbf8a4eb0f0aaf98739b3':
  Support preferred activities with zero or one scheme in the filter

10 years agoam 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into...
Daniel Sandler [Wed, 13 Nov 2013 20:07:20 +0000 (12:07 -0800)]
am 31f7c912: Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev

* commit '31f7c912f0b6a2cfa2ea0f0b3a9022e8323f5542':
  Bespoke, handcrafted, artisanal assist affordance assets.

10 years agoam 42498417: Merge "DessertCase fixes:" into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 20:07:16 +0000 (12:07 -0800)]
am 42498417: Merge "DessertCase fixes:" into klp-dev

* commit '424984172bb2a89dd06cc49fd5a3665bc7c85e5c':
  DessertCase fixes:

10 years agoam f554042a: Merge "Switch DeadZone to Slog." into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 20:07:13 +0000 (12:07 -0800)]
am f554042a: Merge "Switch DeadZone to Slog." into klp-dev

* commit 'f554042a9582c5b4ad1b0d41bc08a0caad470798':
  Switch DeadZone to Slog.

10 years agoam 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddr...
John Huang [Wed, 13 Nov 2013 20:07:10 +0000 (12:07 -0800)]
am 54ca9066: Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev

* commit '54ca906604c2ff0a58274e5d1b66cdba4df8c3d8':
  Get rid of a race in NsdService in stopResolveService and getAddrInfo

10 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Nov 2013 19:54:28 +0000 (11:54 -0800)]
Import translations. DO NOT MERGE

Change-Id: Id312643b2e858fa84f81b37975a1757ff1773b87
Auto-generated-cl: translation import

10 years agoMerge "Support preferred activities with zero or one scheme in the filter" into klp-dev
Christopher Tate [Wed, 13 Nov 2013 19:33:46 +0000 (19:33 +0000)]
Merge "Support preferred activities with zero or one scheme in the filter" into klp-dev

10 years agoMerge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 19:32:42 +0000 (19:32 +0000)]
Merge "Bespoke, handcrafted, artisanal assist affordance assets." into klp-dev

10 years agoMerge "DessertCase fixes:" into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 19:32:27 +0000 (19:32 +0000)]
Merge "DessertCase fixes:" into klp-dev

10 years agoMerge "Switch DeadZone to Slog." into klp-dev
Daniel Sandler [Wed, 13 Nov 2013 19:32:24 +0000 (19:32 +0000)]
Merge "Switch DeadZone to Slog." into klp-dev

10 years agoMerge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into...
John Huang [Wed, 13 Nov 2013 19:13:59 +0000 (19:13 +0000)]
Merge "Get rid of a race in NsdService in stopResolveService and getAddrInfo" into klp-dev

10 years agoam 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"
Robert Greenwalt [Wed, 13 Nov 2013 18:27:46 +0000 (10:27 -0800)]
am 6eddb39c: am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '6eddb39c857b178672218a345a276c4304e7ad37':
  Fix NPE in ConnectivityService

10 years agoam 18490abd: Merge "Fix NPE in ConnectivityService"
Robert Greenwalt [Wed, 13 Nov 2013 18:25:30 +0000 (10:25 -0800)]
am 18490abd: Merge "Fix NPE in ConnectivityService"

* commit '18490abd9bcb401f0d75a314056fb2a44dd61f07':
  Fix NPE in ConnectivityService

10 years agoMerge "Fix NPE in ConnectivityService"
Robert Greenwalt [Wed, 13 Nov 2013 18:22:26 +0000 (18:22 +0000)]
Merge "Fix NPE in ConnectivityService"

10 years agoam c95bfc4d: am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs
Raphael Moll [Wed, 13 Nov 2013 18:18:37 +0000 (10:18 -0800)]
am c95bfc4d: am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs

* commit 'c95bfc4dc8eb453999dedbb9a437713bd41eacb4':
  Android Studio download for 0.3.2

10 years agoam 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs
Raphael Moll [Wed, 13 Nov 2013 18:13:08 +0000 (18:13 +0000)]
am 7b0d9a50: Merge "Android Studio download for 0.3.2" into klp-docs

* commit '7b0d9a50b4f19dfd89a20b5fd004a014ae8ec02b':
  Android Studio download for 0.3.2

10 years agoMerge "Android Studio download for 0.3.2" into klp-docs
Raphael Moll [Wed, 13 Nov 2013 18:09:19 +0000 (18:09 +0000)]
Merge "Android Studio download for 0.3.2" into klp-docs

10 years agoam a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
Jeff Brown [Wed, 13 Nov 2013 16:58:53 +0000 (08:58 -0800)]
am a20f625c: am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev

* commit 'a20f625cc1006b03d4a2be90ba35d1a9783ad363':
  Finalize assets for screen casting.

10 years agoam 41b92b00: Merge "Finalize assets for screen casting." into klp-dev
Jeff Brown [Wed, 13 Nov 2013 16:54:27 +0000 (08:54 -0800)]
am 41b92b00: Merge "Finalize assets for screen casting." into klp-dev

* commit '41b92b008e03be95db938e0238ccb9373c2aaadc':
  Finalize assets for screen casting.

10 years agoMerge "Finalize assets for screen casting." into klp-dev
Jeff Brown [Wed, 13 Nov 2013 16:51:53 +0000 (16:51 +0000)]
Merge "Finalize assets for screen casting." into klp-dev

10 years agoam 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the...
John Spurlock [Wed, 13 Nov 2013 16:50:07 +0000 (08:50 -0800)]
am 79033da8: am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev

* commit '79033da8e42ba6ccf096bf10dea1e51873f7d402':
  Ensure wallpaper hint is at least as large as the display.

10 years agoam 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into...
John Spurlock [Wed, 13 Nov 2013 16:45:46 +0000 (08:45 -0800)]
am 7d667ee2: Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev

* commit '7d667ee2de2c6add257466d9648024d7e8402926':
  Ensure wallpaper hint is at least as large as the display.

10 years agoam 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT...
Deepanshu Gupta [Wed, 13 Nov 2013 16:43:34 +0000 (08:43 -0800)]
am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE

* commit '6870d29c340008919dcd9e547236b74301b3b9ef':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE

10 years agoMerge "Ensure wallpaper hint is at least as large as the display." into klp-dev
John Spurlock [Wed, 13 Nov 2013 16:41:43 +0000 (16:41 +0000)]
Merge "Ensure wallpaper hint is at least as large as the display." into klp-dev

10 years agoam 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE
Deepanshu Gupta [Wed, 13 Nov 2013 16:40:08 +0000 (08:40 -0800)]
am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE

* commit '78cfdf31b7c48589ea3a148ec1d6d573235bc06b':
  Update changed delegate method in Bitmap_Delegate. DO NOT MERGE

10 years agoUpdate changed delegate method in Bitmap_Delegate. DO NOT MERGE
Deepanshu Gupta [Mon, 11 Nov 2013 14:14:11 +0000 (19:44 +0530)]
Update changed delegate method in Bitmap_Delegate. DO NOT MERGE

Issue: https://code.google.com/p/android/issues/detail?id=60167
Change-Id: I3e1d6b9d52ca899889ba758b0ea91bd742cf5005

10 years agoFinalize assets for screen casting.
Jeff Brown [Wed, 13 Nov 2013 08:45:18 +0000 (00:45 -0800)]
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

10 years agoam d952ac4c: am 218ecd43: Fix the docs build
Jean Chalard [Wed, 13 Nov 2013 06:31:34 +0000 (22:31 -0800)]
am d952ac4c: am 218ecd43: Fix the docs build

* commit 'd952ac4c171780da78a157de73702d60d4737916':
  Fix the docs build

10 years agoam 218ecd43: Fix the docs build
Jean Chalard [Wed, 13 Nov 2013 06:27:47 +0000 (22:27 -0800)]
am 218ecd43: Fix the docs build

* commit '218ecd43946001f07b60757db130ef5585d474d3':
  Fix the docs build

10 years agoFix the docs build
Jean Chalard [Wed, 13 Nov 2013 06:20:38 +0000 (15:20 +0900)]
Fix the docs build

Change-Id: I05f1f39aaa9d72201a7fd06377799246039cd505

10 years agoFix NPE in ConnectivityService
Ken Mixter [Fri, 8 Nov 2013 06:08:24 +0000 (22:08 -0800)]
Fix NPE in ConnectivityService

Could occur when requestRouteToHostAddress is called on a network
with no associated tracker.  Code later in the method handles
this case gracefully but code introduced in JB throws an exception.

Change-Id: I6c8a0e313ecbcca120aeb5dd0802a72114749aa1

10 years agoam 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo...
Jean Chalard [Wed, 13 Nov 2013 05:25:26 +0000 (21:25 -0800)]
am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev

* commit '383ef79d14a64b335d94353e87e824ea2f37ee65':
  Improve documentation for InputType and EditorInfo.

10 years agoam 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
Jean Chalard [Wed, 13 Nov 2013 05:22:03 +0000 (21:22 -0800)]
am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev

* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.

10 years agoMerge "Improve documentation for InputType and EditorInfo." into klp-dev
Jean Chalard [Wed, 13 Nov 2013 05:19:34 +0000 (05:19 +0000)]
Merge "Improve documentation for InputType and EditorInfo." into klp-dev

10 years agoam 0deaa273: am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch...
Dirk Dougherty [Wed, 13 Nov 2013 04:49:36 +0000 (20:49 -0800)]
am 0deaa273: am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs

* commit '0deaa273bdf04396a82ace71d5fbefc2cb8404e6':
  Doc change: Update Play for Edu docs for full launch.

10 years agoam ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp...
Dirk Dougherty [Wed, 13 Nov 2013 04:45:12 +0000 (04:45 +0000)]
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.

10 years agoMerge "Doc change: Update Play for Edu docs for full launch." into klp-docs
Dirk Dougherty [Wed, 13 Nov 2013 04:25:52 +0000 (04:25 +0000)]
Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs

10 years agoDoc change: Update Play for Edu docs for full launch.
Dirk Dougherty [Fri, 11 Oct 2013 23:09:40 +0000 (16:09 -0700)]
Doc change: Update Play for Edu docs for full launch.

Change-Id: I50a1bfa6087383a5e7a10051e9a73ada96980297

10 years agoDessertCase fixes:
Daniel Sandler [Wed, 13 Nov 2013 02:50:18 +0000 (21:50 -0500)]
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

10 years agoam bb146981: am 29610421: Merge "Revised some text while reading up on traceview...
Scott Main [Wed, 13 Nov 2013 02:58:13 +0000 (18:58 -0800)]
am bb146981: 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 'bb1469816451aeb24eb8208fac1f2596f528aa80':
  Revised some text while reading up on traceview. this is what's left of this older CL that was left for dead: I5528b476d8110df51d45aaf690d878f72bc75c9f

10 years agoam 29610421: Merge "Revised some text while reading up on traceview. this is what...
Scott Main [Wed, 13 Nov 2013 02:53:40 +0000 (02:53 +0000)]
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

10 years agoMerge "Revised some text while reading up on traceview. this is what's left of this...
Scott Main [Wed, 13 Nov 2013 02:50:49 +0000 (02:50 +0000)]
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

10 years agoRevised some text while reading up on traceview.
Scott Main [Thu, 13 Jun 2013 19:38:55 +0000 (12:38 -0700)]
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

10 years agoBespoke, handcrafted, artisanal assist affordance assets.
Daniel Sandler [Wed, 13 Nov 2013 01:51:54 +0000 (20:51 -0500)]
Bespoke, handcrafted, artisanal assist affordance assets.

Bug: 11243771
Change-Id: I6eb320ca78ccafc435259d30df95582aa7e3c53c

10 years agoSwitch DeadZone to Slog.
Daniel Sandler [Wed, 13 Nov 2013 01:33:34 +0000 (20:33 -0500)]
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

10 years agoam 086370c9: am 2229ca03: Fix an action bar accessibility regression
Adam Powell [Wed, 13 Nov 2013 01:10:15 +0000 (17:10 -0800)]
am 086370c9: am 2229ca03: Fix an action bar accessibility regression

* commit '086370c971054ef5a59866df6a1d83559583323f':
  Fix an action bar accessibility regression

10 years agoam 2229ca03: Fix an action bar accessibility regression
Adam Powell [Wed, 13 Nov 2013 01:05:56 +0000 (17:05 -0800)]
am 2229ca03: Fix an action bar accessibility regression

* commit '2229ca031a326491feea5832e5337e9f8a602dca':
  Fix an action bar accessibility regression

10 years agoFix an action bar accessibility regression
Adam Powell [Wed, 13 Nov 2013 00:20:46 +0000 (16:20 -0800)]
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

10 years agoUpdate the PrintDocumentAdapter docs.
Svetoslav [Wed, 13 Nov 2013 00:20:55 +0000 (16:20 -0800)]
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

10 years agoam 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change...
Craig Mautner [Wed, 13 Nov 2013 00:00:54 +0000 (16:00 -0800)]
am 679ba4e8: am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev

* commit '679ba4e86e4fecb6dbfe48d6c49205c32f995a1c':
  Relayout windows that handle their own config change.

10 years agoam b0d1d3fc: am 2a91ecb1: Doc change: More updates to the design guidelines.
Dirk Dougherty [Wed, 13 Nov 2013 00:00:50 +0000 (16:00 -0800)]
am b0d1d3fc: am 2a91ecb1: Doc change: More updates to the design guidelines.

* commit 'b0d1d3fcda31204c7bb45355160f0516464cdd58':
  Doc change: More updates to the design guidelines.

10 years agoam 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev
Craig Mautner [Tue, 12 Nov 2013 23:58:28 +0000 (15:58 -0800)]
am 6cd206b2: Merge "Relayout windows that handle their own config change." into klp-dev

* commit '6cd206b2aa0039c215fc0a4cc487471c4b3f1496':
  Relayout windows that handle their own config change.

10 years agoam 2a91ecb1: Doc change: More updates to the design guidelines.
Dirk Dougherty [Tue, 12 Nov 2013 23:57:28 +0000 (23:57 +0000)]
am 2a91ecb1: Doc change: More updates to the design guidelines.

* commit '2a91ecb12982799001278752fc56464f9ececc60':
  Doc change: More updates to the design guidelines.

10 years agoMerge "Relayout windows that handle their own config change." into klp-dev
Craig Mautner [Tue, 12 Nov 2013 23:56:21 +0000 (23:56 +0000)]
Merge "Relayout windows that handle their own config change." into klp-dev

10 years agoDoc change: More updates to the design guidelines.
Dirk Dougherty [Wed, 6 Nov 2013 03:06:27 +0000 (19:06 -0800)]
Doc change: More updates to the design guidelines.

Change-Id: Ia21cc7bfc97e7347f4dfa5d9d25d87c4be70be9d

10 years agoGet rid of a race in NsdService in stopResolveService and getAddrInfo
Vinit Deshapnde [Tue, 12 Nov 2013 23:36:37 +0000 (15:36 -0800)]
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

10 years agoam 22108007: am 01e42c0b: Merge "Fix libinput to build with uapi headers."
Elliott Hughes [Tue, 12 Nov 2013 23:02:18 +0000 (15:02 -0800)]
am 22108007: am 01e42c0b: Merge "Fix libinput to build with uapi headers."

* commit '221080078a36f4b30fe6edc8c91f339a5b84ed83':
  Fix libinput to build with uapi headers.

10 years agoam 01e42c0b: Merge "Fix libinput to build with uapi headers."
Elliott Hughes [Tue, 12 Nov 2013 22:55:38 +0000 (14:55 -0800)]
am 01e42c0b: Merge "Fix libinput to build with uapi headers."

* commit '01e42c0be27f492a7325141f509755aa064923f3':
  Fix libinput to build with uapi headers.

10 years agoam f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active...
Amith Yamasani [Tue, 12 Nov 2013 22:53:19 +0000 (14:53 -0800)]
am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev

* commit 'f174b5162664da2cb7f1e91c2b03324711540ba2':
  Fix inconsistency in reporting device admin active state.

10 years agoam 48dab493: Merge "Fix inconsistency in reporting device admin active state." into...
Amith Yamasani [Tue, 12 Nov 2013 22:51:06 +0000 (14:51 -0800)]
am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev

* commit '48dab493b927f4a71687ccd557084ccee195de73':
  Fix inconsistency in reporting device admin active state.

10 years agoMerge "Fix inconsistency in reporting device admin active state." into klp-dev
Amith Yamasani [Tue, 12 Nov 2013 22:47:55 +0000 (22:47 +0000)]
Merge "Fix inconsistency in reporting device admin active state." into klp-dev

10 years agoMerge "Fix libinput to build with uapi headers."
Elliott Hughes [Tue, 12 Nov 2013 22:38:50 +0000 (22:38 +0000)]
Merge "Fix libinput to build with uapi headers."

10 years agoRelayout windows that handle their own config change.
Craig Mautner [Tue, 12 Nov 2013 22:02:52 +0000 (14:02 -0800)]
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

10 years agoFix libinput to build with uapi headers.
Elliott Hughes [Tue, 12 Nov 2013 21:16:37 +0000 (13:16 -0800)]
Fix libinput to build with uapi headers.

Bug: 11559337
Change-Id: I00ca91162de7cd42e03df23bbe4208e169b2ebfe

10 years agoSupport preferred activities with zero or one scheme in the filter
Christopher Tate [Tue, 12 Nov 2013 01:43:43 +0000 (17:43 -0800)]
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

10 years agoam c6a6539c: am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp...
Adam Koch [Tue, 12 Nov 2013 19:57:20 +0000 (11:57 -0800)]
am c6a6539c: am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs

* commit 'c6a6539c27f1abe10948dfebcff1d1ac9712c7d3':
  Bitmapfun Sample: Minor updates/fixes.

10 years agoam e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs
Adam Koch [Tue, 12 Nov 2013 19:53:17 +0000 (19:53 +0000)]
am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs

* commit 'e95c167c98157c3b91847a969980c1f293eb1e3f':
  Bitmapfun Sample: Minor updates/fixes.

10 years agoMerge "Bitmapfun Sample: Minor updates/fixes." into klp-docs
Adam Koch [Tue, 12 Nov 2013 19:45:22 +0000 (19:45 +0000)]
Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs

10 years agoam fe326adc: am 45d93219: fix typo in caption and XML spacing
Scott Main [Tue, 12 Nov 2013 19:35:54 +0000 (11:35 -0800)]
am fe326adc: am 45d93219: fix typo in caption and XML spacing

* commit 'fe326adc6a8641557b86905087ea2272f0c29491':
  fix typo in caption and XML spacing

10 years agoam 45d93219: fix typo in caption and XML spacing
Scott Main [Tue, 12 Nov 2013 19:33:43 +0000 (19:33 +0000)]
am 45d93219: fix typo in caption and XML spacing

* commit '45d9321963a51470dc1aadf6ec9193cb881eed06':
  fix typo in caption and XML spacing

10 years agoam 449b32e8: am c641de01: Merge "Add event logging for tasks and stacks." into klp-dev
Craig Mautner [Tue, 12 Nov 2013 19:24:43 +0000 (11:24 -0800)]
am 449b32e8: am c641de01: Merge "Add event logging for tasks and stacks." into klp-dev

* commit '449b32e844b9bdadbcbca68e87f446b509e5e667':
  Add event logging for tasks and stacks.

10 years agoam c641de01: Merge "Add event logging for tasks and stacks." into klp-dev
Craig Mautner [Tue, 12 Nov 2013 19:20:19 +0000 (11:20 -0800)]
am c641de01: Merge "Add event logging for tasks and stacks." into klp-dev

* commit 'c641de017ae0b15bbc13f43fd14fca6b1523ec02':
  Add event logging for tasks and stacks.

10 years agoMerge "Add event logging for tasks and stacks." into klp-dev
Craig Mautner [Tue, 12 Nov 2013 19:15:23 +0000 (19:15 +0000)]
Merge "Add event logging for tasks and stacks." into klp-dev

10 years agoam db976ea0: am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in...
Fabrice Di Meglio [Tue, 12 Nov 2013 19:10:18 +0000 (11:10 -0800)]
am db976ea0: am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev

* commit 'db976ea0fc4f21b94666f0c91b7369c45ed1dd80':
  Fix bug #11586041 Regression: text truncation in Clock

10 years agoam 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into...
Fabrice Di Meglio [Tue, 12 Nov 2013 19:06:47 +0000 (11:06 -0800)]
am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev

* commit '3f183a234bef643080d4f9dce44bcaa68e5d4694':
  Fix bug #11586041 Regression: text truncation in Clock

10 years agoMerge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev
Fabrice Di Meglio [Tue, 12 Nov 2013 19:03:48 +0000 (19:03 +0000)]
Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev

10 years agofix typo in caption and XML spacing
Scott Main [Tue, 12 Nov 2013 18:54:53 +0000 (10:54 -0800)]
fix typo in caption and XML spacing

Change-Id: I28adb9e6b5fb96f9f25a62766a197bb0a06bfdd0

10 years agoam adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12...
Glenn Kasten [Tue, 12 Nov 2013 18:49:36 +0000 (10:49 -0800)]
am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev

* commit 'adfbc5b25559392ce40abb75df2cd8858dcd8835':
  Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)

10 years agoam 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)...
Glenn Kasten [Tue, 12 Nov 2013 18:45:00 +0000 (10:45 -0800)]
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)

10 years agoMerge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev
Glenn Kasten [Tue, 12 Nov 2013 18:40:42 +0000 (18:40 +0000)]
Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev

10 years agoam ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata...
Eino-Ville Talvala [Tue, 12 Nov 2013 18:31:45 +0000 (10:31 -0800)]
am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev

* commit 'ed676b219704fe2cd1b14814bf79e231142978f8':
  Camera2: Add support for partial result metadata quirk

10 years agoam 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into...
Eino-Ville Talvala [Tue, 12 Nov 2013 18:29:18 +0000 (10:29 -0800)]
am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev

* commit '4d12d8bef6d04c16fc18f10437ffc49bcdfabf9b':
  Camera2: Add support for partial result metadata quirk