Commit Graph

38599 Commits

Author SHA1 Message Date
Dianne Hackborn
8628dcdaa4 Merge "ICS is API 14." 2011-09-14 16:04:15 -07:00
Peter Ng
7ef0075697 Merge "Spinner touchstates now in line with list states" 2011-09-14 15:03:32 -07:00
Irfan Sheriff
f606550535 Merge "Add support to change IPv6 privacy extensions" 2011-09-14 15:03:26 -07:00
Adam Powell
fa7ea4a514 Merge "Bug 5151927 - Monkeys should not play with detached lists." 2011-09-14 14:54:23 -07:00
Jaikumar Ganesh
af3290fd71 Merge "Use an integer for the channel id." 2011-09-14 14:46:20 -07:00
Jaikumar Ganesh
a1808ac811 Merge "Add Register before boot flag." 2011-09-14 14:46:10 -07:00
Rajneesh Chowdury
d40e610938 Merge "Fix for bug 5309242 [Prime] VideoEditorAPITest testVideoContentHD failed" 2011-09-14 14:01:36 -07:00
Robert Greenwalt
08a72fd5d8 Merge "Add OTADM feature for Verizon requirement. - GsmDataConnectionTracker.java <in function createApnList> : modify parameter type for new ApnSetting. (carrierEnabled has changed to boolean from integer, BEARER has changed to integer from string). <in function createAllApnList> : modify telephony db query statement using carrierEnabled. (carrier_enabled: 1 enable apn, 0: disabled apn) <in function buildWaitingApns> : modify apn management code when current RAT (radio access technology) is LTE or EHRPD. add internal function named needToCheckApnBearer to check current RAT is LTE or EHRPD. - ApnSetting.java : add two member variable (carrierEnabled: apn enable/disable , bearer : Radio Access Technology) - Telephony.java : add two static string CARRIER_ENABLED & BEARER. - ApnSettingTest.java : add two assertEquals in function assertApnSettingEqual. add CARRIER_ENABLED & BEARER parameters." 2011-09-14 13:41:10 -07:00
Christopher Tate
b596180bc3 Merge "Give backup/restore confirmation a proper window title" 2011-09-14 11:34:03 -07:00
Svetoslav Ganov
ec09b911cb Merge "Disable accessibility if all accessibility serivces are disbaled." 2011-09-14 11:07:36 -07:00
Fabrice Di Meglio
b112590778 Merge "Fix some TextLayoutCache issues" 2011-09-14 11:05:04 -07:00
Gilles Debunne
41b273efbb Merge "Bug 5295607: IOOB problems in Suggestions" 2011-09-14 11:02:43 -07:00
Matthew Xie
810f69b620 Merge "Keep Binder reference in the mServiceRecordToPid hashmap" 2011-09-14 10:48:43 -07:00
Daniel Sandler
6885dfafe4 Merge "When the status bar hides, close the notification panel." 2011-09-14 10:23:21 -07:00
Scott Main
7178cfd4a7 Merge "docs: update usb driver directory" 2011-09-14 09:57:46 -07:00
Eric Laurent
e6d17213f9 Merge "Issue 5044873: Pb with BT SCO AudioManager API" 2011-09-14 09:18:23 -07:00
Narayan Kamath
00efee55df Merge "Don't wait indefinitely for audio tracks to finish playing." 2011-09-14 09:11:17 -07:00
Jean-Michel Trivi
bf8cdefdea Merge "Bug 5300223 RemoteControlClient uses PendingIntent" 2011-09-14 09:05:36 -07:00
Justin Ho
97bb018322 Merge "Moving tablet unlock screen assets to tablet-specific folders Refreshing visual style to match phone unlock assets Bug: 5231253" 2011-09-14 07:39:56 -07:00
The Android Open Source Project
e59a9f5f08 Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: I2ef7b37dce08a4012ed7ba1704841fb2af846b76
2011-09-14 07:22:47 -07:00
Mike Lockwood
39c1e8b753 Merge "Move Power Manager minimum screen brightness to a framework resource" 2011-09-14 07:12:46 -07:00
Ed Heyl
ccfa5f9863 keep history after reset to GRK39D 2011-09-14 04:28:58 -07:00
Jean-Baptiste Queru
c85432ac37 am 1d6a69f8: Ignore e4f0da70 from gingerbread-plus-aosp
* commit '1d6a69f84f8d14dc8bf90f421ad49ea7f4df88b1':
  Added interface to SurfaceTexture needed by WebKit.
2011-09-13 22:40:47 -07:00
Adam Powell
93f33d1b1d Merge "Un-force fading edges in ListPopupWindows." 2011-09-13 21:48:33 -07:00
Chia-chi Yeh
27090e959e Merge "RTP: Update parameters for larger packet intervals." 2011-09-13 21:21:18 -07:00
Adam Powell
0798002bb1 Merge "Fix bug 5314559 - Slow menu scrolling in browser on some devices" 2011-09-13 21:13:15 -07:00
Jeff Brown
0984130e74 Merge "Fix bug in KeyButtonView key injection logic. Bug: 5299191 Bug: 5300282" 2011-09-13 19:23:01 -07:00
satok
a473386144 Merge "Skip the exit animation when the IME is destroyed." 2011-09-13 19:11:05 -07:00
Adam Powell
b595a35e5e Merge "Fix bug 5312352 - ListView modal multi-select mode bugs" 2011-09-13 18:17:14 -07:00
Kenny Root
ad2cbc1a23 Merge "Add verifier device identity" 2011-09-13 17:51:08 -07:00
Eric Laurent
0dba0a65f4 Merge "Issue 5298399: Lost speech after a crash in gTalk." 2011-09-13 17:50:31 -07:00
John Reck
06b1669ff1 Merge "Prevent pause/resuming a destroyed WebViewCore" 2011-09-13 17:23:11 -07:00
Adam Powell
2ec492875e Merge "Fix bug 5309557 - Monkeys and SIGSEGV do not mix!" 2011-09-13 17:15:46 -07:00
Siva Velusamy
169db5c06a Merge "Minor docs fixes: Make description match screenshot." 2011-09-13 17:10:28 -07:00
John Reck
13d884c372 Merge "Make sure the finalizer destroy runs on the UI thread" 2011-09-13 16:55:27 -07:00
Jason Sams
e2b4488cfe Merge "Add RS watchdog." 2011-09-13 16:37:03 -07:00
Adam Powell
20d59eb36e Merge "Fix bug 5307916 - legacy menu theming" 2011-09-13 16:02:38 -07:00
Dmitry Dolinsky
03acb171c0 Merge "List path-permission element under provider" 2011-09-13 16:01:40 -07:00
Chia-chi Yeh
5e9950f140 Merge "VpnDialogs: allow strings wrapped into multiple lines." 2011-09-13 15:47:46 -07:00
Fabrice Di Meglio
4cd9734d25 Merge "Fix bug #5282141 ScrollView overscroll should not generate invalidations when not needed (ANR textview redraws constantly when touched)" 2011-09-13 15:35:06 -07:00
Justin Ho
9db76c9fb3 Merge "Updated default application launcher icon Bug: 5286988" 2011-09-13 14:50:02 -07:00
Christopher Tate
eadad5a55f Merge "Fix bug 5297302 - Remember to release surface after starting drag" 2011-09-13 14:28:05 -07:00
Robert Greenwalt
8d60d982e6 am 61db35da: am 2f835a61: Merge "Make copies of NetworkInfo to give out." into honeycomb-LTE
* commit '61db35da2b4501dde5646f86f21cf5054c41ea26':
  Make copies of NetworkInfo to give out.
2011-09-13 14:25:27 -07:00
Kazuhiro Ondo
95a6ff0b9f am 30928eb6: am b1a3f0ca: Fix no data issue after system server crash
* commit '30928eb60395ac7c02ac45fd00a0d781ce364856':
  Fix no data issue after system server crash
2011-09-13 14:25:23 -07:00
yoonsung.nam
291cc59dec am 90cfe5c3: (-s ours) am 37f770f0: DO NOT MERGE: Notify overall state instead of current changed state
* commit '90cfe5c366c1ffcbd4f9164b9bef998f27912089':
  DO NOT MERGE: Notify overall state instead of current changed state
2011-09-13 14:25:20 -07:00
Kazuhiro Ondo
c6ff97d288 am 52d51c42: (-s ours) am eb7763ef: DO NOT MERGE: Fix leak in SIM ready registrants
* commit '52d51c42b6296a96287dd373558f576c18846a01':
  DO NOT MERGE: Fix leak in SIM ready registrants
2011-09-13 14:25:16 -07:00
Attila Bodis
9f1a8bf04e Merge "Adding isEmergencyNumber which also takes in a defaultCountryIso." 2011-09-13 14:20:32 -07:00
Dianne Hackborn
24240f3ce8 Merge "Fix issue #4280324: Returning to Fullscreen Layout with WebView..." 2011-09-13 14:16:59 -07:00
Jason Sams
69d397a617 Merge "Cleanup example code." 2011-09-13 14:11:11 -07:00
Jake Hamby
069074751b Merge "Add method to retrieve MSISDN for CDMA/LTE devices." 2011-09-13 13:50:20 -07:00