Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
75,747 Commits 3 Branches 0 Tags
c54984c84bbf492c862cfcfb15345c549286faec
Commit Graph

23948 Commits

Author SHA1 Message Date
Romain Guy
c54984c84b am 10c86ab3: am c887843b: Merge "New constant used by dev settings" into jb-dev 
* commit '10c86ab3f806550563b1ccd94623c788e2c6c0da':
  New constant used by dev settings
 2012-04-27 15:55:32 -07:00
Romain Guy
c887843b19 Merge "New constant used by dev settings" into jb-dev 2012-04-27 15:49:59 -07:00
Romain Guy
4b8c4f886b New constant used by dev settings 
Change-Id: I42f103ae8a9b9f051367c72131f0b216e200f6e0
 2012-04-27 15:48:35 -07:00
Jeff Brown
076ffe4b09 am 29879a31: am d51f90ff: Merge "Remove unused pipelining optimization." into jb-dev 
* commit '29879a311143e917fc46a97c30a83364df251709':
  Remove unused pipelining optimization.
 2012-04-27 15:02:02 -07:00
Jeff Brown
d51f90ff7e Merge "Remove unused pipelining optimization." into jb-dev 2012-04-27 14:56:33 -07:00
Michael Jurka
33d7560561 am 235013f5: am f0fb68d8: Merge "Make APIs to get global search provider public" into jb-dev 
* commit '235013f5518593da2502bb78fee0063f5e559ac6':
  Make APIs to get global search provider public
 2012-04-27 14:47:12 -07:00
Michael Jurka
f0fb68d8c9 Merge "Make APIs to get global search provider public" into jb-dev 2012-04-27 14:41:27 -07:00
Michael Jurka
3f5cfcf2d9 Make APIs to get global search provider public 2012-04-27 14:23:48 -07:00
Adam Powell
c3b1b64897 am 75e8637f: am f2d75bc0: Merge "Use finishAffinity for automatic up navigation" into jb-dev 
* commit '75e8637f44cf11dd0fd5e646ab67095a71822bf4':
  Use finishAffinity for automatic up navigation
 2012-04-27 11:06:43 -07:00
Adam Powell
f2d75bc09a Merge "Use finishAffinity for automatic up navigation" into jb-dev 2012-04-27 11:02:31 -07:00
Jeff Sharkey
144bb26f51 am 497a73da: am f5d70fd2: Merge "Protect system services with DUMP permission." into jb-dev 
* commit '497a73da6d7da88c4787435221f1fbd6fd843e87':
  Protect system services with DUMP permission.
 2012-04-27 10:20:33 -07:00
Jeff Sharkey
f5d70fd2ad Merge "Protect system services with DUMP permission." into jb-dev 2012-04-27 10:16:40 -07:00
Irfan Sheriff
3e69defc37 am f0b9fb63: am d52e0c79: Merge "Add support for changing p2p device name" into jb-dev 
* commit 'f0b9fb63fd920c4581753d6d5ba73eba941896e7':
  Add support for changing p2p device name
 2012-04-27 10:00:58 -07:00
Irfan Sheriff
d52e0c791f Merge "Add support for changing p2p device name" into jb-dev 2012-04-27 09:55:37 -07:00
Irfan Sheriff
2bdefcab74 Add support for changing p2p device name 
Change-Id: Ie13fe2adedd0bac6aa07b3369c4d6a05ef33cd24
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
 2012-04-27 08:53:34 -07:00
Steve Block
d8ac8b05a6 am a4dcc774: am 7e279bc9: Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev 
* commit 'a4dcc77422ca47dc279681cfe539b03315d91755':
  Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()
 2012-04-27 03:29:04 -07:00
Steve Block
7e279bc91a Merge "Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs()" into jb-dev 2012-04-27 03:19:04 -07:00
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
Adam Powell
897b1dd610 Use finishAffinity for automatic up navigation 
Change-Id: I2ac1971e82c499e8bafe13fcc113c5594c34864b
 2012-04-26 19:53:41 -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
Jeff Sharkey
eb4cc492c9 Protect system services with DUMP permission. 
Change-Id: I5e53859f8b8e5473e54eca43ebd7de841f1a05ff
 2012-04-26 18:17:29 -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
Jeff Brown
97d5c41873 Remove unused pipelining optimization. 
Bug: 6375101
Change-Id: I5fcbbabfafae9e1661adac7b2becc748e42c4b66
 2012-04-26 15:50:31 -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
Steve Block
ef16315080 Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs() 
Bug: 6212665
Change-Id: Ifc5c83cfee7cf63edbe2c65c55617eb01ea9eced
 2012-04-26 23:25:29 +01:00
Dianne Hackborn
8e6159b821 Merge "Add traces for window manager and activity manager." into jb-dev 2012-04-26 15:24:18 -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
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