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

76711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Stadler
1f1aed5e76 am c4be1b7e: Merge "Add System Tracing capability to Sync Manager" into jb-dev 
* commit 'c4be1b7e963413c110d8a6ee9fdd4fd7443fb2e0':
  Add System Tracing capability to Sync Manager
 2012-05-04 14:49:00 -07:00
Andy Stadler
c4be1b7e96 Merge "Add System Tracing capability to Sync Manager" into jb-dev 2012-05-04 14:46:00 -07:00
Fabrice Di Meglio
541eab6844 am ed1c345f: (-s ours) am 2b20212e: Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev 
* commit 'ed1c345f5e8fddfcfa8830578ffcdd4479b97c82':
  Hide Paint textLocale APIs - DO NOT MERGE
 2012-05-04 14:44:37 -07:00
Fabrice Di Meglio
ed1c345f5e am 2b20212e: Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev 
* commit '2b20212e16afed91881dfb7483f3c59cf1d0ebc4':
  Hide Paint textLocale APIs - DO NOT MERGE
 2012-05-04 14:41:18 -07:00
Fabrice Di Meglio
2b20212e16 Merge "Hide Paint textLocale APIs - DO NOT MERGE" into jb-dev 2012-05-04 14:39:18 -07:00
Eric Fischer
6e33771c32 am 80494792: (-s ours) am c9c199a5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '8049479267eecd38732bea06bd883d7c8e1ab79e':
  Import translations. DO NOT MERGE
 2012-05-04 14:22:52 -07:00
Jim Miller
43dad01f5b am 360ca12b: am 516c25b3: Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 
* commit '360ca12bf2914c0832da58f9e7963026799bf676':
  Fix 6414061: Add new ACTION_ASSIST intent.
 2012-05-04 14:19:38 -07:00
Eric Fischer
8049479267 am c9c199a5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c9c199a51a537cfc2aad43c06ecdeaceb8f8b698':
  Import translations. DO NOT MERGE
 2012-05-04 14:19:29 -07:00
Fabrice Di Meglio
b0aa2f5368 Hide Paint textLocale APIs - DO NOT MERGE 
- fix bug #6441521 Need to @hide Paint setTextLocale / getTextLocale - CJK support

Change-Id: Ic536989243d7028e6f5fce7d60dfef4467bebffb
 2012-05-04 14:19:19 -07:00
Eric Fischer
669403e538 Merge "Import translations. DO NOT MERGE" 2012-05-04 14:16:51 -07:00
Eric Fischer
c9c199a51a Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-04 14:16:23 -07:00
Jim Miller
360ca12bf2 am 516c25b3: Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 
* commit '516c25b38a03decc8f9cbd41f4d9baa4f52f438f':
  Fix 6414061: Add new ACTION_ASSIST intent.
 2012-05-04 14:16:16 -07:00
Jim Miller
516c25b38a Merge "Fix 6414061: Add new ACTION_ASSIST intent." into jb-dev 2012-05-04 14:12:41 -07:00
John Reck
27cf66119c am db2a68f3: am df35aa45: Merge "Verify attached before showing a dialog" into jb-dev 
* commit 'db2a68f376ced65ed7338bf5fad1ba3e753d80ea':
  Verify attached before showing a dialog
 2012-05-04 14:09:44 -07:00
John Reck
db2a68f376 am df35aa45: Merge "Verify attached before showing a dialog" into jb-dev 
* commit 'df35aa457ec275422b1695f6a3293aae35f99a22':
  Verify attached before showing a dialog
 2012-05-04 14:06:48 -07:00
John Reck
df35aa457e Merge "Verify attached before showing a dialog" into jb-dev 2012-05-04 14:04:15 -07:00
Jim Miller
0799440ab3 Fix 6414061: Add new ACTION_ASSIST intent. 
Change-Id: I3d334f67723ac89f6001267e0f06ad76190b929f
 2012-05-04 13:52:14 -07:00
Daniel Sandler
d2217f0c32 Restore do-not-disturb mode on tablets. 
Bug: 6195112
Change-Id: Iecb850942df43fb8861cbbf2e2343c2aabfc4263
 2012-05-04 16:44:16 -04:00
Chris Wren
3cb341539b am 32c513b7: am 3c5f9243: The BigTextStyle should never render mContentText 
* commit '32c513b72925c810ac82f96965f7e4d2ede3589a':
  The BigTextStyle should never render mContentText
 2012-05-04 13:41:54 -07:00
Chris Wren
32c513b729 am 3c5f9243: The BigTextStyle should never render mContentText 
* commit '3c5f92432734e1e3b9bdc515628a4c09d7759cd4':
  The BigTextStyle should never render mContentText
 2012-05-04 13:39:13 -07:00
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
Daniel Sandler
469e96e206 Close notification blame popups when the panel disappears. 
Also be sure to cancel the longpress listeners when things
change.

Finally, increase the longpress timeout to 1.5x normal
longpress.

Bug: 6441520
Change-Id: Icea4d2a5c98a9a51a15f0762454de9e5cd454c50
 2012-05-04 15:56:19 -04: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