Commit Graph

33162 Commits

Author SHA1 Message Date
Jean Chalard
cfafb5059d am 45637283: am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
* commit '4563728371520de38445d5758edd3da7538a1934':
  Improve documentation for InputType and EditorInfo.
2013-11-12 21:27:34 -08:00
Jean Chalard
4563728371 am 383ef79d: am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
* commit '383ef79d14a64b335d94353e87e824ea2f37ee65':
  Improve documentation for InputType and EditorInfo.
2013-11-12 21:25:26 -08:00
Jean Chalard
383ef79d14 am 7d57b7a3: Merge "Improve documentation for InputType and EditorInfo." into klp-dev
* commit '7d57b7a35bd64d271b666f16aa1e85a4c2b99ca7':
  Improve documentation for InputType and EditorInfo.
2013-11-12 21:22:03 -08:00
Jean Chalard
7d57b7a35b Merge "Improve documentation for InputType and EditorInfo." into klp-dev 2013-11-13 05:19:36 +00:00
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
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
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
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
Craig Mautner
6cd206b2aa Merge "Relayout windows that handle their own config change." into klp-dev 2013-11-12 23:56:21 +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
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
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
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
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
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
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
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
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
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
Jeff Brown
b530aeb0fe resolved conflicts for merge of f0b9ee96 to master
Change-Id: I1b347e895049474e11076c60074dc5918cfe1405
2013-11-11 16:10:53 -08:00
Jeff Brown
7117c0c184 am 40c81e4a: am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '40c81e4a5d96f8a3853045b289f6131c44d3155d':
  Make quick settings show the standard media router icon.
2013-11-11 15:23:40 -08:00
Eino-Ville Talvala
7a31310439 Camera2: Add support for partial result metadata quirk
- Add new CaptureListener.onCapturePartial() callback for receiving
  partial result metadata sooner than the full result metadata will be sent
  in onCaptureComplete().
- Add hidden keys for the partial result quirk
- Dispatch results to onCapturePartial based on the partial result quirk

All additions are hidden for now.

Bug: 11115603
Change-Id: Ie9a3be640f147257ae22e5b5edf0974bddc1cb85
2013-11-11 13:47:46 -08:00
Jeff Brown
fa0d9c2fa8 am 02b77575: am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '02b775755105a956456cb193b60d765e1a4690b6':
  Changes to support new screen cast settings screen.
2013-11-11 10:23:57 -08:00
Jeff Brown
02b7757551 am 1cdbbb1e: Merge "Changes to support new screen cast settings screen." into klp-dev
* commit '1cdbbb1e73bff05f5dd1679bae2e3502d4f82368':
  Changes to support new screen cast settings screen.
2013-11-11 10:21:58 -08:00
John Reck
e77a040f3a Merge "More refactoring" 2013-11-11 17:38:18 +00:00
John Reck
3083579424 More refactoring
Merge GlRenderer and Gl20Renderer
 Move GLRenderer to its own file
 Move native methods from HardwareRenderer to GLRenderer

Change-Id: Ib4680b03dd98101b2a428062cc94774ff73baa75
2013-11-11 09:37:02 -08:00
Jeff Brown
75af171006 Changes to support new screen cast settings screen.
Fixed the Preference ordering code to consider the case where
two preferences might have the same order.  In that case, it
falls back on the title to disambiguate.  Previous behavior was
undefined (and technically not stable).

Expose the wifi display device address.

Perform wifi display scans every 10 seconds instead of every 15
to improve reponsiveness.

Make sure to define routes for wifi displays that we are connecting
to even if they are not yet paired.  Simplified the logic for
adding and removing these routes to avoid possibly getting out
of sync and leaving stale routes behind.

Fix wifi display notification icon.

Bug: 11257292
Change-Id: I8ac15fb17d83758c0bdce80399e12723c367b83c
2013-11-10 22:51:15 -08:00
Jeff Brown
f0b9ee9637 am 5773f724: am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev
* commit '5773f72457246e437c24624cda8ec2a869165ee8':
  Update the media router dialogs and integrate into system UI.
2013-11-10 22:04:54 -08:00
Jeff Brown
40c81e4a5d am 3105b6d2: am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '3105b6d2f192fc25f57911ef7bafbd62bae5b7e3':
  Make quick settings show the standard media router icon.
2013-11-10 22:04:51 -08:00
Jeff Brown
5773f72457 am dd4f9e8b: Merge "Update the media router dialogs and integrate into system UI." into klp-dev
* commit 'dd4f9e8b61c0a5639aa82480b7fdd760a2ed609c':
  Update the media router dialogs and integrate into system UI.
2013-11-10 22:02:23 -08:00
Jeff Brown
3105b6d2f1 am 12c32b4d: Merge "Make quick settings show the standard media router icon." into klp-dev
* commit '12c32b4d484cc7cc2278a76c6e0fc2304a74b593':
  Make quick settings show the standard media router icon.
2013-11-10 22:02:20 -08:00
Jeff Brown
0abd3a6ce8 Update the media router dialogs and integrate into system UI.
Port the new style UI back into the framework from the support library.
There are now two dialogs: a chooser and a controller.  We use the
same dialogs for selecting routes within app and within quick settings.

Note that the new UI does not support any grouping features since they
are deprecated and unused.

Bug: 11257292
Change-Id: I64e936a18d25ab75f0c470cbc1e7085f67004863
2013-11-10 14:39:19 -08:00
Jeff Brown
e2126baf72 Make quick settings show the standard media router icon.
Fixed a bug in ImageView where we failed to inform a newly updated
Drawable about the visibility state.  This caused AnimationDrawables
to not animate when attached to an existing ImageView *unless* that
ImageView happened to be attached to the window *later* or have
its visibility toggled for some other reason.

Bug: 11257292
Change-Id: Iba9e0db5ba0db2b022950aec0c6f60a435da8ad2
2013-11-09 18:59:46 -08:00
Ruben Brunk
5a78dc1cf5 am 913c0e38: am 70285910: am e73b41b2: camera2: Remove prior repeating request when setting.
* commit '913c0e38a1316f4a653563ba401a0095c54b71d0':
  camera2: Remove prior repeating request when setting.
2013-11-08 11:19:47 -08:00