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

113391 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eino-Ville Talvala
9edb77412e am 4c76fdd8: Merge "Fix build." into klp-dev 
* commit '4c76fdd8f213f4aa37a58b3d6f625c6d4269f619':
  Fix build.
 2013-10-04 16:26:43 -07:00
Chet Haase
845d9192d7 Merge "Enable transitions in lockscreen media controller" into klp-dev 2013-10-04 23:26:37 +00:00
Scott Main
920de6c632 am 332408f8: update version number for doc stamp 
* commit '332408f86290bc02090d69f3a4b08ed959d93b62':
  update version number for doc stamp
 2013-10-04 16:23:16 -07: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
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
bafa437ff5 am 29268255: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '29268255078f05f2441311de94f903e18747e323':
  Import translations. DO NOT MERGE
 2013-10-04 16:00:41 -07:00
Baligh Uddin
673b0fe282 am 15800b79: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '15800b793b9cc0aa412b87a4dedd5770f583d1cf':
  Import translations. DO NOT MERGE
 2013-10-04 15:57:12 -07:00
Baligh Uddin
70d87e1408 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 22:55:43 +00:00
Baligh Uddin
2926825507 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-04 22:55:38 +00:00
Baligh Uddin
8084b10887 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 22:53:10 +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
079320a2ad am 3f48f6aa: Merge "Camera2: Verbosity is verboten." into klp-dev 
* commit '3f48f6aa6c3723a4143a4505520136d5b682a696':
  Camera2: Verbosity is verboten.
 2013-10-04 15:30:58 -07:00
Eino-Ville Talvala
3f48f6aa6c Merge "Camera2: Verbosity is verboten." into klp-dev 2013-10-04 22:27:59 +00:00
Chet Haase
956b23f4e3 am a0364e23: Merge "Fix infinite recursion in hashcode of Spannables" into klp-dev 
* commit 'a0364e23601db099b02fd280f91d2d3ecc2b0cc4':
  Fix infinite recursion in hashcode of Spannables
 2013-10-04 15:15:37 -07:00
Adam Lesinski
2b8e82fd51 AAPT emits error for res with no 'default' product 
Rather than ignoring resources that do not match the specified
product, we keep track of the ignored ones and make sure that
some variant of the resource that matches the product was processed.

bug:10860838
Change-Id: I804cd04a053269a35b7e1c1cc743b77493337bf9
 2013-10-04 15:14:09 -07: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
538df3437b am 331f9e79: Merge "Print attributes hint not honored." into klp-dev 
* commit '331f9e79ad16e7d9d51e8481e6bc21642a51c340':
  Print attributes hint not honored.
 2013-10-04 15:10:59 -07:00
Svetoslav Ganov
331f9e79ad Merge "Print attributes hint not honored." into klp-dev 2013-10-04 22:08:25 +00:00
Alan Viverette
8d6730fd30 am b89e969c: Merge "Fix font scaling issues in FastScroller and SubtitleView" into klp-dev 
* commit 'b89e969cef91cc20499d955fd49286fde4a401e7':
  Fix font scaling issues in FastScroller and SubtitleView
 2013-10-04 15:07:15 -07:00
Jeff Sharkey
2dcba613a7 am 5b491d63: Merge "Custom pressed states, fixed column sizes." into klp-dev 
* commit '5b491d630b6628a3558cb1135ac1bc242eab3381':
  Custom pressed states, fixed column sizes.
 2013-10-04 15:07:13 -07:00
Raph Levien
2a32771ace am 24871f63: Merge "Fix Text appears on top of existing text when composing in gmail." into klp-dev 
* commit '24871f6375b87eb2d540f06ec292e5f4a198f78a':
  Fix Text appears on top of existing text when composing in gmail.
 2013-10-04 15:07:10 -07: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
77b7f39f51 am fc141ef2: Merge "Avoid NPE when ProviderInfo is missing." into klp-dev 
* commit 'fc141ef20bf871e925fbbbe4bb9af64c67033246':
  Avoid NPE when ProviderInfo is missing.
 2013-10-04 14:52:24 -07: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
Alex Ray
2bbf0bfc16 am 0ab7c883: Merge "Add Consumer IR feature" into klp-dev 
* commit '0ab7c883d51288f62ba605d5a797abd71ad68626':
  Add Consumer IR feature
 2013-10-04 14:16:21 -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
3f90705a47 am 795b6e42: Merge "add -since flag for api level 19 to filter javadocs" into klp-dev 
* commit '795b6e42c8d6953a44a3ea57c880aa5a2b890426':
  add -since flag for api level 19 to filter javadocs
 2013-10-04 13:44:59 -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
Alan Viverette
af43110c02 Provide example actions in AccessibilityEvent.setAction() docs 
BUG: 11070461
Change-Id: I05799e721dd1285e5165e94c7d63084010fa478b
 2013-10-04 13:16:51 -07:00
Baligh Uddin
ac5926df6c Import translations. DO NOT MERGE 
Change-Id: I9201a5c9e75f3f26a9f7e06d54b0ebf70dad0aa4
Auto-generated-cl: translation import
 2013-10-04 12:52:45 -07: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
ea4bb0f22e Import translations. DO NOT MERGE 
Change-Id: I02db1cc8b0dd7b42e6dd9d3dcd6bb1444439abff
Auto-generated-cl: translation import
 2013-10-04 12:24:38 -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
bf99468ae8 Merge "Import translations. DO NOT MERGE" into klp-ub-dev 2013-10-04 19:22:07 +00:00
Baligh Uddin
f343fbd82a am af0c8bfb: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'af0c8bfbc5baf6a96de66e11cb2041c8fefe7cc5':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:43 -07:00
Robert Greenwalt
1c6fdd6c7b am cac2fd30: Merge "Revert "Use a build-specific wifi country code"" into klp-dev 
* commit 'cac2fd302e844a4a46bb1749a2d2ed4739b4dc53':
  Revert "Use a build-specific wifi country code"
 2013-10-04 12:02:39 -07:00
Baligh Uddin
ba78a70c1d am 548622a2: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '548622a26ac758f72eb0dbb16cd83aa5d51f2b2b':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:36 -07:00
Baligh Uddin
626bbd23cf am 5b40f4fc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '5b40f4fcac425fdc4c031dee5fb67c5f44fde968':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:34 -07:00
Baligh Uddin
e5449a3b44 am eba7c748: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'eba7c74871a71e0efec56aad779cc06c36391ed9':
  Import translations. DO NOT MERGE
 2013-10-04 12:02:31 -07:00
Robert Greenwalt
2e23484eec am f3f1a370: Merge "Un-deprecate getDhcpInfo" into klp-dev 
* commit 'f3f1a3709306454c0ca562e2c7262d4889dd0071':
  Un-deprecate getDhcpInfo
 2013-10-04 12:02:29 -07:00