Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
116,086 Commits 3 Branches 0 Tags
b2bb7ddebe66dae8705d9e5e4c401c003dbfdb79
Commit Graph

35177 Commits

Author SHA1 Message Date
Svetoslav
6754f68f49 am 133c1faf: am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '133c1faf8c4450c5ad45dea13323d45dfb60817b':
  Small print API tweaks
 2013-10-04 17:37:21 -07:00
Chet Haase
b0891e66b4 am 5c44b36b: am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev 
* commit '5c44b36b2a5f44bdba53244ee423aeeea14c485e':
  Enable transitions in lockscreen media controller
 2013-10-04 17:37:11 -07:00
Eino-Ville Talvala
fb205d1096 am 3afc7f15: am 9edb7741: am 4c76fdd8: Merge "Fix build." into klp-dev 
* commit '3afc7f15c66563c7c966ff44f2a385779678e547':
  Fix build.
 2013-10-04 17:37:07 -07:00
Eino-Ville Talvala
13613231c2 am eef7e31c: am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit 'eef7e31c2db116f7064ffd991c670f8b798fad31':
  Camera2: Verbosity is verboten.
 2013-10-04 17:36:32 -07:00
Chet Haase
e986ffa887 am 280d250c: am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit '280d250c70db2c096f3639307235a4d62f0ca38f':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 17:36:25 -07:00
Svetoslav Ganov
2829955b6c am 0d9ff161: am 538df343: am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '0d9ff1613a290a0c9b197a099c898ccc9cc5f60c':
  Print attributes hint not honored.
 2013-10-04 17:36:21 -07:00
Alan Viverette
14b875b09b am 6de0ee41: am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit '6de0ee41f9a9668180368d82da688793cef9489d':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 17:36:17 -07:00
Raph Levien
d0607035e3 am a488c796: am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit 'a488c79605d0629986bb636bc2a2bc86f4947686':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 17:36:08 -07:00
Jeff Sharkey
0841c51696 am 43fac87f: am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit '43fac87f2a8f4843614a5784b830801a90f30150':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 17:35:54 -07:00
Svetoslav
133c1faf8c am 67d7af51: am 19565ad1: Merge "Small print API tweaks" into klp-dev 
* commit '67d7af514c2a393cbe886ebf5527a0dc45817cfb':
  Small print API tweaks
 2013-10-04 16:51:58 -07:00
Svetoslav
19565ad1a1 Merge "Small print API tweaks" into klp-dev 2013-10-04 23:48:37 +00:00
Chet Haase
5c44b36b2a am 3980ae47: am 845d9192: Merge "Enable transitions in lockscreen media controller" into klp-dev 
* commit '3980ae478b290bc472f20289b67b6719439b12fa':
  Enable transitions in lockscreen media controller
 2013-10-04 16:34:14 -07:00
Eino-Ville Talvala
3afc7f15c6 am 9edb7741: am 4c76fdd8: Merge "Fix build." into klp-dev 
* commit '9edb77412e2f82540627c993f9ddf024726cc386':
  Fix build.
 2013-10-04 16:30:22 -07:00
Chet Haase
845d9192d7 Merge "Enable transitions in lockscreen media controller" into klp-dev 2013-10-04 23:26:37 +00:00
Eino-Ville Talvala
4c76fdd8f2 Merge "Fix build." into klp-dev 2013-10-04 23:21:55 +00:00
Svetoslav
b450d0d4d7 Small print API tweaks 
1. Removed an unused public constant

2. Hide PrintFileDocumentAdapter which makes doing the wring
   thing easy.

3. We allow a print service to set a tag of a print job which is
   an arbitrary string it only knows how to interpret. Typically,
   this is the id of a remote print job. This tag was visible to
   applications which is wrong - this is data that should be
   private to the print service. Now the print service is the
   only one to see that.

bug:11084635

Change-Id: I763ea9ff0fdf647805bc36e1737d72263090714d
 2013-10-04 16:21:12 -07:00
Eino-Ville Talvala
227c09f998 Fix build. 
Change-Id: I1c3537d936fd467014b966179f5ed2a8c6a696da
 2013-10-04 16:14:38 -07:00
Eino-Ville Talvala
eef7e31c2d am 079320a2: am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit '079320a2adb2654c6aa008ae7f369c538434abfa':
  Camera2: Verbosity is verboten.
 2013-10-04 15:33:06 -07:00
Eino-Ville Talvala
3f48f6aa6c Merge "Camera2: Verbosity is verboten." into klp-dev 2013-10-04 22:27:59 +00:00
Chet Haase
280d250c70 am 956b23f4: am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit '956b23f4e3b9cac88ea4627bbe4783b165beec03':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 15:18:56 -07:00
Svetoslav Ganov
0d9ff1613a am 538df343: am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '538df3437b80d15b07cda2464b2ae4e5bae8219b':
  Print attributes hint not honored.
 2013-10-04 15:14:15 -07:00
Chet Haase
a0364e2360 Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 2013-10-04 22:12:09 +00:00
Alan Viverette
6de0ee41f9 am 8d6730fd: am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit '8d6730fd30dd6aa4b186591f210dd5e74d117921':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 15:10:19 -07:00
Raph Levien
a488c79605 am 2a32771a: am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit '2a32771ace5250ec919a08da688e2d6c91e5c132':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 15:10:13 -07: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
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
43fac87f2a am 77b7f39f: am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit '77b7f39f512a34a9af0013cc7e01142192901d67':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 14:56:18 -07:00
Jeff Sharkey
fc141ef20b Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 2013-10-04 21:49:07 +00:00
Eino-Ville Talvala
51ca8d6bc0 Camera2: Verbosity is verboten. 
Bug: 10360518
Change-Id: I155effad61099535bee77cc0d0e380420d96770d
 2013-10-04 14:39:58 -07:00
Alex Ray
1ac74b74ff am 849ef427: am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev 
* commit '849ef427b804c3d308e2d74eebd64e19144ef976':
  Add Consumer IR feature
 2013-10-04 14:21:20 -07:00
Alex Ray
849ef427b8 am 2bbf0bfc: am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev 
* commit '2bbf0bfc16358382589d56efcc0ea9e63807e941':
  Add Consumer IR feature
 2013-10-04 14:18:37 -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
Robert Greenwalt
3378384123 am 72566b98: am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit '72566b98dba80f21923cb6b299754d510951d611':
  Revert "Use a build-specific wifi country code"
 2013-10-04 13:36:49 -07:00
Robert Greenwalt
16f3c140cb am 1db7024c: am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev 
* commit '1db7024c50abe49d8881d458b3317ccff3de1832':
  Un-deprecate getDhcpInfo
 2013-10-04 13:36:38 -07:00
Robert Greenwalt
72566b98db am 1c6fdd6c: am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit '1c6fdd6c7b58b7f25d49fd26a29a03a478cc5937':
  Revert "Use a build-specific wifi country code"
 2013-10-04 13:34:22 -07:00
Robert Greenwalt
1db7024c50 am 2e23484e: am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev 
* commit '2e23484eec2321537e843168f76cba4c18b56f95':
  Un-deprecate getDhcpInfo
 2013-10-04 13:34:08 -07: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
cac2fd302e Merge "Revert "Use a build-specific wifi country code"" into klp-dev 2013-10-04 18:33:51 +00:00
Jonathan Dixon
13ca868b82 am 3bd13f3a: am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '3bd13f3a74a2dd47c217fda206490334747293cc':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 11:10:48 -07:00
Adam Powell
e580a2f1a1 am bf7116a9: am 049e663c: am 8c5b15c6: Merge "Fix a bug in action menu measurement" into klp-dev 
* commit 'bf7116a9ddeff368b6a33fabfaa82ce974d5ee0d':
  Fix a bug in action menu measurement
 2013-10-04 11:10:20 -07:00
Wink Saville
0cbc781134 am e7329140: am fe587dba: am a48ccdd6: Merge "Use networkType to display wifi and mobile notification separately." into klp-dev 
* commit 'e7329140c0ff846acf5bc8749f525b18880177ef':
  Use networkType to display  wifi and mobile notification separately.
 2013-10-04 11:10:16 -07:00
Chet Haase
f642163761 am 74cf1456: am f37696b7: am 76a5c86d: Merge "Fix lockscreen wave animation artifacts" into klp-dev 
* commit '74cf1456466bf5d1551f097611219ad6605800a3':
  Fix lockscreen wave animation artifacts
 2013-10-04 11:09:46 -07:00
Robert Greenwalt
f3f1a37093 Merge "Un-deprecate getDhcpInfo" into klp-dev 2013-10-04 18:07:34 +00:00
Alan Viverette
1461e26674 resolved conflicts for merge of 92a827b8 to master 
Change-Id: Ia262f5c80cdaa391db08f766cee62919a8705e80
 2013-10-04 10:17:09 -07: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
Dianne Hackborn
a37bbc6afc am 8a5f7ab6: am 22c298a5: am 7192c6d7: Merge "KLP/KitKat is now API 19." into klp-dev 
* commit '8a5f7ab6e18e05a54a3ae7e0acb7e1b728ad613c':
  KLP/KitKat is now API 19.
 2013-10-04 09:11:32 -07:00