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

76688 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
3c5f924327 The BigTextStyle should never render mContentText 
Change-Id: Ifcbb0868871741bd78c5ebf31408143aaf732b98
 2012-05-04 13:32:18 -07:00
Fabrice Di Meglio
67482ed49a am fc6ef88a: (-s ours) am 8396830d: Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev 
* commit 'fc6ef88a3d9f0649ed9cd16043433c8f1352c18f':
  Hide RTL related APIs - DO NOT MERGE
 2012-05-04 13:24:51 -07:00
Fabrice Di Meglio
fc6ef88a3d am 8396830d: Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev 
* commit '8396830d8fedc08c0a9de36bcce3c8b65691729f':
  Hide RTL related APIs - DO NOT MERGE
 2012-05-04 13:21:59 -07:00
Fabrice Di Meglio
dd2331377b am 797243a7: am e12c5949: Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev 
* commit '797243a719461c663eb34fad28533b8362712b58':
  Use paint typeface for shaping when it supports the requested script.
 2012-05-04 13:20:58 -07:00
Fabrice Di Meglio
8396830d8f Merge "Hide RTL related APIs - DO NOT MERGE" into jb-dev 2012-05-04 13:19:41 -07:00
Fabrice Di Meglio
38ed134bc4 am 527c7c3f: am e5c67bf7: Merge "Make Arabic script runs longer (for performance) - bug 6426451." into jb-dev 
* commit '527c7c3f0771de0f78da3283fd74f76410efd420':
  Make Arabic script runs longer (for performance) - bug 6426451.
 2012-05-04 13:17:46 -07:00
Fabrice Di Meglio
797243a719 am e12c5949: Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev 
* commit 'e12c59491ea01417987216e2dc6a12e482982d60':
  Use paint typeface for shaping when it supports the requested script.
 2012-05-04 13:16:55 -07:00
Fabrice Di Meglio
66388dcb09 Hide RTL related APIs - DO NOT MERGE 
- fix bug #6441155 API review: @hide RTL layout APIs

Change-Id: I13c5ea5f579cecffed9d517f06180ab0576cd26a
 2012-05-04 13:15:12 -07:00
Fabrice Di Meglio
527c7c3f07 am e5c67bf7: Merge "Make Arabic script runs longer (for performance) - bug 6426451." into jb-dev 
* commit 'e5c67bf7e14392feb54c26b7576b4d6c36b0068e':
  Make Arabic script runs longer (for performance) - bug 6426451.
 2012-05-04 13:13:45 -07:00
John Reck
d4717b8b6f Verify attached before showing a dialog 
Bug: 6372828

Change-Id: I7f3360ab8a0cdcaf20829e6e2c9181c7af73586e
 2012-05-04 13:13:38 -07:00
Fabrice Di Meglio
e12c59491e Merge "Use paint typeface for shaping when it supports the requested script." into jb-dev 2012-05-04 13:12:23 -07:00
Fabrice Di Meglio
e5c67bf7e1 Merge "Make Arabic script runs longer (for performance) - bug 6426451." into jb-dev 2012-05-04 13:11:24 -07:00
Daniel Sandler
ed5632d0e9 am f53716ed: am a1f084e8: Merge "Fix NPEs in StatusBarTest." into jb-dev 
* commit 'f53716ed9e544c3042813d70383bdc23c7b00a77':
  Fix NPEs in StatusBarTest.
 2012-05-04 13:07:35 -07:00
Daniel Sandler
f53716ed9e am a1f084e8: Merge "Fix NPEs in StatusBarTest." into jb-dev 
* commit 'a1f084e8a22385d8ab4ea8a2e5bb6abf1768f8bb':
  Fix NPEs in StatusBarTest.
 2012-05-04 13:03:25 -07:00
Chris Wren
bd41275441 am cdea2a3e: am d213524d: Merge "Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract." into jb-dev 
* commit 'cdea2a3e654543ecdf27528d505787770c1b5feb':
  Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract.
 2012-05-04 13:02:05 -07:00
Daniel Sandler
a1f084e8a2 Merge "Fix NPEs in StatusBarTest." into jb-dev 2012-05-04 13:01:25 -07:00
Jeff Sharkey
c04edc4abf am 74f64d78: am bb1492f7: Merge "Reduce persist threshold for lower warning/limit." into jb-dev 
* commit '74f64d78e5536a3b47d68636bad438d94426e275':
  Reduce persist threshold for lower warning/limit.
 2012-05-04 12:59:14 -07:00
Jeff Sharkey
353f8c7d33 am 3ddb4f80: am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev 
* commit '3ddb4f80e5cb47173b78430399076c4c3d1bb178':
  Begin collecting xtables iface counters.
 2012-05-04 12:59:11 -07:00
Jeff Sharkey
b7dd1155e5 am 8e84ae36: am 15a5a87e: Merge "Block metered APNs when app is restricted." into jb-dev 
* commit '8e84ae36537ce9c89e85c75ac084b25423e863c4':
  Block metered APNs when app is restricted.
 2012-05-04 12:59:09 -07:00
Chris Wren
cdea2a3e65 am d213524d: Merge "Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract." into jb-dev 
* commit 'd213524d8fad57462a87d5f9bc874e09effdef7d':
  Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract.
 2012-05-04 12:58:00 -07:00
Chris Wren
d213524d8f Merge "Add an alternate title that can be used in the overflow of a InboxStyle. Always hide contentText for BigTextStyle and InboxStyle. Style cannot be used without specialization, it should be abstract." into jb-dev 2012-05-04 12:55:55 -07:00
Jeff Sharkey
74f64d78e5 am bb1492f7: Merge "Reduce persist threshold for lower warning/limit." into jb-dev 
* commit 'bb1492f7fae9fbcdfcb02b6f8475fd98a236c244':
  Reduce persist threshold for lower warning/limit.
 2012-05-04 12:54:49 -07:00
Jeff Sharkey
3ddb4f80e5 am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev 
* commit 'c065a8af1561544f1557e3f5036e45a4be4a6d7e':
  Begin collecting xtables iface counters.
 2012-05-04 12:54:46 -07:00
Jeff Sharkey
8e84ae3653 am 15a5a87e: Merge "Block metered APNs when app is restricted." into jb-dev 
* commit '15a5a87e374c26c2502c8b38ca00f80a34f3675f':
  Block metered APNs when app is restricted.
 2012-05-04 12:54:44 -07:00
Jeff Sharkey
bb1492f7fa Merge "Reduce persist threshold for lower warning/limit." into jb-dev 2012-05-04 12:53:14 -07:00
Jeff Sharkey
c065a8af15 Merge "Begin collecting xtables iface counters." into jb-dev 2012-05-04 12:53:02 -07:00
Jeff Sharkey
15a5a87e37 Merge "Block metered APNs when app is restricted." into jb-dev 2012-05-04 12:52:49 -07:00
Eric Fischer
5ae9587e06 Import translations. DO NOT MERGE 
Change-Id: I6e403fe9ca4fa19ebac1a8f6b61ce273dcf58523
 2012-05-04 12:51:51 -07:00
Eric Fischer
1f2740cd73 Import translations. DO NOT MERGE 
Change-Id: I0731da1e265e2684fd7acb76fddd76cebcdf0e1e
 2012-05-04 12:47:16 -07:00
Chris Wren
d6297dbfe9 Add an alternate title that can be used in the overflow of a InboxStyle. 
Always hide contentText for BigTextStyle and InboxStyle.
Style cannot be used without specialization, it should be abstract.

Bug: 6428978
Bug: 6274137
Bug: 6317471
Change-Id: I21531a94494f891a058a477805b177e736b921cf
 2012-05-04 12:45:38 -07:00
Dianne Hackborn
ddc52a80b5 Fix issue #6426645: API REVIEW: android.app.ActivityOptions 
Change-Id: If2f7b987e1825a8b0ebaf2c499924dfc1527274b
 2012-05-04 12:04:40 -07:00
George Mount
977b97b1c9 am c24c069e: am a2c21308: Merge "Limit when auto-complete popups attach to WebView." into jb-dev 
* commit 'c24c069e2bd925d1644e8dd5ffeff5242cbb2d4f':
  Limit when auto-complete popups attach to WebView.
 2012-05-04 11:49:43 -07:00
George Mount
c24c069e2b am a2c21308: Merge "Limit when auto-complete popups attach to WebView." into jb-dev 
* commit 'a2c213080d26c08235f11829fb2bbcf07cdfdd46':
  Limit when auto-complete popups attach to WebView.
 2012-05-04 11:47:07 -07:00
George Mount
a2c213080d Merge "Limit when auto-complete popups attach to WebView." into jb-dev 2012-05-04 11:44:54 -07:00
Romain Guy
de4368687e am edc773ca: am 531d164d: Merge "Fix javadoc" into jb-dev 
* commit 'edc773cab7a3e89752747419cd67a18e12c44901':
  Fix javadoc
 2012-05-04 11:42:55 -07:00
Romain Guy
edc773cab7 am 531d164d: Merge "Fix javadoc" into jb-dev 
* commit '531d164d677b5f924896fd758d8f544ed7a8d07a':
  Fix javadoc
 2012-05-04 11:40:07 -07:00
Romain Guy
531d164d67 Merge "Fix javadoc" into jb-dev 2012-05-04 11:36:25 -07:00
Romain Guy
3dd4b51fc3 Fix javadoc 
Change-Id: I1f1262a9a385e981a98876f8396ad375ab74827d
 2012-05-04 11:31:01 -07:00
Andy Stadler
09b45a3ad9 Add System Tracing capability to Sync Manager 
This tracing code is enabled via "systrace.py --set-tags sync"

Change-Id: Ia8bc01adbba345a568405b0ac8ade96e56b40cc1
 2012-05-04 11:24:33 -07:00
Jean-Baptiste Queru
4b27125d88 Merge changes Ib28636e6,I93ebc433 
* changes:
  WallpaperManagerService does not properly propagate setDimensionHints()
  ImageWallpaper : get bitmap width before calc screen offset
 2012-05-04 11:05:44 -07:00
Chet Haase
c0400e9f26 am 78c481c1: am 4380f954: Merge "Minor doc fixes for animation- and view-related things" into jb-dev 
* commit '78c481c18254bb4b45329fd4e4cb4da381593a80':
  Minor doc fixes for animation- and view-related things
 2012-05-04 10:56:20 -07:00
Chet Haase
035744064b am d92c5c03: am 6c5f4cd0: Merge "Fix hang/crash in native path code" into jb-dev 
* commit 'd92c5c03d0fafe6f4c5f689eabd5024a4bbf262d':
  Fix hang/crash in native path code
 2012-05-04 10:53:21 -07:00
Chet Haase
78c481c182 am 4380f954: Merge "Minor doc fixes for animation- and view-related things" into jb-dev 
* commit '4380f9542fcb4a452332ecbea6a2036a2b159ab3':
  Minor doc fixes for animation- and view-related things
 2012-05-04 10:52:10 -07:00
Chet Haase
4380f9542f Merge "Minor doc fixes for animation- and view-related things" into jb-dev 2012-05-04 10:49:21 -07:00
Chet Haase
d92c5c03d0 am 6c5f4cd0: Merge "Fix hang/crash in native path code" into jb-dev 
* commit '6c5f4cd074e1ec4fd22a807aab409586f9b6b45f':
  Fix hang/crash in native path code
 2012-05-04 10:48:52 -07:00
Chet Haase
6c5f4cd074 Merge "Fix hang/crash in native path code" into jb-dev 2012-05-04 10:46:55 -07:00
John Reck
c52f0d3d80 am 722211ed: am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev 
* commit '722211ed8384122e85c45c0490a6fa411d255130':
  Monkeys are touching my destroyed stuff
 2012-05-04 10:34:15 -07:00
John Reck
722211ed83 am 90673b9d: Merge "Monkeys are touching my destroyed stuff" into jb-dev 
* commit '90673b9d0e33de1162a671995796171ba953d35d':
  Monkeys are touching my destroyed stuff
 2012-05-04 10:31:42 -07:00
Daniel Sandler
e7e9b6e033 Fix NPEs in StatusBarTest. 
Change-Id: I9245a297a9a09c09415dd38e662692665ae7e109
 2012-05-04 13:31:18 -04:00
John Reck
90673b9d0e Merge "Monkeys are touching my destroyed stuff" into jb-dev 2012-05-04 10:29:10 -07:00