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
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
b4b2223fa1 Add number back to legacy notifications. 
Bug: 5816717
Change-Id: I52c98143378c315dec5b525cb3d96c214ee8196e
 2012-05-04 13:31:33 -04: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
John Reck
026bb684be Monkeys are touching my destroyed stuff 
Bug: 6443402

Change-Id: I4e992d8d0f53958f0cbeb405f30635e0d172009f
 2012-05-04 10:25:43 -07:00
George Mount
57bd51713e Limit when auto-complete popups attach to WebView. 
Bug 6401222
 Only create the anchor view when the popup window
 is ready to show and detach it when it is dismissed.

Change-Id: Ic16485e9970b00744c07b470df5420568332c8f0
 2012-05-04 10:24:28 -07:00
Daniel Sandler
67772a0929 am c5731e42: am e825b3e3: Merge "Back button dismisses notifications again." into jb-dev 
* commit 'c5731e424ac7311fe79c802124a6853bbf1a4350':
  Back button dismisses notifications again.
 2012-05-04 10:22:34 -07:00
Daniel Sandler
c5731e424a am e825b3e3: Merge "Back button dismisses notifications again." into jb-dev 
* commit 'e825b3e3d41e3fd2f6f3bbdf9feb6b8cc87a77dd':
  Back button dismisses notifications again.
 2012-05-04 10:19:27 -07:00
Daniel Sandler
e825b3e3d4 Merge "Back button dismisses notifications again." into jb-dev 2012-05-04 10:17:01 -07:00
Teng-Hui Zhu
826bcf0d9b am 5a63ec30: am 0008f736: Merge "Unify the rect names according to the coordinates" into jb-dev 
* commit '5a63ec30d670ac8ed384525cd8cd3067d39ad742':
  Unify the rect names according to the coordinates
 2012-05-04 09:34:56 -07:00
Teng-Hui Zhu
5a63ec30d6 am 0008f736: Merge "Unify the rect names according to the coordinates" into jb-dev 
* commit '0008f736471dca879b87028b892172689ff3534c':
  Unify the rect names according to the coordinates
 2012-05-04 09:30:38 -07:00
Makoto Onuki
de70e49457 am e8d4d402: am d7247c76: Merge "Remove SocialContract, which was never used." into jb-dev 
* commit 'e8d4d402aa23f39df238fc30ab281001120e6a2e':
  Remove SocialContract, which was never used.
 2012-05-04 09:28:46 -07:00
Teng-Hui Zhu
0008f73647 Merge "Unify the rect names according to the coordinates" into jb-dev 2012-05-04 09:28:23 -07:00
Makoto Onuki
e8d4d402aa am d7247c76: Merge "Remove SocialContract, which was never used." into jb-dev 
* commit 'd7247c7633a1c97db824f1bd6298fbf5f13cd8f4':
  Remove SocialContract, which was never used.
 2012-05-04 09:24:33 -07:00
Makoto Onuki
d7247c7633 Merge "Remove SocialContract, which was never used." into jb-dev 2012-05-04 09:22:39 -07:00
Andreas Huber
4b27a9133e am 9d8aa0e4: am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev 
* commit '9d8aa0e4ac0498e2a139bd60342d986c42251e2b':
  Various changes to Media* APIs requested by the api council.
 2012-05-04 08:58:22 -07:00
Daniel Sandler
c4f2a5652d Back button dismisses notifications again. 
Bug: 6441337
Change-Id: Iabc97cd2a3f66ee2af5406807b3023908965b8c8
 2012-05-04 11:58:01 -04:00
Andreas Huber
9d8aa0e4ac am c52c957c: Merge "Various changes to Media* APIs requested by the api council." into jb-dev 
* commit 'c52c957c450ded6ecf2444595ea6ddfc9546c786':
  Various changes to Media* APIs requested by the api council.
 2012-05-04 08:55:40 -07:00
Andreas Huber
c52c957c45 Merge "Various changes to Media* APIs requested by the api council." into jb-dev 2012-05-04 08:53:23 -07:00
Jean-Baptiste Queru
8c79a1ea95 am e4888363: Merge "Ignore from AOSP - there\'s already an equivalent change in JellyBean" into jb-dev-plus-aosp 
* commit 'e48883638ad223289e60c9086e42767f9c7b3a4f':
  Enable chromium http stack for x86
 2012-05-04 08:18:15 -07:00
Jean-Baptiste Queru
e48883638a Merge "Ignore from AOSP - there's already an equivalent change in JellyBean" into jb-dev-plus-aosp 2012-05-04 08:16:18 -07:00
Jean-Baptiste Queru
cd19b72c13 Ignore from AOSP - there's already an equivalent change in JellyBean 
Change-Id: Idcbe6f7b29255d5873da0abcb1fd23f651d216b4
 2012-05-04 08:15:04 -07:00
Craig Mautner
e819926a14 am 5bdf1143: am 602290a0: Merge "Retain current visibility when copying layoutparam" into jb-dev 
* commit '5bdf114327fa219ed5a5243883713c09c020aa3a':
  Retain current visibility when copying layoutparam
 2012-05-04 08:07:16 -07:00
Craig Mautner
5bdf114327 am 602290a0: Merge "Retain current visibility when copying layoutparam" into jb-dev 
* commit '602290a01124b2eac045b066a87a6fc4911153c6':
  Retain current visibility when copying layoutparam
 2012-05-04 08:04:19 -07:00
Craig Mautner
602290a011 Merge "Retain current visibility when copying layoutparam" into jb-dev 2012-05-04 08:01:59 -07:00
Jean-Baptiste Queru
bfad7d6396 Fix build 
Change-Id: I7309cb3ca67f8c17545bdfa40fd9370464856942
 2012-05-04 07:13:43 -07:00
Jeff Brown
2989bb0de3 am cf08a248: am a08dc5de: Merge "Remove obsolete tool." into jb-dev 
* commit 'cf08a248878320296c3fc283b1baff390bf0e172':
  Remove obsolete tool.
 2012-05-04 00:16:09 -07:00
Jeff Brown
cf08a24887 am a08dc5de: Merge "Remove obsolete tool." into jb-dev 
* commit 'a08dc5de8d039a4fd0a8c1286147c6afd01d2edf':
  Remove obsolete tool.
 2012-05-04 00:13:14 -07:00
Jeff Brown
a08dc5de8d Merge "Remove obsolete tool." into jb-dev 2012-05-04 00:11:12 -07:00
Elliott Hughes
edbb64f5aa am 6ad4cc8c: am 2dfcb613: Merge "libnativehelper is implicitly available." into jb-dev 
* commit '6ad4cc8ca8fbe1d0039755759497305c1a6c53e1':
  libnativehelper is implicitly available.
 2012-05-03 22:33:25 -07:00
Elliott Hughes
6ad4cc8ca8 am 2dfcb613: Merge "libnativehelper is implicitly available." into jb-dev 
* commit '2dfcb613312be9119c15d3372ae7ef41699f1935':
  libnativehelper is implicitly available.
 2012-05-03 22:31:15 -07:00
Elliott Hughes
2dfcb61331 Merge "libnativehelper is implicitly available." into jb-dev 2012-05-03 22:29:28 -07:00