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

117307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Jean Chalard
c1a11f17a2 Improve documentation for InputType and EditorInfo. 
Bug: 11245912
Change-Id: Ie92ba20079461f7f0e30d969ba3692fec3a3b97f
 2013-11-12 14:13:55 +09: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
Fabrice Di Meglio
82d37b40c5 Fix bug #11586041 Regression: text truncation in Clock 
Background padding should be used only and only if
- no padding is already defined into a layout file
- an explicit call to setBackground() / setBackgroundDrawable() has been done

Change-Id: I0a732c61b898e006ee86377bcbe7691740d68111
 2013-11-11 16:52:49 -08:00
Jatin Lodhia
9a55d60b99 am 64234cfc: am 09e7e0ef: Delegate existence of account check to Authenticator. 
* commit '64234cfc1e0e74774492c2b8208da38ab0250469':
  Delegate existence of account check to Authenticator.
 2013-11-11 15:57:19 -08:00
Jatin Lodhia
64234cfc1e am 09e7e0ef: Delegate existence of account check to Authenticator. 
* commit '09e7e0ef8bcd8b7b78b79fb570de2032871f0c97':
  Delegate existence of account check to Authenticator.
 2013-11-11 15:54:31 -08:00
Jean-Michel Trivi
cb623a8d44 am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev 
* commit 'f99e8650c931026e0e119ede672ee12a2d2867a7':
  Fix Tethys asset
 2013-11-11 15:50:21 -08:00
Jatin Lodhia
09e7e0ef8b Delegate existence of account check to Authenticator. 
Current AccountManager code for getAuthToken checks if the account
in the request exists. If the account does not exist then it throws
an exception which leads to a runtime exception being thrown by
AccountManager in the client. In perticular, Checkin client code
hits this issue when accounts are deleted by user. As the exception
is thrown from the getAuthToken method call and is a RuntimeException
it is not caught by the client. Futhermore, Checkin runs in one of the
important processes and this exception makes the process crash.

This cl, does the following:
1) Delegates the account exists check to Authentictor which in turn
would cause an AuthenticatorException which is a checked exception.
2) Replaces some of the runtime exceptions thrown by AccountManagerService
with calling AccountManagerResponse.onError() which causes more graceful
failure on the client.
3) Correctly passes on the error returned by Authenticator to
AccountManager. Earlier if Authenticator returned an error code to
the AccountManager, it ignored the error and returned null token to the
client which was incorrect.

Bug: 10856295
Change-Id: Ie250fec601d46f6dfecd74677b478bfd4e9dcfad
 2013-11-11 23:48:53 +00:00
Jean-Michel Trivi
f99e8650c9 am fed822cb: Merge "Fix Tethys asset" into klp-dev 
* commit 'fed822cb8e17579dfa792b40ebe82683088e7779':
  Fix Tethys asset
 2013-11-11 15:47:36 -08:00
Jean-Michel Trivi
fed822cb8e Merge "Fix Tethys asset" into klp-dev 2013-11-11 23:44:28 +00:00
Jeff Sharkey
874dfd733a am 34163e82: am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev 
* commit '34163e8259db8661afbb267e3b899b64f429bcb7':
  Give storage provider access to secondary devices.
 2013-11-11 15:22:37 -08:00
Jeff Sharkey
34163e8259 am 55d12486: Merge "Give storage provider access to secondary devices." into klp-dev 
* commit '55d12486df5e801dc8e74d96abdf87a250bc0ba1':
  Give storage provider access to secondary devices.
 2013-11-11 15:19:44 -08:00
Jeff Sharkey
55d12486df Merge "Give storage provider access to secondary devices." into klp-dev 2013-11-11 23:16:38 +00:00