OSDN Git Service

android-x86/frameworks-base.git
10 years agoam f7400aa1: (-s ours) am 6870d29c: am 78cfdf31: Update changed delegate method in...
Deepanshu Gupta [Wed, 13 Nov 2013 16:45:54 +0000 (08:45 -0800)]
am f7400aa1: (-s ours) am 6870d29c: am 78cfdf31: Update changed delegate method in Bitmap_Delegate. DO NOT MERGE

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

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 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 agoam 9ea18d49: am d952ac4c: am 218ecd43: Fix the docs build
Jean Chalard [Wed, 13 Nov 2013 06:35:28 +0000 (22:35 -0800)]
am 9ea18d49: am d952ac4c: am 218ecd43: Fix the docs build

* commit '9ea18d495c4c3d47d279f3f63cb4a24641544f89':
  Fix the docs build

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 agoam 45637283: am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType...
Jean Chalard [Wed, 13 Nov 2013 05:27:34 +0000 (21:27 -0800)]
am 45637283: am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev

* commit '4563728371520de38445d5758edd3da7538a1934':
  Improve documentation for InputType and EditorInfo.

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 9d90e73d: am 0deaa273: am ee8f2a64: Merge "Doc change: Update Play for Edu docs...
Dirk Dougherty [Wed, 13 Nov 2013 04:53:42 +0000 (20:53 -0800)]
am 9d90e73d: am 0deaa273: am ee8f2a64: Merge "Doc change: Update Play for Edu docs for full launch." into klp-docs

* commit '9d90e73d09b01a4c95d06a27aa39c2d7c84afe50':
  Doc change: Update Play for Edu docs for full launch.

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 agoam af623b99: am bb146981: am 29610421: Merge "Revised some text while reading up...
Scott Main [Wed, 13 Nov 2013 03:29:11 +0000 (19:29 -0800)]
am af623b99: 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 'af623b99dafbc16effc7b05de833e842654b75e1':
  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 c991bf90: am 086370c9: am 2229ca03: Fix an action bar accessibility regression
Adam Powell [Wed, 13 Nov 2013 03:28:59 +0000 (19:28 -0800)]
am c991bf90: am 086370c9: am 2229ca03: Fix an action bar accessibility regression

* commit 'c991bf90bbdd01b746d70f2f045d19cabe19d690':
  Fix an action bar accessibility regression

10 years agoMerge commit 'bf581034' into manualmerge
Craig Mautner [Wed, 13 Nov 2013 03:17:06 +0000 (19:17 -0800)]
Merge commit 'bf581034' into manualmerge

Conflicts:
tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb

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 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 69689fc9: am b0d1d3fc: am 2a91ecb1: Doc change: More updates to the design guidelines.
Dirk Dougherty [Wed, 13 Nov 2013 01:08:38 +0000 (17:08 -0800)]
am 69689fc9: am b0d1d3fc: am 2a91ecb1: Doc change: More updates to the design guidelines.

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

10 years agoresolved conflicts for merge of d6288751 to master
Elliott Hughes [Wed, 13 Nov 2013 01:06:53 +0000 (17:06 -0800)]
resolved conflicts for merge of d6288751 to master

Change-Id: Ibfe5be04e093253c36c47149870273ae3ab860c0

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 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 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 8a71cdae: am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device...
Amith Yamasani [Tue, 12 Nov 2013 22:58:37 +0000 (14:58 -0800)]
am 8a71cdae: am f174b516: am 48dab493: Merge "Fix inconsistency in reporting device admin active state." into klp-dev

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

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 agoam 1d64812a: am c6a6539c: am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes...
Adam Koch [Tue, 12 Nov 2013 20:01:09 +0000 (12:01 -0800)]
am 1d64812a: am c6a6539c: am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs

* commit '1d64812a35350692e0a770dcf278fab45ff855c8':
  Bitmapfun Sample: Minor updates/fixes.

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 6f569bd9: am fe326adc: am 45d93219: fix typo in caption and XML spacing
Scott Main [Tue, 12 Nov 2013 19:38:59 +0000 (11:38 -0800)]
am 6f569bd9: am fe326adc: am 45d93219: fix typo in caption and XML spacing

* commit '6f569bd971ef0248750888e6c4b118b0974111af':
  fix typo in caption and XML spacing

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 191b2bd8: am 449b32e8: am c641de01: Merge "Add event logging for tasks and stacks...
Craig Mautner [Tue, 12 Nov 2013 19:28:42 +0000 (11:28 -0800)]
am 191b2bd8: am 449b32e8: am c641de01: Merge "Add event logging for tasks and stacks." into klp-dev

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

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 d303549b: am db976ea0: am 3f183a23: Merge "Fix bug #11586041 Regression: text...
Fabrice Di Meglio [Tue, 12 Nov 2013 19:15:15 +0000 (11:15 -0800)]
am d303549b: am db976ea0: am 3f183a23: Merge "Fix bug #11586041 Regression: text truncation in Clock" into klp-dev

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

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 agoam d3616c07: am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like...
Glenn Kasten [Tue, 12 Nov 2013 18:55:12 +0000 (10:55 -0800)]
am d3616c07: am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev

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

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 e7d825d8: am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result...
Eino-Ville Talvala [Tue, 12 Nov 2013 18:34:28 +0000 (10:34 -0800)]
am e7d825d8: am ed676b21: am 4d12d8be: Merge "Camera2: Add support for partial result metadata quirk" into klp-dev

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

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

10 years agoMerge "Camera2: Add support for partial result metadata quirk" into klp-dev
Eino-Ville Talvala [Tue, 12 Nov 2013 18:27:06 +0000 (18:27 +0000)]
Merge "Camera2: Add support for partial result metadata quirk" into klp-dev

10 years agoam 3c95033a: am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each...
Scott Main [Tue, 12 Nov 2013 18:05:30 +0000 (10:05 -0800)]
am 3c95033a: am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630

* commit '3c95033a3854c6d569a8c8849e06298fc842498d':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630

10 years agoam 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi...
Scott Main [Tue, 12 Nov 2013 18:00:02 +0000 (10:00 -0800)]
am 7774d8e7: am 44895333: clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630

* commit '7774d8e723774d8523435f34d821a6eff2c1391f':
  clarify that ANDROID_ID is unique for each user in multi-user environment. bug: 8073630

10 years agoMerge "Revert "Add logging for b10858941.""
Craig Mautner [Tue, 12 Nov 2013 17:58:19 +0000 (17:58 +0000)]
Merge "Revert "Add logging for b10858941.""

10 years agoRevert "Add logging for b10858941."
Craig Mautner [Tue, 12 Nov 2013 17:57:47 +0000 (17:57 +0000)]
Revert "Add logging for b10858941."

This reverts commit 02d3c985f3755c736d7528f57b0c519ba7b1fa65.

Change-Id: Ida2b1aa6116fdaf003c6611890a19c1c312d2bd1

10 years agoAdd event logging for tasks and stacks.
Craig Mautner [Tue, 12 Nov 2013 16:31:15 +0000 (08:31 -0800)]
Add event logging for tasks and stacks.

Also remove crufty write-only DisplayContent.mStackHistory.

Change-Id: I62b2b53dc02377c5d0d3b79df70b1990eed87d23

10 years agoam 44895333: clarify that ANDROID_ID is unique for each user in multi-user environmen...
Scott Main [Tue, 12 Nov 2013 17:56:03 +0000 (17:56 +0000)]
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

10 years agoMerge "Move some system services to their own sub package."
Amith Yamasani [Tue, 12 Nov 2013 17:51:09 +0000 (17:51 +0000)]
Merge "Move some system services to their own sub package."

10 years agoclarify that ANDROID_ID is unique for each user in multi-user environment.
Scott Main [Tue, 12 Nov 2013 17:23:13 +0000 (09:23 -0800)]
clarify that ANDROID_ID is unique for each user in multi-user environment.
bug: 8073630

Change-Id: Iff18e892a1e0422a85edd83f97ba4285f2171f74

10 years agoMove some system services to their own sub package.
Amith Yamasani [Wed, 6 Nov 2013 22:54:50 +0000 (14:54 -0800)]
Move some system services to their own sub package.

As a next step they can be moved into separate directories to be
built as separate modules that may or may not be included in a
particular configuration.

Moves AppWidgetService, BackupManagerService, ClipboardService, DevicePolicyMS,
and WallpaperMS.

Change-Id: I33e48d070f38186819d3a1d7a4dc3984b75a9eda

10 years agoam 9ffc4a65: am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev
Jeff Brown [Tue, 12 Nov 2013 06:07:29 +0000 (22:07 -0800)]
am 9ffc4a65: am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev

* commit '9ffc4a65e51ae8695be0531c6fae0d33301ded60':
  UI tweaks.

10 years agoam 854395ad: am c481a634: Merge "UI tweaks." into klp-dev
Jeff Brown [Tue, 12 Nov 2013 06:04:54 +0000 (22:04 -0800)]
am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev

* commit '854395add8ceaa2b80a14e063567f1292eb91c4d':
  UI tweaks.

10 years agoam c481a634: Merge "UI tweaks." into klp-dev
Jeff Brown [Tue, 12 Nov 2013 06:01:22 +0000 (22:01 -0800)]
am c481a634: Merge "UI tweaks." into klp-dev

* commit 'c481a634f4db6e95bc03b22b72414ba12da99f4b':
  UI tweaks.

10 years agoMerge "UI tweaks." into klp-dev
Jeff Brown [Tue, 12 Nov 2013 05:57:48 +0000 (05:57 +0000)]
Merge "UI tweaks." into klp-dev

10 years agoUI tweaks.
Jeff Brown [Tue, 12 Nov 2013 01:55:08 +0000 (17:55 -0800)]
UI tweaks.

Hide disabled routes from the chooser.

Fix layout of chooser dialog when the settings button is visible and
the list is very long to prevent truncation of the settings button.

Fix an issue when we fake the route connecting status when a route
is selected.  The route changed notification needs to be propagated
to apps.  Fake it better.

Immediately disconnect from a route when the connection is lost or
a connection attempt fails.  Added a few new test displays for this
case.

Bug: 11257292
Change-Id: I360ab5dc937ad60d97592eab54b19f034519645e

10 years agoImprove documentation for InputType and EditorInfo.
Jean Chalard [Mon, 11 Nov 2013 08:47:51 +0000 (17:47 +0900)]
Improve documentation for InputType and EditorInfo.

Bug: 11245912
Change-Id: Ie92ba20079461f7f0e30d969ba3692fec3a3b97f

10 years agoam ebda68bf: am 52dedb89: am 512c722f: Merge "PreferencesFragment showing the breadcr...
Svetoslav [Tue, 12 Nov 2013 04:52:34 +0000 (20:52 -0800)]
am ebda68bf: am 52dedb89: am 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev

* commit 'ebda68bf844d4b5b75a01317b45ee04041e726e3':
  PreferencesFragment showing the breadcrumb area in single pane mode.

10 years agoam bf687484: am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restar...
Dianne Hackborn [Tue, 12 Nov 2013 04:52:22 +0000 (20:52 -0800)]
am bf687484: am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev

* commit 'bf687484573ef63c5b54adfc0325a41115fb49fa':
  Work on issue #11634365: Leaking restarting services

10 years agoam bb3adc44: am da721a99: am 778eaf4b: Merge "Disallow transient status bar on the...
John Spurlock [Tue, 12 Nov 2013 04:52:19 +0000 (20:52 -0800)]
am bb3adc44: am da721a99: am 778eaf4b: Merge "Disallow transient status bar on the keyguard." into klp-dev

* commit 'bb3adc44dfdb02c087a79df85ddeceb770e9cfb2':
  Disallow transient status bar on the keyguard.

10 years agoam 09ee846d: am 57a81a78: am 4c6b1afb: fix typo and clarify meminfo discussion bug...
Scott Main [Tue, 12 Nov 2013 04:52:15 +0000 (20:52 -0800)]
am 09ee846d: am 57a81a78: am 4c6b1afb: fix typo and clarify meminfo discussion bug: 11589682

* commit '09ee846de0ec177870aa51a676532e6e922d03c7':
  fix typo and clarify meminfo discussion bug: 11589682

10 years agoam 9a55d60b: am 64234cfc: am 09e7e0ef: Delegate existence of account check to Authent...
Jatin Lodhia [Tue, 12 Nov 2013 04:52:00 +0000 (20:52 -0800)]
am 9a55d60b: am 64234cfc: am 09e7e0ef: Delegate existence of account check to Authenticator.

* commit '9a55d60b996dc50fbad8eba114ef69e652a1407d':
  Delegate existence of account check to Authenticator.

10 years agoam cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev
Jean-Michel Trivi [Tue, 12 Nov 2013 04:51:54 +0000 (20:51 -0800)]
am cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev

* commit 'cb623a8d44cfef63133c3c8d1d8a31aa48ba57d2':
  Fix Tethys asset

10 years agoam 874dfd73: am 34163e82: am 55d12486: Merge "Give storage provider access to seconda...
Jeff Sharkey [Tue, 12 Nov 2013 04:51:48 +0000 (20:51 -0800)]
am 874dfd73: am 34163e82: am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev

* commit '874dfd733a2fd2224f155ee2c4cf5e3065676402':
  Give storage provider access to secondary devices.

10 years agoam dcb83484: (-s ours) am 6164b166: (-s ours) am 840587b3: (-s ours) Merge "Import...
Baligh Uddin [Tue, 12 Nov 2013 04:51:27 +0000 (20:51 -0800)]
am dcb83484: (-s ours) am 6164b166: (-s ours) am 840587b3: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit 'dcb83484644fe212345b6f5f1689480fa4a624b8':
  Import translations. DO NOT MERGE

10 years agoam 45ad4f4e: (-s ours) am 4f2ff756: (-s ours) am 082c7dbc: (-s ours) Merge "Import...
Baligh Uddin [Tue, 12 Nov 2013 04:51:23 +0000 (20:51 -0800)]
am 45ad4f4e: (-s ours) am 4f2ff756: (-s ours) am 082c7dbc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '45ad4f4e6391dfe5c56d9bb6e1d11cc1f1bbdb0e':
  Import translations. DO NOT MERGE

10 years agoam 8e084bbd: (-s ours) am 17d19c27: (-s ours) am c0c41cbe: (-s ours) Merge "Import...
Baligh Uddin [Tue, 12 Nov 2013 04:51:19 +0000 (20:51 -0800)]
am 8e084bbd: (-s ours) am 17d19c27: (-s ours) am c0c41cbe: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev

* commit '8e084bbd326238e711acd868283ae33818b612ca':
  Import translations. DO NOT MERGE

10 years agoam f488cd3b: am 7e40e317: am c85a1143: Merge "Fix issue #11630188: Still seeing some...
Dianne Hackborn [Tue, 12 Nov 2013 04:51:12 +0000 (20:51 -0800)]
am f488cd3b: am 7e40e317: am c85a1143: Merge "Fix issue #11630188: Still seeing some processes not on LRU list errors" into klp-dev

* commit 'f488cd3b77c064c29040edc5af1fc98d6faa994e':
  Fix issue #11630188: Still seeing some processes not on LRU list errors

10 years agoam fa0d9c2f: am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast...
Jeff Brown [Tue, 12 Nov 2013 04:51:03 +0000 (20:51 -0800)]
am fa0d9c2f: am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev

* commit 'fa0d9c2fa8e5c2c73bd36688784f1e44eb08635b':
  Changes to support new screen cast settings screen.

10 years agoam c1c5e37c: am 86b06976: am 45bf2815: Merge "Fix a couple of issues with mOpeningApp...
Craig Mautner [Tue, 12 Nov 2013 04:51:00 +0000 (20:51 -0800)]
am c1c5e37c: am 86b06976: am 45bf2815: Merge "Fix a couple of issues with mOpeningApps." into klp-dev

* commit 'c1c5e37cf62db04cb029f1ff339f9192ae43e3c0':
  Fix a couple of issues with mOpeningApps.

10 years agoam 6492c0f3: am 22a97106: am 8cfa6d08: Merge "Use old task info when creating new...
Craig Mautner [Tue, 12 Nov 2013 04:50:56 +0000 (20:50 -0800)]
am 6492c0f3: am 22a97106: am 8cfa6d08: Merge "Use old task info when creating new task." into klp-dev

* commit '6492c0f3af881c070170a00212e5e034f74436ae':
  Use old task info when creating new task.

10 years agoam 35631bcc: (-s ours) am 76b715e5: am e45d8b2d: Merge "Fix text size in Fake Action...
Deepanshu Gupta [Tue, 12 Nov 2013 04:50:29 +0000 (20:50 -0800)]
am 35631bcc: (-s ours) am 76b715e5: am e45d8b2d: Merge "Fix text size in Fake Action Bar" into klp-dev

* commit '35631bccd4f58cc1fbb4d79d1890fbf1ff59dbc2':
  Fix text size in Fake Action Bar

10 years agoam 52dedb89: am 512c722f: Merge "PreferencesFragment showing the breadcrumb area...
Svetoslav [Tue, 12 Nov 2013 04:04:49 +0000 (20:04 -0800)]
am 52dedb89: am 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev

* commit '52dedb8918d2ec80dae87fa28112c1b0cb4c5f2e':
  PreferencesFragment showing the breadcrumb area in single pane mode.

10 years agoam 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane...
Svetoslav [Tue, 12 Nov 2013 04:02:53 +0000 (20:02 -0800)]
am 512c722f: Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev

* commit '512c722f14bf9ddad5c280c7bff4106410114ad7':
  PreferencesFragment showing the breadcrumb area in single pane mode.