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

68718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan Dixon
ded37ed9a5 Add new WebViewClassic files 
Done as its own step, to make the subsequent diff easier on the eye

Change-Id: Ib81eba5c7c26f2e0c9a60792bb0f7cd10e4c78bc
 2012-03-02 11:15:14 +00:00
Adam Powell
6435da6119 am d9760a81: am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'd9760a813e99670c5bdb05c95ae3bafb58abf897':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 23:57:10 -08:00
Adam Powell
d9760a813e am 25517fdc: am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '25517fdc53018ef676a1d340e2d5cbd780e5dc8b':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:52:39 -08:00
Adam Powell
25517fdc53 am 637c50db: am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit '637c50db476d9a6cec13551920f7c163fef02ab8':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:49:46 -08:00
Adam Powell
637c50db47 am c7e5a2fe: Merge "Fix dividers for LinearLayout (TabWidget)" 
* commit 'c7e5a2fe3042014f78667228a92e41d0a19547fd':
  Fix dividers for LinearLayout (TabWidget)
 2012-03-01 22:46:26 -08:00
Mathias Agopian
7e5f1e8dc0 Merge "add more tracing for buffer allocation" 2012-03-01 21:22:35 -08:00
Mathias Agopian
a4ca78292c Merge "add more ATRACE" 2012-03-01 21:22:25 -08:00
Mathias Agopian
a362c769d4 add more ATRACE 
Change-Id: I6cc5759fb0a05427680488fd12ae797e77644f3d
 2012-03-01 20:16:39 -08:00
Craig Mautner
f8acebe4a5 Merge "Separate animation steps into start, step and finish phases. Fixes bug 6089126." 2012-03-01 19:29:46 -08:00
Dianne Hackborn
38addbe3ab Merge "Whoops forgot this change." 2012-03-01 19:21:40 -08:00
Dianne Hackborn
b132506e6e Merge "Fix issue where pm would clear preferred apps when updating an app." 2012-03-01 19:21:22 -08:00
Craig Mautner
dbb7991b4e Separate animation steps into start, step and finish phases. 
Fixes bug 6089126.

Change-Id: Iafbde36ff719640335a7ecf762e1d991cf7915e4
 2012-03-01 19:06:07 -08:00
Jim Miller
14700016e9 Merge "Fix 6028595: Fix reboot loop in AccountUnlock due to null callback" 2012-03-01 19:02:19 -08:00
Fabrice Di Meglio
3fd29d908a Unhide BiDiTests app 
- unhide its makefile so that now it is part of the standard build process

Change-Id: Ied86c252975e30da8e3e75180869835f00a5969d
 2012-03-01 18:15:25 -08:00
Fabrice Di Meglio
7d3c690e72 Merge "Improve RTL APIs" 2012-03-01 17:44:19 -08:00
Romain Guy
2900116e85 Merge "Remove stray log" 2012-03-01 17:35:25 -08:00
Fabrice Di Meglio
dd3ef2c573 Improve RTL APIs 
- follow changed / reset pattern

Change-Id: I1c5e9b39196029bd78add2ab13b984da124822ca
 2012-03-01 17:34:56 -08:00
Romain Guy
ad1daaa87b Remove stray log 
Change-Id: I0c1979aab395098651c8a63d0bae0198ebc3746b
 2012-03-01 17:33:42 -08:00
Tsu Chiang Chuang
ddb9d0bedf am 8f0c03b7: am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '8f0c03b7833c719c29198be0e4fecbdfb4013e64':
 2012-03-01 17:15:32 -08:00
Tsu Chiang Chuang
756fe38d08 am 6053b195: am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '6053b195bcd49676b46b2257f6e1da04d0b4d9a5':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:12:55 -08:00
Tsu Chiang Chuang
8f0c03b783 am 673a66e3: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '673a66e357f49f939cf8e7f603ff14b8474c9032':
 2012-03-01 17:11:22 -08:00
Tsu Chiang Chuang
6053b195bc am bb69bde5: am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit 'bb69bde593bc0ba58c744b19c43619d4eb0866b7':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:10:23 -08:00
Tsu Chiang Chuang
673a66e357 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:43 -08:00
Tsu Chiang Chuang
bb69bde593 am 3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 
* commit '3e70127021f5d5940edfdefd7e33fd65d4ec0449':
  extend timeout to allow for more time for the device to connect.
 2012-03-01 17:07:25 -08:00
Tsu Chiang Chuang
3e70127021 Merge "extend timeout to allow for more time for the device to connect." into ics-mr1 2012-03-01 17:05:43 -08:00
Wink Saville
7eed139cdf Merge "Telephony: Remove SimCard and RuimCard" 2012-03-01 17:03:47 -08:00
Robert Ly
f64a6d5346 am 37f9360a: am 3c78e101: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit '37f9360a21985b2627d7069160d2950edf31c021':
 2012-03-01 16:47:06 -08:00
Robert Ly
dea05e9010 am ca7d7541: am d70eaff4: am 941ff38d: Merge "fix bug 5942522" into ics-mr1 
* commit 'ca7d7541c4cad188eb643113e3c3e91e63d21a5e':
  fix bug 5942522
 2012-03-01 16:47:04 -08:00
Robert Ly
f183dda0ad am a2310712: am 9d36dcc0: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'a231071249f03f7b10e1991c9988476d2b15a9f7':
 2012-03-01 16:46:58 -08:00
Robert Ly
24ed1b2fb5 am b4afb9a8: am 8125b0b4: am dcc910ea: Merge "docs: fix bug 5878445" into ics-mr1 
* commit 'b4afb9a89e1a2131ac273f0452fa89b83090b05a':
  docs: fix bug 5878445
 2012-03-01 16:46:55 -08:00
The Android Open Source Project
80b29211fd am efa49439: am 4f306bec: Reconcile with ics-mr1-release 
* commit 'efa4943952f81a5cb5a5d410cc4b53ca665d7065':
 2012-03-01 16:46:44 -08:00
Jeff Brown
0765d4483b Merge "Shouldn't catch Throwable in AsyncTask." 2012-03-01 16:43:41 -08:00
Jeff Brown
b1ec5ef460 Shouldn't catch Throwable in AsyncTask. 
Throwable includes classes of Error that really should be fatal.

Bug: 5945222
Change-Id: I602f958396048451f404dd2306cdf5e57172acf0
 2012-03-01 16:33:04 -08:00
Irfan Sheriff
209266e93f Merge "Fix WifiManager async API" 2012-03-01 16:26:52 -08:00
Adam Powell
c7e5a2fe30 Merge "Fix dividers for LinearLayout (TabWidget)" 2012-03-01 16:26:04 -08:00
Fabrice Di Meglio
ac5a3a1c12 Merge "Make layoutDirection API public" 2012-03-01 16:23:29 -08:00
Brian Carlstrom
fc46475f7f Merge "Remove obsolete KeyChain references to USE_CREDENTIALS (2 of 2)" 2012-03-01 16:22:13 -08:00
Fabrice Di Meglio
98aec1c7ef Make layoutDirection API public 
Change-Id: Ie125513e4ea72b33b42355dbc43f9b9b6d46d7eb
 2012-03-01 16:21:55 -08:00
Jim Miller
fbc46dc3c2 Fix 6028595: Fix reboot loop in AccountUnlock due to null callback 
This fixes a bug where the device would get into a reboot loop due to having
a null callback.  The problem was that a recent change caused the callback
to be used indirectly by the constructor before being set.

The solution is to pass the callback to the KeyguardViewBase constructor
which ensures it's ready by the time we call getCallback().

Change-Id: I2598fc5338be99977980e4dea41a096fb2a7ef7e
 2012-03-01 16:15:27 -08:00
Teng-Hui Zhu
b22d6c11ef Merge "Allow webview to delete GL resource in a valid EGL context" 2012-03-01 16:04:18 -08:00
The Android Open Source Project
2755e31546 am 956abc30: am f8e58c8b: Reconcile with ics-mr1-release 
* commit '956abc304f6e03f20f4342988cbba9ac1c27a03b':
 2012-03-01 15:51:34 -08:00
Andreas Huber
d9c3217eff Merge "Remove hacks that worked around issues in OMX components several releases back." 2012-03-01 15:46:19 -08:00
Teng-Hui Zhu
d962413872 Allow webview to delete GL resource in a valid EGL context 
bug:6079959

Change-Id: Idee1031b0bcc4aeb498a18eb01970a8ed7efd285
 2012-03-01 15:37:58 -08:00
Android Git Automerger
6b822aafd4 am 55fbbce4: Merge branch \'ics-scoop-plus-aosp\' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 
* commit '55fbbce495723a5b17f1b4684d0f9826c75caa97':
 2012-03-01 15:35:49 -08:00
Yu Shan Emily Lau
32620e4f6b am da0c4a3e: am d12347b2: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit 'da0c4a3ea653a866d6a8fe00bc52f27d0841874b':
 2012-03-01 15:35:47 -08:00
Yu Shan Emily Lau
8790b57588 am 353b61a8: am 0ddfe24a: am eb4f3256: Set the video encoding bit rate for the media recorder stress test. 
* commit '353b61a87d9eb0ee223bdda76c30a1364441d962':
  Set the video encoding bit rate for the media recorder stress test.
 2012-03-01 15:35:43 -08:00
Jean-Baptiste Queru
7edb9a9490 am f73222a3: am 964955e0: am 8a9b14d8: am 5aeb8587: Merge "DRM framwork bug fix: add an API to release resources" 
* commit 'f73222a39e0fa294d9105fd7464943aed6e77cd7':
  DRM framwork bug fix: add an API to release resources
 2012-03-01 15:35:39 -08:00
Jean-Baptiste Queru
b08dee9d38 am f09c0c7f: am 93920d79: am a66be970: am 11aa4cc3: Merge "Set width of spinner\'s dropdown to fit on device" 
* commit 'f09c0c7f31e72611d91b4ac91ce5a9f019b16083':
  Set width of spinner's dropdown to fit on device
 2012-03-01 15:35:37 -08:00
Jean-Baptiste Queru
ab38500d9c am dbc591e2: am c69d6134: am 6ae4fe94: am 9303919d: Merge "Adds documentation for ContentResolver notifyChange()" 
* commit 'dbc591e27686486c732fca2f94fde645e3487b7a':
  Adds documentation for ContentResolver notifyChange()
 2012-03-01 15:35:33 -08:00
Jean-Baptiste Queru
a4c8511218 am 9de7793b: am 4f906362: am 97348431: am 704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5 
* commit '9de7793b425be89889412f3a86466d7b19055c3c':
  stagefright aacenc: Use QDADD/QDSUB instructions
  stagefright aacenc: Remove useless inline asm for simple right shift
  stagefright aacenc: Use ARMv6 SSAT instruction
 2012-03-01 15:35:25 -08:00