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

30176 Commits

Author SHA1 Message Date
Ben Murdoch
8532a30ce8 am 3d8678f8: am c6911d47: Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 
* commit '3d8678f8b1ef698369c350049352659793f404d1':
  Create WebViewDatabaseClassic from WebViewDatabase.
 2012-04-27 01:45:01 -07:00
Ben Murdoch
c6911d47d1 Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 2012-04-27 01:39:59 -07:00
Dianne Hackborn
0e0d7a7462 am de5c3359: am 73214f61: Merge "Fix launcher icon size for tvdpi." into jb-dev 
* commit 'de5c3359a643f9f289fda35fbb6219fdb6c21adf':
  Fix launcher icon size for tvdpi.
 2012-04-26 19:37:30 -07:00
Dianne Hackborn
73214f619a Merge "Fix launcher icon size for tvdpi." into jb-dev 2012-04-26 19:33:37 -07:00
Dianne Hackborn
eb08322953 am 4883d755: am 493f74e5: Merge "Add new Activity.finishAffinity() method." into jb-dev 
* commit '4883d755ebee295af57eb7294db0146db153b2a5':
  Add new Activity.finishAffinity() method.
 2012-04-26 19:31:13 -07:00
Dianne Hackborn
493f74e5a4 Merge "Add new Activity.finishAffinity() method." into jb-dev 2012-04-26 19:25:41 -07:00
Dianne Hackborn
d0356a19c1 Fix launcher icon size for tvdpi. 
We didn't have a case for tvdpi, so ended up in the default
scaling.  This resulting in us using 319 instead of 320.

Fixed the default case to round, and added explicit cases
for tvdpi since this is a standard density.

Change-Id: I752b924e1556af94682428c8c0ed7c75d15ac4a4
 2012-04-26 19:03:12 -07:00
Dianne Hackborn
ecc5a9cca0 Add new Activity.finishAffinity() method. 
It's cool!

Change-Id: I9fdcd9535b7f1ca2b311d3a1b23e5d058977b095
 2012-04-26 18:56:09 -07:00
Adam Cohen
094833aa6b am ac856e75: am e6eb9291: Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 
* commit 'ac856e75c62e3edbd014eeccb6798d12f85dab3d':
  Fix NPE in RemoteViews (issue 6408103)
 2012-04-26 18:49:21 -07:00
Adam Cohen
e6eb929142 Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 2012-04-26 18:45:18 -07:00
Adam Cohen
c431c156bb Fix NPE in RemoteViews (issue 6408103) 
Change-Id: I3e7ff2941b721c2c0c5c4e7d598df794b105c391
 2012-04-26 18:42:17 -07:00
Makoto Onuki
538b343bf9 am 8316e51c: am ccdf0afb: Merge "Update streamitems javadoc" into jb-dev 
* commit '8316e51c450adb3adf3eec59b257ab88549e717f':
  Update streamitems javadoc
 2012-04-26 15:51:45 -07:00
Makoto Onuki
ccdf0afbd7 Merge "Update streamitems javadoc" into jb-dev 2012-04-26 15:47:35 -07:00
Makoto Onuki
46891a8f1c Update streamitems javadoc 
ACCOUNT_TYPE and ACCOUNT_NAME query parameters were required in API level 15.
We've removed the check for JB, but in order to keep compatibility with HC
apps still need to add those parameters.

Bug 5135278

Change-Id: Ib9b9751c9017c53905047045816a44c5a279fa64
 2012-04-26 15:41:48 -07:00
Adam Cohen
8e6dc585b4 am db4a8fc6: am 2938ac3f: Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 
* commit 'db4a8fc619be68c743b903ec9aeeb4fb7890d340':
  Enabling RemoteViews to have a landscape and portrait layout
 2012-04-26 15:39:38 -07:00
Amith Yamasani
8bfdd756b4 am a5dd37cd: am 7a4be122: Merge "Add some missing getters for XML/Java API consistency." into jb-dev 
* commit 'a5dd37cdb63e59849320614fef1b95593576bd83':
  Add some missing getters for XML/Java API consistency.
 2012-04-26 15:36:48 -07:00
Adam Cohen
2938ac3f9f Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 2012-04-26 15:35:13 -07:00
Dianne Hackborn
a1f86425af am 6fa78731: am 8e6159b8: Merge "Add traces for window manager and activity manager." into jb-dev 
* commit '6fa787319314b59b058dc46d1c97e95f04914258':
  Add traces for window manager and activity manager.
 2012-04-26 15:30:44 -07:00
Amith Yamasani
7a4be122cd Merge "Add some missing getters for XML/Java API consistency." into jb-dev 2012-04-26 15:28:52 -07:00
Dianne Hackborn
8e6159b821 Merge "Add traces for window manager and activity manager." into jb-dev 2012-04-26 15:24:18 -07:00
Eric Fischer
2be1523ba9 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-26 15:20:58 -07:00
Mike Lockwood
f2be4af90d am ded38270: am 9ad1b113: Merge "Make audio routing Intents protected" into jb-dev 
* commit 'ded3827092c8880cec82292dc12b0b6cf7f489ce':
  Make audio routing Intents protected
 2012-04-26 14:34:59 -07:00
Mike Lockwood
9ad1b11326 Merge "Make audio routing Intents protected" into jb-dev 2012-04-26 14:30:31 -07:00
Dianne Hackborn
79d59491e2 am 530330c2: am a6517ae3: Merge "Update process importance documentation." into jb-dev 
* commit '530330c264867594f3293c6b310e8975ff45c9fa':
  Update process importance documentation.
 2012-04-26 14:24:34 -07:00
Dianne Hackborn
a6517ae300 Merge "Update process importance documentation." into jb-dev 2012-04-26 14:19:12 -07:00
Dianne Hackborn
1ded0b1f6a Add traces for window manager and activity manager. 
Change-Id: I525d762db328e4c597da27b6b56d9a808e199756
 2012-04-26 14:14:50 -07:00
Eric Fischer
0652263ba9 Merge "Import translations. DO NOT MERGE" 2012-04-26 14:09:08 -07:00
Amith Yamasani
c350a46efc am 89b5761a: am 87b16c80: Merge "Remove power menu on tablets." into jb-dev 
* commit '89b5761a8201b78599ce28956b9e9fd7dc56edd7':
  Remove power menu on tablets.
 2012-04-26 14:07:43 -07:00
Amith Yamasani
87b16c8039 Merge "Remove power menu on tablets." into jb-dev 2012-04-26 14:02:53 -07:00
Eric Fischer
0b6408b6bf Import translations. DO NOT MERGE 
Change-Id: Icf41e6ee76e70096d79e1ee098540dc97a9e02bb
 2012-04-26 14:02:52 -07:00
Eric Fischer
85a0c7c80c Import translations. DO NOT MERGE 
Change-Id: I61893c06aa4696d0349b0afe92940671feec1eb1
 2012-04-26 13:57:37 -07:00
Romain Guy
c9498d33f0 am 83e72f40: am dcb1eab4: Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev 
* commit '83e72f40c7a426f9f2fb90c37e41055c19ac090d':
  Keep opaque bitmaps opaque after scaling Bug #6293845
 2012-04-26 13:42:30 -07:00
Romain Guy
dcb1eab429 Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev 2012-04-26 13:37:11 -07:00
Romain Guy
8f8d9fb52c Keep opaque bitmaps opaque after scaling 
Bug #6293845

Change-Id: If9e82993f4c9702244ddedb5667421a6fcc7a0c5
 2012-04-26 13:35:36 -07:00
Gilles Debunne
37e845b055 am c661516e: am 64ac862f: Merge "Basic renaming refactoring in Layout" into jb-dev 
* commit 'c661516efdef589b1eff5b80a7a54d614f1dabb0':
  Basic renaming refactoring in Layout
 2012-04-26 13:04:07 -07:00
John Reck
866ebb15f2 am 7f6a6c78: am a75fbc3c: Merge "On new content, attach functor directly" into jb-dev 
* commit '7f6a6c787d108b8c1d5686ee0031352e91c9370d':
  On new content, attach functor directly
 2012-04-26 13:04:02 -07:00
Adam Powell
ccae3151f3 am 0e7cfa94: am 9004053c: Merge "Fix janky programmatic ListView scrolling" into jb-dev 
* commit '0e7cfa941577e5feccb87a9584f5038f8fbcfdf3':
  Fix janky programmatic ListView scrolling
 2012-04-26 13:03:42 -07:00
Steve Block
856d8ac200 am 85061b31: am ff35000c: Merge "Fix JavaDoc style for several WebView classes" into jb-dev 
* commit '85061b315f895a0a13657aaefd2d8562658bcc05':
  Fix JavaDoc style for several WebView classes
 2012-04-26 13:03:40 -07:00
Michael Kolb
38c846c1be am d5515509: am 77974166: Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev 
* commit 'd5515509ef0404c49570d95e37739f6c787cd3da':
  Fix NPE in isPrivateBrowsingEnabled()
 2012-04-26 13:03:36 -07:00
Makoto Onuki
31cef9cbc4 am 2d94830e: am f307268c: Merge "Clearify javadoc on Phone.NORMALIZED_NUMBER." into jb-dev 
* commit '2d94830e8ae9a0e37c1e9e1f06f6a7ed33c0ba68':
  Clearify javadoc on Phone.NORMALIZED_NUMBER.
 2012-04-26 13:03:33 -07:00
Amith Yamasani
51e8480176 Remove power menu on tablets. 
It had been added temporarily for testing, reverting to old behavior.

Change-Id: I1ea3fc41de311ba44949eb7abb7db3057eef1357
 2012-04-26 12:54:39 -07:00
Gilles Debunne
64ac862f7b Merge "Basic renaming refactoring in Layout" into jb-dev 2012-04-26 12:51:59 -07:00
John Reck
a75fbc3c76 Merge "On new content, attach functor directly" into jb-dev 2012-04-26 12:27:56 -07:00
Mike Lockwood
8f014059d3 Make audio routing Intents protected 
These intents should only be sent by the system:

android.intent.action.HEADSET_PLUG
android.intent.action.ANALOG_AUDIO_DOCK_PLUG
android.intent.action.DIGITAL_AUDIO_DOCK_PLUG
android.intent.action.HDMI_AUDIO_PLUG
android.intent.action.USB_AUDIO_ACCESSORY_PLUG
android.intent.action.USB_AUDIO_DEVICE_PLUG

Change-Id: I7be41892a9c4e619ca3e1c892fad6f1f2714c74f
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-04-26 11:31:58 -07:00
Teng-Hui Zhu
85973212e9 Merge "DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration" into jb-dev 2012-04-26 11:28:17 -07:00
Adam Powell
9004053c59 Merge "Fix janky programmatic ListView scrolling" into jb-dev 2012-04-26 11:14:02 -07:00
Adam Cohen
5d20064651 Enabling RemoteViews to have a landscape and portrait layout 
-> Implmented BitmapCache to ensure no bitmap data is duplicated
   within a RemoteViews hierarchy.

Change-Id: I68f0f5e2882ee2a2a9a110c1642b93c4c7518743
 2012-04-26 11:11:17 -07:00
Adam Powell
0b8acd81d5 Fix janky programmatic ListView scrolling 
Adjust AbsListView to use a linear interpolator for smooth scrolling
rather than the default scroller behavior. This prevents irregular
motion as the scroll is altered in-flight to account for varying
height list items.

Bug 6397800

Change-Id: I8cc33dfc18903943369e1353930c48e2652b0142
 2012-04-26 11:10:27 -07:00
Steve Block
ff35000ce1 Merge "Fix JavaDoc style for several WebView classes" into jb-dev 2012-04-26 11:02:32 -07:00
Ben Murdoch
99c12e8d5f Create WebViewDatabaseClassic from WebViewDatabase. 
WebViewDatabase has a getInstance() method, so similarly
to WebStorage, WebIconDatabase etc we refactor it into a
proxy class, and move the current implementation into
WebViewDatabaseClassic.

Also clean up some JavaDoc in touched files.

Bug: 6234236
Change-Id: I71cbd8f78e60f396e96e8546073ad634797cce15
 2012-04-26 19:02:15 +01:00