drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
119,885 Commits 1 Branch 0 Tags
Commit Graph

119885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
72cd81db36 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
 2013-11-12 19:29:11 -08:00
Adam Powell
34ccdf2d94 am c991bf90: am 086370c9: am 2229ca03: Fix an action bar accessibility regression 
* commit 'c991bf90bbdd01b746d70f2f045d19cabe19d690':
  Fix an action bar accessibility regression
 2013-11-12 19:28:59 -08:00
Craig Mautner
b12eb71c4f Merge commit 'bf581034' into manualmerge 
Conflicts:
	tools/layoutlib/bridge/src/android/view/IWindowManagerImpl.java

Change-Id: I9fd35ea9166ec73ce1f9f6154aa4ec87e79e20cb
 2013-11-12 19:17:06 -08:00
Scott Main
af623b99da 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
 2013-11-12 18:58:13 -08: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
Adam Powell
c991bf90bb am 086370c9: am 2229ca03: Fix an action bar accessibility regression 
* commit '086370c971054ef5a59866df6a1d83559583323f':
  Fix an action bar accessibility regression
 2013-11-12 17:10:15 -08:00
Dirk Dougherty
764197b14f am 69689fc9: am b0d1d3fc: am 2a91ecb1: Doc change: More updates to the design guidelines. 
* commit '69689fc9e66c3a3c3a7e0faf219a4da82d344cba':
  Doc change: More updates to the design guidelines.
 2013-11-12 17:08:38 -08:00
Elliott Hughes
26cad1bcb6 resolved conflicts for merge of d6288751 to master 
Change-Id: Ibfe5be04e093253c36c47149870273ae3ab860c0
 2013-11-12 17:06:53 -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
Craig Mautner
bf581034f9 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.
 2013-11-12 16:00:54 -08:00
Dirk Dougherty
69689fc9e6 am b0d1d3fc: am 2a91ecb1: Doc change: More updates to the design guidelines. 
* commit 'b0d1d3fcda31204c7bb45355160f0516464cdd58':
  Doc change: More updates to the design guidelines.
 2013-11-12 16:00:50 -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
Elliott Hughes
d628875192 am 22108007: am 01e42c0b: Merge "Fix libinput to build with uapi headers." 
* commit '221080078a36f4b30fe6edc8c91f339a5b84ed83':
  Fix libinput to build with uapi headers.
 2013-11-12 15:02:18 -08:00
Amith Yamasani
364c8aca9e 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.
 2013-11-12 14:58:37 -08:00
Elliott Hughes
221080078a am 01e42c0b: Merge "Fix libinput to build with uapi headers." 
* commit '01e42c0be27f492a7325141f509755aa064923f3':
  Fix libinput to build with uapi headers.
 2013-11-12 14:55:38 -08:00
Amith Yamasani
8a71cdaeb1 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.
 2013-11-12 14:53:19 -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
Elliott Hughes
01e42c0be2 Merge "Fix libinput to build with uapi headers." 2013-11-12 22:38:50 +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
Elliott Hughes
6a2e9bccef Fix libinput to build with uapi headers. 
Bug: 11559337
Change-Id: I00ca91162de7cd42e03df23bbe4208e169b2ebfe
 2013-11-12 13:16:37 -08:00
Adam Koch
dec9cdad73 am 1d64812a: am c6a6539c: am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs 
* commit '1d64812a35350692e0a770dcf278fab45ff855c8':
  Bitmapfun Sample: Minor updates/fixes.
 2013-11-12 12:01:09 -08:00
Adam Koch
1d64812a35 am c6a6539c: am e95c167c: Merge "Bitmapfun Sample: Minor updates/fixes." into klp-docs 
* commit 'c6a6539c27f1abe10948dfebcff1d1ac9712c7d3':
  Bitmapfun Sample: Minor updates/fixes.
 2013-11-12 11:57:20 -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
d9ef5006ff am 6f569bd9: am fe326adc: am 45d93219: fix typo in caption and XML spacing 
* commit '6f569bd971ef0248750888e6c4b118b0974111af':
  fix typo in caption and XML spacing
 2013-11-12 11:38:59 -08:00
Scott Main
6f569bd971 am fe326adc: am 45d93219: fix typo in caption and XML spacing 
* commit 'fe326adc6a8641557b86905087ea2272f0c29491':
  fix typo in caption and XML spacing
 2013-11-12 11:35:54 -08: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
0d4bb8993a 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.
 2013-11-12 11:28:42 -08:00
Craig Mautner
191b2bd8d0 am 449b32e8: am c641de01: Merge "Add event logging for tasks and stacks." into klp-dev 
* commit '449b32e844b9bdadbcbca68e87f446b509e5e667':
  Add event logging for tasks and stacks.
 2013-11-12 11:24:43 -08: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
43983c7bd9 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
 2013-11-12 11:15:15 -08:00
Fabrice Di Meglio
d303549b51 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
 2013-11-12 11:10:18 -08: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
Glenn Kasten
9cd7c61ffc 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)
 2013-11-12 10:55:12 -08:00
Scott Main
45d9321963 fix typo in caption and XML spacing 
Change-Id: I28adb9e6b5fb96f9f25a62766a197bb0a06bfdd0
 2013-11-12 10:54:53 -08:00
Glenn Kasten
d3616c07f7 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)
 2013-11-12 10:49:36 -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
07177de6c7 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
 2013-11-12 10:34:28 -08:00
Eino-Ville Talvala
e7d825d8b2 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
 2013-11-12 10:31:45 -08: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