112805 Commits

Author SHA1 Message Date
Scott Main
332408f862 update version number for doc stamp
Change-Id: I881510209a56204a464df082840d2dde56312303
2013-10-04 16:17:50 -07:00
Eino-Ville Talvala
227c09f998 Fix build.
Change-Id: I1c3537d936fd467014b966179f5ed2a8c6a696da
2013-10-04 16:14:38 -07:00
Baligh Uddin
2926825507 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 22:55:38 +00:00
Baligh Uddin
15800b793b Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 22:53:07 +00:00
Eino-Ville Talvala
3f48f6aa6c Merge "Camera2: Verbosity is verboten." into klp-dev 2013-10-04 22:27:59 +00:00
Chet Haase
a0364e2360 Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 2013-10-04 22:12:09 +00:00
Svetoslav Ganov
331f9e79ad Merge "Print attributes hint not honored." into klp-dev 2013-10-04 22:08:25 +00:00
Alan Viverette
b89e969cef Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 2013-10-04 22:04:00 +00:00
Jeff Sharkey
5b491d630b Merge "Custom pressed states, fixed column sizes." into klp-dev 2013-10-04 22:03:43 +00:00
Raph Levien
24871f6375 Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 2013-10-04 22:02:56 +00:00
Jeff Sharkey
fc141ef20b Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 2013-10-04 21:49:07 +00:00
Jeff Sharkey
ca25db0cb3 Custom pressed states, fixed column sizes.
Use custom pressed state assets.  Use fixed column sizes to prevent
truncating of long dates on small screens.

Also tear down any active CAB when switching fragments.

Bug: 11032418, 11028212
Change-Id: I2bf3dc3f693319b4b55cc901ed460f60faceba35
2013-10-04 14:48:08 -07:00
Eino-Ville Talvala
51ca8d6bc0 Camera2: Verbosity is verboten.
Bug: 10360518
Change-Id: I155effad61099535bee77cc0d0e380420d96770d
2013-10-04 14:39:58 -07:00
Robert Greenwalt
5ab9af410e am f76b5383: DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'f76b5383cd568dcfafb6819449b846ff76072c44':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:17:18 -07:00
Robert Greenwalt
8098bfac6a am dd8e315b: (-s ours) DO NOT MERGE Un-deprecate getDhcpInfo
* commit 'dd8e315b86614627eb8ba629c713d73034fed357':
  DO NOT MERGE Un-deprecate getDhcpInfo
2013-10-04 14:15:52 -07:00
Alex Ray
0ab7c883d5 Merge "Add Consumer IR feature" into klp-dev 2013-10-04 21:13:35 +00:00
Chet Haase
aa00613322 Enable transitions in lockscreen media controller
Media controller now fades between different states. The code for
doing this was already there, but this CL enables them and changes
the behavior of transition's OnPreDrawListener to do the right thing.

Also, this CL fixes a bug in ChangeText found while testing this change.

Issue #11083563 ChangeText transition crashes when KEEP transition type used

Change-Id: I5e04c28e1b5faac017b0a4e49734d9faa7fe79cd
2013-10-04 14:05:48 -07:00
Jeff Sharkey
9095c5a823 Avoid NPE when ProviderInfo is missing.
Bug: 11052428
Change-Id: I6cb0cf2030a28f571c3f13cd0b9ba76627974697
2013-10-04 13:53:50 -07:00
Scott Main
795b6e42c8 Merge "add -since flag for api level 19 to filter javadocs" into klp-dev 2013-10-04 20:41:09 +00:00
Baligh Uddin
57c8f4f259 Import translations. DO NOT MERGE
Change-Id: I17e711092eecfea0af5f133185672b729f8d4bf1
Auto-generated-cl: translation import
2013-10-04 12:50:57 -07:00
Baligh Uddin
dfe1303d93 Import translations. DO NOT MERGE
Change-Id: Id6fb45a4be5a4e32cd673127862ff413526dcc7b
Auto-generated-cl: translation import
2013-10-04 12:23:39 -07:00
Baligh Uddin
af0c8bfbc5 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:48:44 +00:00
Svetoslav Ganov
7be27acac9 Print attributes hint not honored.
1. Initially we have a single printer, the fake PDF printer, and
   wait for printers to be discovered. This printer was handling
   only a couple of media sizes. Hence, if the app provides a
   media size hint and the PDF printer does not support it, we
   were essentially ignoring the suggested media size since it
   was not supported by the selected printer and we fell back to
   the default paper size for that printer. The fake PDF printer
   should support all predefined media sizes.

2. The list of available paper sizes was shown in the order they
   are added ignoring the current locale. It is much better user
   experience if the media sizes used in the current locale are
   shown at the top and all others after that. Also the media
   sizes for the current locale should be alphabetically ordered
   so the user can quickly find the desired one.

3. The orientation was reset on media size or printer change.

bug:10564537

Change-Id: Iaa0d42242730ce69cea3effd4d0f4bc087068804
2013-10-04 11:45:15 -07:00
Alan Viverette
7b63063625 Fix font scaling issues in FastScroller and SubtitleView
BUG: 11080227
Change-Id: I0aa84e9b56c6900ad47efd45a5a0f772ce43f810
2013-10-04 11:44:51 -07:00
Robert Greenwalt
dd8e315b86 DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
2013-10-04 18:43:29 +00:00
Baligh Uddin
6d4aa52733 Import translations. DO NOT MERGE
Change-Id: I927e06ba5d3e63e0744fac3faa82061dcf2c518d
Auto-generated-cl: translation import
2013-10-04 11:35:25 -07:00
Robert Greenwalt
cac2fd302e Merge "Revert "Use a build-specific wifi country code"" into klp-dev 2013-10-04 18:33:51 +00:00
Baligh Uddin
548622a26a Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:13:19 +00:00
Baligh Uddin
5b40f4fcac Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:13:03 +00:00
Baligh Uddin
eba7c74871 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 18:12:44 +00:00
Baligh Uddin
c170c22cc0 Import translations. DO NOT MERGE
Change-Id: I1227decae162536bf90ffb753308cb4018e0538e
Auto-generated-cl: translation import
2013-10-04 11:08:41 -07:00
Robert Greenwalt
f3f1a37093 Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Robert Greenwalt
0fb5a4d8ca Merge "Don't redirect dns to an iface without dns servers" into klp-dev 2013-10-04 18:06:13 +00:00
Baligh Uddin
fb60905c65 Import translations. DO NOT MERGE
Change-Id: I0774c814f839f7a06aaa3cb023782e8eb0adf305
Auto-generated-cl: translation import
2013-10-04 11:05:28 -07:00
Baligh Uddin
3eb6b8d626 Import translations. DO NOT MERGE
Change-Id: Id91951dbb1084dd04fd93aa1cd26b6b558ff33ef
Auto-generated-cl: translation import
2013-10-04 11:02:34 -07:00
Dianne Hackborn
ae7b22d61d Merge "Fix issue #10901205: Shouldn't send broadcasts (or try to bind services, etc.)..." into klp-dev 2013-10-04 17:47:34 +00:00
Robert Greenwalt
cb2fe96f2c Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: Ibe981ae90e1c6c2f1b65fa225443ae4cc92c2a3a
2013-10-04 09:53:39 -07:00
Svetoslav Ganov
6bf1029900 Merge "Deleting print job files when we do not have to." into klp-dev 2013-10-04 16:50:53 +00:00
Dianne Hackborn
2d94c57345 Merge "Fix issue #11069176: Crash showing process stats" into klp-dev 2013-10-04 16:49:05 +00:00
Svetoslav
5c126892ec Merge "Print UI tweaks as per UX request." into klp-dev 2013-10-04 15:58:10 +00:00
Svetoslav Ganov
2b40c83ae1 Deleting print job files when we do not have to.
The print job file name was not properly parsed. This resulted
in incorrect mapping from file to print job, thus deleting the
file when we do not have to.

bug:11069354

Change-Id: I7b8a7a7f98dd77b34119f2a9cd16a6ec3c22b63b
2013-10-04 08:49:32 -07:00
Robert Greenwalt
f76b5383cd DO NOT MERGE Un-deprecate getDhcpInfo
Replacement api isn't available.

bug:10003785
Change-Id: I0c91716d9aae61dc1db4d015a78b729157ea99a9
2013-10-04 08:19:37 -07:00
Eric Laurent
15bcc2d82f Merge "audioservice: fix DTMF stream volume" into klp-dev 2013-10-04 15:18:32 +00:00
Chet Haase
1d3c4b396a Fix infinite recursion in hashcode of Spannables
An app created a SpannableStringBuilder, one of which's spans was the
instance of the string builder itself (that is, the builder contained a span
that was the builder). This caused infinite recursion in the hashcode()
method because it computes a hash from its fields, including all of its spans.

The fix detects the case where a span equals the current instance and
noops the computation on that span. A similar adjustment was made to equals()
to avoid the same recursion problem.

Issue #11051658 StackOverflowError in android.text.SpannableStringBuilder.hashCode

Change-Id: I742687ab32d81ac51c4b9135f698cf5e96a1d295
2013-10-04 07:24:19 -07:00
Jonathan Dixon
050c552f09 Fix CookieSyncManager for WebViewClassic
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
2013-10-04 14:23:47 +01:00
Jim Miller
3d61bf45e5 Merge "Replace searchlight asset" into klp-dev 2013-10-04 02:26:56 +00:00
Jim Miller
d34de7304c Replace searchlight asset
Fixes bug 11030712

Change-Id: Ia25dec35dd3a8d59f98521e579bc1d269518c395
2013-10-03 19:20:58 -07:00
Jim Miller
fea784ddec Merge "Fix bug where dismiss() was being called from the wrong thread" into klp-dev 2013-10-04 02:18:42 +00:00
Jim Miller
6001379bff Fix bug where dismiss() was being called from the wrong thread
One-way calls to binder do not guarantee the call will always
occur on the originating thread.  This fixes a rare case where
keyguard would crash due to dismiss() being called from the wrong
thread.

Fixes bug 11065316

Change-Id: Iddd281964231a152e3342e21b6b88527eab94caf
2013-10-03 18:31:34 -07:00
Adam Powell
8c5b15c628 Merge "Fix a bug in action menu measurement" into klp-dev 2013-10-04 01:29:34 +00:00