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

119938 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
4ee6d87e16 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
 2013-11-12 10:05:30 -08: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
de558603dc Merge "Revert "Add logging for b10858941."" 2013-11-12 17:58:19 +00:00
Craig Mautner
127299fb5b Revert "Add logging for b10858941." 
This reverts commit 02d3c985f3755c736d7528f57b0c519ba7b1fa65.

Change-Id: Ida2b1aa6116fdaf003c6611890a19c1c312d2bd1
 2013-11-12 17:57:47 +00: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
Amith Yamasani
2d3fa418e7 Merge "Move some system services to their own sub package." 2013-11-12 17:51:09 +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
Amith Yamasani
30f8eb472e 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
 2013-11-12 09:06:42 -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
12c39dd50c am 9ffc4a65: am 854395ad: am c481a634: Merge "UI tweaks." into klp-dev 
* commit '9ffc4a65e51ae8695be0531c6fae0d33301ded60':
  UI tweaks.
 2013-11-11 22:07:29 -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
Jean Chalard
c1a11f17a2 Improve documentation for InputType and EditorInfo. 
Bug: 11245912
Change-Id: Ie92ba20079461f7f0e30d969ba3692fec3a3b97f
 2013-11-12 14:13:55 +09:00
Svetoslav
26ae3286c3 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.
 2013-11-11 20:52:34 -08:00
Dianne Hackborn
034d9e9459 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
 2013-11-11 20:52:22 -08:00
John Spurlock
0c574b72aa 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.
 2013-11-11 20:52:19 -08:00
Scott Main
4fc7a70e06 am 09ee846d: am 57a81a78: am 4c6b1afb: fix typo and clarify meminfo discussion bug: 11589682 
* commit '09ee846de0ec177870aa51a676532e6e922d03c7':
  fix typo and clarify meminfo discussion bug: 11589682
 2013-11-11 20:52:15 -08:00
Jatin Lodhia
ddc2053e15 am 9a55d60b: am 64234cfc: am 09e7e0ef: Delegate existence of account check to Authenticator. 
* commit '9a55d60b996dc50fbad8eba114ef69e652a1407d':
  Delegate existence of account check to Authenticator.
 2013-11-11 20:52:00 -08:00
Jean-Michel Trivi
51cf5c7310 am cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev 
* commit 'cb623a8d44cfef63133c3c8d1d8a31aa48ba57d2':
  Fix Tethys asset
 2013-11-11 20:51:54 -08:00
Jeff Sharkey
d5a9fb067c 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.
 2013-11-11 20:51:48 -08:00
Baligh Uddin
fc85860f37 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
 2013-11-11 20:51:27 -08:00
Baligh Uddin
ae7ce4a262 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
 2013-11-11 20:51:23 -08:00
Baligh Uddin
8d929ef56a 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
 2013-11-11 20:51:19 -08:00
Dianne Hackborn
e75b987182 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
 2013-11-11 20:51:12 -08:00
Jeff Brown
08432a419b 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.
 2013-11-11 20:51:03 -08:00
Craig Mautner
f244e1428b 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.
 2013-11-11 20:51:00 -08:00
Craig Mautner
c46c4992ef 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.
 2013-11-11 20:50:56 -08:00
Deepanshu Gupta
52fd30028f 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
 2013-11-11 20:50:29 -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
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
Jason Sams
431b4359e4 Merge "Add long/double read support." 2013-11-12 00:33:56 +00:00
Jeff Brown
b530aeb0fe resolved conflicts for merge of f0b9ee96 to master 
Change-Id: I1b347e895049474e11076c60074dc5918cfe1405
 2013-11-11 16:10:53 -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