Commit Graph

32820 Commits

Author SHA1 Message Date
Conley Owens
ae9331ec90 Merge "Implement support for ALT and SHIFT modifiers" 2011-04-29 09:59:55 -07:00
Conley Owens
3f9f649a96 Merge "Fix startSearch condition on Dialog, because pressing search key causes ANR popup. If search key is pressed on Dialog and there is no search item then do nothing. How to reproduce the issue: Settings > About phone > Legal information > Google legal > Press search key > Touch list item or press back key > ANR popup is shown" 2011-04-29 09:59:48 -07:00
Conley Owens
5324becece Merge "modify the device to enable to get the state as slide-open/slide-close." 2011-04-29 09:59:42 -07:00
Conley Owens
615537fc62 Merge "Adding missing breaks in BnSurfaceComposer::onTransact" 2011-04-29 09:59:36 -07:00
Conley Owens
56b79aa816 Merge "Fixed to call computeVisibleRegions() when transparent value changed" 2011-04-29 09:59:30 -07:00
Conley Owens
1f824b15fe Merge "frameworks/base: acquire lock on am only when needed" 2011-04-29 09:59:22 -07:00
Conley Owens
239c5e0e99 Merge "Adding a sanity test in the while loop in readHistory()" 2011-04-29 09:56:58 -07:00
Conley Owens
816fdf4bb3 Merge "Improved conversion accuracy of exif geotag data" 2011-04-29 09:48:10 -07:00
Conley Owens
c41ff27578 Merge "Fixes broken image link in "Tools -> Traceview" documentation page." 2011-04-29 09:48:04 -07:00
Conley Owens
d8203b0520 am e1787009: Merge "Added null check on return value for getKeyDispatcherState()"
* commit 'e17870092941cecf64956819d395ec34111cbe71':
  Added null check on return value for getKeyDispatcherState()
2011-04-28 23:52:45 -07:00
Conley Owens
4c244c1913 am 501f7bca: Merge "Eliminating dead logic - bitmap state simply cannot be null here."
* commit '501f7bca83ecc2200a590966e461590d9716df7d':
  Eliminating dead logic - bitmap state simply cannot be null here.
2011-04-28 23:52:41 -07:00
Conley Owens
1949d64291 am 11d7ec24: Merge "Removing unnecessary computation."
* commit '11d7ec24a55319b68bcc96443372c263a41b7dc5':
  Removing unnecessary computation.
2011-04-28 23:52:37 -07:00
Conley Owens
383903d49d am e41d2aed: Merge "Using robust equality check."
* commit 'e41d2aed9c8d990d31af70642ae688dad1d8fb4b':
  Using robust equality check.
2011-04-28 23:52:32 -07:00
Conley Owens
79d2f40575 am 1e29552b: Merge "We don\'t need these local references."
* commit '1e29552bd5feeb24952a0486e3263396978212df':
  We don't need these local references.
2011-04-28 23:52:26 -07:00
Conley Owens
9b0bd8109f am da882181: Merge "Eliminating dead code with no other effect than consuming battery life."
* commit 'da882181245fdf3eca827680d656cd298c9c318f':
  Eliminating dead code with no other effect than consuming battery life.
2011-04-28 23:52:21 -07:00
Conley Owens
ea98367cd4 Merge "Added null check on return value for getKeyDispatcherState()" 2011-04-28 15:07:00 -07:00
Conley Owens
05945dfc30 Merge "Eliminating dead logic - bitmap state simply cannot be null here." 2011-04-28 14:57:14 -07:00
Conley Owens
a0d4f794fd Merge "Removing unnecessary computation." 2011-04-28 14:57:11 -07:00
Conley Owens
92add643a1 Merge "Using robust equality check." 2011-04-28 14:57:08 -07:00
Conley Owens
9b6bfdf632 Merge "We don't need these local references." 2011-04-28 14:56:59 -07:00
Conley Owens
a19466e5d0 Merge "Eliminating dead code with no other effect than consuming battery life." 2011-04-28 14:56:55 -07:00
Scott Main
319d596af7 am d7f739b1: am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit 'd7f739b13e0336d6dd02df18d16a73636a795c3f':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:32:02 -07:00
Scott Main
fe1d9165b2 am 114ba198: am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit '114ba198f5ae19fc0a632e18369a912c54a0c44e':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:25:22 -07:00
Scott Main
bbb3bad7e3 am c59e80c4: Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb
* commit 'c59e80c4eb60a0ba665571fee2f9561aa6e936ff':
  docs: fix for Misdirected link in topic Declaring Layout bug 4257430
2011-04-28 14:21:46 -07:00
Scott Main
dae3b8228c Merge "docs: fix for Misdirected link in topic Declaring Layout bug 4257430" into honeycomb 2011-04-28 14:08:57 -07:00
Wink Saville
af69b5740e am a68a61df: Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE
* commit 'a68a61dfe37969426c535d076a20181155493226':
  Telephony: Data availability indication upon records loaded.
2011-04-28 13:54:14 -07:00
Wink Saville
baadff842b am 05fcd239: Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE
* commit '05fcd239abcdfe0c39e1d1d1f462478bf1e68e04':
  Telephony: Corrections to signal strength values.
2011-04-28 13:52:28 -07:00
Kazuhiro Ondo
4a92266355 am 379cbb1d: Send STK Service Running RIL Request after sim module is ready
* commit '379cbb1dcc4f9c7f4ca485bc34ec056e87456c8d':
  Send STK Service Running RIL Request after sim module is ready
2011-04-28 13:52:26 -07:00
Wink Saville
c0f6e31b51 Merge "Telephony: Data availability indication upon records loaded." into honeycomb-LTE 2011-04-28 13:51:31 -07:00
Wink Saville
408297f4bd Merge "Telephony: Corrections to signal strength values." into honeycomb-LTE 2011-04-28 13:51:22 -07:00
Conley Owens
044fb5186f am e6e3322a: am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit 'e6e3322a3baef4cce7d382a7890718a805c4bd3b':
  Remove duplicate '=' in exception message
2011-04-28 12:00:53 -07:00
Conley Owens
65c7f2b723 am 8fff7805: Merge "Remove duplicate \'=\' in exception message"
* commit '8fff7805ab1ccde8321697116ed3dd2fae5340ed':
  Remove duplicate '=' in exception message
2011-04-28 11:57:48 -07:00
Wink Saville
f2a8bdd2f6 am 7353301f: Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE
* commit '7353301f73bfd0fd54ca515f3385946abe56d620':
  GsmDCT: Reset DataConnection upon APN disable.
2011-04-28 11:53:08 -07:00
Wink Saville
610b3d397d am 1a517d0c: Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE
* commit '1a517d0c251d2ca577500ec6c0e434725c3ddd21':
  Remove subclass cast for calls to isDnsCheckDisabled.
2011-04-28 11:53:05 -07:00
Wink Saville
77bee31d87 am 8daec83f: Merge "Delay data reconnection after disconnected." into honeycomb-LTE
* commit '8daec83f9a3436819854827bcff480ce0a203ddb':
  Delay data reconnection after disconnected.
2011-04-28 11:53:02 -07:00
Wink Saville
0f0849b904 Merge "GsmDCT: Reset DataConnection upon APN disable." into honeycomb-LTE 2011-04-28 11:50:24 -07:00
Wink Saville
afe66645a2 Merge "Remove subclass cast for calls to isDnsCheckDisabled." into honeycomb-LTE 2011-04-28 11:50:15 -07:00
Wink Saville
0ece71bf39 Merge "Delay data reconnection after disconnected." into honeycomb-LTE 2011-04-28 11:50:05 -07:00
Irfan Sheriff
7ee2b2a01a am 8f87f838: Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE
* commit '8f87f8389866058a081e601fc0df45a3527a3150':
  Define Protocol class for use with StateMachine
2011-04-28 11:48:47 -07:00
Conley Owens
ae45dfa68a Merge "Remove duplicate '=' in exception message" 2011-04-28 11:46:39 -07:00
Irfan Sheriff
74a78c9973 Merge "Define Protocol class for use with StateMachine" into honeycomb-LTE 2011-04-28 11:38:54 -07:00
Eric Fischer
da4f940876 am 1d104476: (-s ours) am a4e7353d: Import revised translations. DO NOT MERGE
* commit '1d10447631c9478fbf9574c3fde1997cc77ee6e4':
  Import revised translations.  DO NOT MERGE
2011-04-28 10:25:52 -07:00
Conley Owens
3c4ebca573 Ignore change since file no longer exists 2011-04-28 10:10:52 -07:00
Stephen Hines
adb031659d am 697f8b33: am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
* commit '697f8b331bb339e4db716efbb96e2182aac40255':
  Check setName() for null string + fix rsRand().
2011-04-27 17:38:53 -07:00
Stephen Hines
c0c4150d2d am 00df8e23: Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1
* commit '00df8e230ef797729a3618d1d0c19cda3950c922':
  Check setName() for null string + fix rsRand().
2011-04-27 17:36:38 -07:00
Stephen Hines
776b2ccd77 Merge "Check setName() for null string + fix rsRand()." into honeycomb-mr1 2011-04-27 17:32:40 -07:00
Conley Owens
691a24f04d Merge commit '5e3562a5' into m
Conflicts:
	core/java/android/view/ViewRoot.java

Change-Id: Idd1eb8309e169eae2de3838f7969606df8097b87
2011-04-27 16:58:24 -07:00
Conley Owens
2aaa7e9bff Ignore xml change since file no longer exists 2011-04-27 16:49:07 -07:00
Eric Fischer
8885bf573b am a4e7353d: Import revised translations. DO NOT MERGE
* commit 'a4e7353d33a0736361c866db76008a66ad8fbf8a':
  Import revised translations.  DO NOT MERGE
2011-04-27 15:30:36 -07:00
Conley Owens
e0072d13c0 am a6590e7f: am 13b21e60: Merge "Auto hide virtual keyboard"
* commit 'a6590e7fee1ef4286f0896358593fdb9aab24f6c':
  Auto hide virtual keyboard
2011-04-27 14:53:26 -07:00