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
Sonia Sharma
daee2d3a82
am 3b98a287: am a877cbcc: am 26f54442: Merge "Remove TMobile Tethering APN from default builds" into klp-dev
...
* commit '3b98a287aec69ea76fc2d79695029665abf1ab00':
Remove TMobile Tethering APN from default builds
2013-11-11 15:23:33 -08:00
Baligh Uddin
9be057c627
Merge "Import translations. DO NOT MERGE"
2013-11-11 22:39:30 +00:00
Baligh Uddin
082c7dbc02
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-11-11 22:39:21 +00: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
Baligh Uddin
d405ecff9b
Import translations. DO NOT MERGE
...
Change-Id: Ie8d11728f20f3aafe18a33edd4e81e314e507bd1
Auto-generated-cl: translation import
2013-11-11 08:50:15 -08:00
Baligh Uddin
8a56d180fb
Import translations. DO NOT MERGE
...
Change-Id: Ie2f34cfeb48a5d7762fc3d63be02267ce37d45d0
Auto-generated-cl: translation import
2013-11-11 08:22:01 -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
dd4f9e8b61
Merge "Update the media router dialogs and integrate into system UI." into klp-dev
2013-11-11 05:59:38 +00:00
Jeff Brown
12c32b4d48
Merge "Make quick settings show the standard media router icon." into klp-dev
2013-11-11 05:59:29 +00:00
Sonia Sharma
3b98a287ae
am a877cbcc: am 26f54442: Merge "Remove TMobile Tethering APN from default builds" into klp-dev
...
* commit 'a877cbcc411804097e99f6633d3c0a7e4e1ad249':
Remove TMobile Tethering APN from default builds
2013-11-10 19:26:56 -08:00
Sonia Sharma
a877cbcc41
am 26f54442: Merge "Remove TMobile Tethering APN from default builds" into klp-dev
...
* commit '26f54442a4e29affe785048373fffc51c4db4e4c':
Remove TMobile Tethering APN from default builds
2013-11-10 19:24:11 -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
Robert Greenwalt
a785e2add4
Remove TMobile Tethering APN from default builds
...
bug:11383698
Change-Id: I037b42a85851e2cf14afdd30c6604e6b9586bc80
2013-11-08 19:35:50 -08:00
Michael Wright
5f31a4bd90
Merge "Remove unnecessary input event indirection"
2013-11-08 23:25:37 +00: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
Ruben Brunk
913c0e38a1
am 70285910: am e73b41b2: camera2: Remove prior repeating request when setting.
...
* commit '70285910ab43edc27c86783e4c97a1a3c9d914c5':
camera2: Remove prior repeating request when setting.
2013-11-08 11:16:12 -08:00
Ruben Brunk
70285910ab
am e73b41b2: camera2: Remove prior repeating request when setting.
...
* commit 'e73b41b27f16b160cfe49bdcac3091dce94229ae':
camera2: Remove prior repeating request when setting.
2013-11-08 10:06:32 -08:00
Elliott Hughes
443e3a209c
am 5c1aa4ef: am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."
...
* commit '5c1aa4efa9568d38cd2e8756a274bb30ddd590ba':
Remove incorrect (and unused) capget code.
2013-11-07 23:08:13 -08:00
Elliott Hughes
5c1aa4efa9
am ede7f9d3: am 9e71310d: Merge "Remove incorrect (and unused) capget code."
...
* commit 'ede7f9d3a39d87f12d58df495f28108784e9b588':
Remove incorrect (and unused) capget code.
2013-11-07 23:05:33 -08:00
Elliott Hughes
ede7f9d3a3
am 9e71310d: Merge "Remove incorrect (and unused) capget code."
...
* commit '9e71310d15d9dfcbf5e1c94948e0260f3dc3e678':
Remove incorrect (and unused) capget code.
2013-11-07 23:03:43 -08:00
Elliott Hughes
42a4bb5730
Remove incorrect (and unused) capget code.
...
Note that if you revert this change, the code it removes is incorrect,
and doesn't handle the top 32 bits of capabilities, one of which we're
already using: CAP_BLOCK_SUSPEND.
Bug: 11508244
Change-Id: Ice1f51334bce4941c6d24d6016450a2ebcf92886
2013-11-07 22:35:23 -08:00
Maxim Siniavine
5267bb247f
am 134b9146: am d66cbc0b: am 598a7aed: Merge "Fix BandwidthTest to report correct stats." into klp-dev
...
* commit '134b91469c2894477dda786c1572b80b596c62ac':
Fix BandwidthTest to report correct stats.
2013-11-07 21:30:31 -08:00
Ruben Brunk
e73b41b27f
camera2: Remove prior repeating request when setting.
...
Bug: 11579778
Change-Id: Idb10662413ff5ee939adbdeab68a97cb34750fac
2013-11-07 19:30:43 -08:00
Michael Wright
c9c487e6d6
Remove unnecessary input event indirection
...
Rather than have a class whose sole job is to pass messages to
PointerLocationView, just have it consume them itself.
Change-Id: I889ce35d99852f746499c0585dc7c43378b4c3a0
2013-11-07 18:55:09 -08:00
Michael Wright
42ae5f3196
Merge "Disable unused parameter warning for jni code"
2013-11-08 02:39:39 +00:00
Michael Wright
1fc1834d66
Disable unused parameter warning for jni code
...
Change-Id: Iee2620186c8868d86ccb5f8d0fd6239079638e2d
2013-11-07 18:33:05 -08:00
Maxim Siniavine
134b91469c
am d66cbc0b: am 598a7aed: Merge "Fix BandwidthTest to report correct stats." into klp-dev
...
* commit 'd66cbc0bb28b016359f696da45939cab30c71906':
Fix BandwidthTest to report correct stats.
2013-11-07 18:03:22 -08:00
Maxim Siniavine
d66cbc0bb2
am 598a7aed: Merge "Fix BandwidthTest to report correct stats." into klp-dev
...
* commit '598a7aedfb6b77fc98bace9f420968a6f3ed637e':
Fix BandwidthTest to report correct stats.
2013-11-07 18:01:04 -08:00
Maxim Siniavine
598a7aedfb
Merge "Fix BandwidthTest to report correct stats." into klp-dev
2013-11-08 01:56:16 +00:00
Jeff Brown
7da5bbedc7
am c2b652fd: am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
...
* commit 'c2b652fd4d386b79dc99af249b6ad3844e53fdf1':
Add media router service and integrate with remote displays.
2013-11-07 17:47:25 -08:00
Jeff Brown
6c58d890f3
am 84d76025: am eb223425: am 1f7a8a06: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit '84d760257f46232601e5f47411fb4e59f57f1872':
Add a platform library for remote display providers.
2013-11-07 17:47:21 -08:00
Jeff Brown
c2b652fd4d
am 5182ea4b: am d40a4d74: Merge "Add media router service and integrate with remote displays." into klp-dev
...
* commit '5182ea4bb20ec8fbe9562d0eaae8135d433ea0b6':
Add media router service and integrate with remote displays.
2013-11-07 17:44:14 -08:00
Jeff Brown
84d760257f
am eb223425: am 1f7a8a06: Merge "Add a platform library for remote display providers." into klp-dev
...
* commit 'eb223425e38cd9a3da12cd38c8c41e696c6b7e96':
Add a platform library for remote display providers.
2013-11-07 17:44:10 -08:00