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

117266 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Eino-Ville Talvala
4d12d8bef6 Merge "Camera2: Add support for partial result metadata quirk" into klp-dev 2013-11-12 18:27:06 +00:00
Scott Main
3c95033a38 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
 2013-11-12 10:00:02 -08: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
Jeff Brown
9ffc4a65e5 am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev 
* commit '854395add8ceaa2b80a14e063567f1292eb91c4d':
  UI tweaks.
 2013-11-11 22:04:54 -08: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
Jeff Brown
39ad0e5598 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
 2013-11-11 21:48:53 -08:00
Svetoslav
ebda68bf84 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.
 2013-11-11 20:04:49 -08:00
Svetoslav
52dedb8918 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.
 2013-11-11 20:02:53 -08:00
Svetoslav
512c722f14 Merge "PreferencesFragment showing the breadcrumb area in single pane mode." into klp-dev 2013-11-12 04:01:16 +00:00
Svetoslav
2b8795a9db PreferencesFragment showing the breadcrumb area in single pane mode. 
If the PreferenceActivity is running in a single pane mode we are
not showing the headers and the breadcrumb area. However, when this
activity is restarted and has a saved state to restore we are trying
to use headers even in a single pane mode. As a result the breadcrumb
area is shown and the content is shifted to the bottom with an empty
space at the top. This change ignores the saved headers from the
saved instance state in a single pane mode. Note that in such a case
these headers are null anyway as we do not use them.

bug:11242762

Change-Id: I2828bc82762695d9c93fb4ca43933598a9b12b87
 2013-11-11 18:31:54 -08:00
Dianne Hackborn
bf68748457 am 0259c010: am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev 
* commit '0259c010221c73db11ee52b4b0758a179e5c0db1':
  Work on issue #11634365: Leaking restarting services
 2013-11-11 18:05:10 -08:00
John Spurlock
bb3adc44df am da721a99: am 778eaf4b: Merge "Disallow transient status bar on the keyguard." into klp-dev 
* commit 'da721a99febae345d28f9afa5b9679a1c54a2f6b':
  Disallow transient status bar on the keyguard.
 2013-11-11 18:05:07 -08:00
Scott Main
09ee846de0 am 57a81a78: am 4c6b1afb: fix typo and clarify meminfo discussion bug: 11589682 
* commit '57a81a7839a50fe8f360f8fd82f857ea095a8a1d':
  fix typo and clarify meminfo discussion bug: 11589682
 2013-11-11 18:05:04 -08:00
Dianne Hackborn
0259c01022 am 596e409e: Merge "Work on issue #11634365: Leaking restarting services" into klp-dev 
* commit '596e409ec9703e5071bb9a0de08787cde7745f7a':
  Work on issue #11634365: Leaking restarting services
 2013-11-11 18:01:15 -08:00
John Spurlock
da721a99fe am 778eaf4b: Merge "Disallow transient status bar on the keyguard." into klp-dev 
* commit '778eaf4bece18d08e91df1d405337a18c3abcd57':
  Disallow transient status bar on the keyguard.
 2013-11-11 18:01:12 -08:00
Scott Main
57a81a7839 am 4c6b1afb: fix typo and clarify meminfo discussion bug: 11589682 
* commit '4c6b1afb5b1c750b762ec446604834676f1e306b':
  fix typo and clarify meminfo discussion bug: 11589682
 2013-11-12 01:58:49 +00:00
Dianne Hackborn
596e409ec9 Merge "Work on issue #11634365: Leaking restarting services" into klp-dev 2013-11-12 01:36:10 +00:00
Scott Main
4c6b1afb5b fix typo and clarify meminfo discussion 
bug: 11589682

Change-Id: I3b46e6e2ae768284270b3e46c39c7cf14e65d7f7
 2013-11-11 17:34:33 -08:00
John Spurlock
778eaf4bec Merge "Disallow transient status bar on the keyguard." into klp-dev 2013-11-12 01:28:41 +00:00
Dianne Hackborn
d6f5b62921 Work on issue #11634365: Leaking restarting services 
Tighten up some flows to try to avoid any chance of leaving
a restarting service on the list, add a log to the only remaining
place I could find that we could get in to trouble for some
reason.

Change-Id: Iffb9be9d97deefc6cf0c5790eedfeb6e4e8a36bc
 2013-11-11 17:25:37 -08:00