Adam Powell
2ca7240aed
Merge "Fix bug 5079507 - ICS (phone) : ActionBar tabs don't correctly resize if activity handles orientation change"
2011-07-28 16:40:03 -07:00
Justin Ho
645622d9b9
Merge "Updated popup assets Bug: 5080369"
2011-07-28 16:39:36 -07:00
Justin Ho
e75bb153be
Merge "Updated spinner assets Bug: 5076695"
2011-07-28 16:39:21 -07:00
Justin Ho
e08ce7b090
Merge "Updated check_on and check_off"
2011-07-28 16:38:52 -07:00
Christopher Tate
479d20d8a9
Merge "Support full-backup encryption and global backup password"
2011-07-28 16:28:21 -07:00
Romain Guy
aea38c43fc
Merge "Add notifyPixelsChanged() call to NDK unlockPixels()."
2011-07-28 16:26:08 -07:00
Irfan Sheriff
b14d7af9ba
Merge "Changed walled garden to better url"
2011-07-28 16:24:38 -07:00
Jamie Gennis
db5230f444
SurfaceFlinger: fix a layer occlusion bug
...
This change fixes a bug where the window visibility would be computed
before any buffers were available, causing the window to be treated as
non-opaque. When the first buffer arrived, if both mCurrentOpacity and
the opacity determined by the buffer's format were 'opaque', a
recomputation of the opacity would not be done, and the window would
continue to be treated as non-opaque. SurfaceFlinger could then
unnecessarily draw fully occluded layers.
Change-Id: I2b95da2f4b50e68d50fc5afd8b772e26e62f58d6
Bug: 5057122
2011-07-28 16:03:28 -07:00
Svetoslav Ganov
b3bca856a2
Merge "Updaing the database version"
2011-07-28 15:57:25 -07:00
Romain Guy
4435d4d726
Merge "Correctly apply linear filter to drawBitmap(Rect, Rect)"
2011-07-28 15:43:31 -07:00
Adam Cohen
f697d67ac9
Merge "Fixing widget notifyDataSetChanged() not getting called, issue 5092676"
2011-07-28 15:36:19 -07:00
Justin Ho
594af9e3fd
Merge "Updated presence icons Bug: 5045000"
2011-07-28 15:13:55 -07:00
Jeff Sharkey
59bb87f488
Merge "Keep original DialogTitle color when resizing."
2011-07-28 14:16:50 -07:00
Mike Lockwood
a0f070dfc4
am 21700fed: am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit '21700fedfe29f6a0a752d2bea46142038e69136c':
gps: Adding ip address for AGps
2011-07-28 14:06:07 -07:00
Mike Lockwood
1dc4736a33
am 5f7203eb: am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit '5f7203eb258503bc5d2ba29176bdf483a68a93b8':
gps: Adding ip address for AGps
2011-07-28 14:04:13 -07:00
Eric Laurent
4ab2ffbf84
Merge "Fix issue 5090721: audio record broken"
2011-07-28 14:03:33 -07:00
Mike Lockwood
15c8cd406b
am 5a27a754: am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit '5a27a7543edbd09a56e36d04adb4cfab922e6346':
gps: Adding ip address for AGps
2011-07-28 14:02:14 -07:00
Robert Greenwalt
beb707090b
Merge "Stop sending tethering broadcasts during boot."
2011-07-28 14:00:48 -07:00
Mike Lockwood
7779a44043
am bd1dee94: Merge "gps: Adding ip address for AGps"
...
* commit 'bd1dee94dfe2e1d7564cae3c8c6be53cc4e66998':
gps: Adding ip address for AGps
2011-07-28 14:00:27 -07:00
Mike Lockwood
7c95ffbbcc
Merge "gps: Adding ip address for AGps"
2011-07-28 13:52:55 -07:00
Mike Lockwood
3b34215ced
am f8d13e53: am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit 'f8d13e535c3e6166c2386adac3b3a2f115d2b79d':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:30:24 -07:00
Mike Lockwood
94a10fa407
am bf676d46: am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit 'bf676d460d1d1fc8923982006c38d0f6785daea8':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:27:27 -07:00
Mike Lockwood
b0e2827bce
am 7083ed44: am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit '7083ed44ee72d4885d01c683eb745dc4bdfb74d8':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:25:34 -07:00
Michael Jurka
39188d61e7
Merge "Dismiss Recent Apps when Back is pressed"
2011-07-28 13:24:14 -07:00
Mike Lockwood
956ddf5604
am 0ff79e88: Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
...
* commit '0ff79e88e2d90f80d0346e0485abe773ca85c44d':
GPS: Changes to enable on-demand data call flow for CDMA connections
2011-07-28 13:23:01 -07:00
Mike Lockwood
a9b8a0640e
Merge "GPS: Changes to enable on-demand data call flow for CDMA connections"
2011-07-28 13:13:35 -07:00
Ben Murdoch
ce65b48cf1
Merge "Revert "Disable Crankshaft in DRT for performance testing.""
2011-07-28 13:10:38 -07:00
Svetoslav Ganov
159e39f7e8
Merge "Updating the data base upgrade/creation code for the new touch exploraion setting."
2011-07-28 12:29:29 -07:00
Adam Powell
1ae9e7db06
Merge "Fix bug 5087752 - Maintain correct contrast against action bars in inverse-bar themes"
2011-07-28 11:58:21 -07:00
Svetoslav Ganov
aaf53a77a2
Merge "AccessibilityNodeInfo reports no children for the topmost view in the tree."
2011-07-28 11:09:43 -07:00
Justin Ho
a914991afd
Merge "Updated expander assets"
2011-07-28 10:39:36 -07:00
Adam Powell
72929bed74
Merge "Fix bug 5087980 - MenuItem#expandActionView should work from within onCreateOptionsMenu"
2011-07-28 10:02:14 -07:00
Kristian Monsen
74bba4e8c3
Merge "Part of fix for bug 4997380: Some error types unknown to SslError"
2011-07-28 06:50:40 -07:00
Jeff Sharkey
13fbd9a9a2
Merge "Maintain separate "restrict background data" flag."
2011-07-27 22:08:02 -07:00
Wink Saville
6da562d9d9
am 5ad5c9e3: am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
...
* commit '5ad5c9e3efd26155ae7b5d0f3e9e2094e1f65dfe':
Support of LTE Only mode
2011-07-27 20:41:23 -07:00
Wink Saville
a6e07f0018
am d20f60c8: Merge "Support of LTE Only mode" into honeycomb-LTE
...
* commit 'd20f60c8a71ca0aa853bc433f74b32dcfc98f984':
Support of LTE Only mode
2011-07-27 20:39:09 -07:00
Wink Saville
922649c544
Merge "Support of LTE Only mode" into honeycomb-LTE
2011-07-27 20:35:52 -07:00
Romain Guy
4a01cfcdcf
Merge "Reclaim more memory, more often."
2011-07-27 18:53:32 -07:00
Xavier Ducrohet
c01663e2be
am 6abf2f50: am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit '6abf2f501e60132a5369ad5b15b388912c8e9e5b':
Remove Debug Code
2011-07-27 18:43:32 -07:00
Xavier Ducrohet
a5afd4fdd9
am 0b45ca88: am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit '0b45ca8884acfd2e9ccdcb3fbe641a46b116bda0':
Remove Debug Code
2011-07-27 18:40:49 -07:00
Xavier Ducrohet
126c631581
am cd01ad7c: am 20339b24: Merge "Remove Debug Code"
...
* commit 'cd01ad7cc7813e3067826945c2a472602f1d3509':
Remove Debug Code
2011-07-27 18:38:50 -07:00
Xavier Ducrohet
7fa726e769
am 20339b24: Merge "Remove Debug Code"
...
* commit '20339b24394be06c5bfe5157a4b35adc48f665eb':
Remove Debug Code
2011-07-27 18:36:17 -07:00
Chia-chi Yeh
09aa572bdb
Merge "Unhide APIs for user space VPN."
2011-07-27 18:35:51 -07:00
Ying Wang
e993c420d0
Merge "Fix uses of all-subdir-makefiles"
2011-07-27 18:29:26 -07:00
Xavier Ducrohet
eff4cc7766
Merge "Remove Debug Code"
2011-07-27 18:26:01 -07:00
Jeff Sharkey
a0c2fecd63
Merge "Grant AID_NET_BW_STATS to system service."
2011-07-27 18:09:42 -07:00
Ying Wang
0a1fdd7d50
Fix uses of all-subdir-makefiles
...
We should use all-makefiles-under instead.
all-subdir-makefiles can be used only before any "include" statement.
Before this change, both subdirs were actually not included.
Change-Id: I6bf35d07f294a5012c9322096f999ac26e37432f
2011-07-27 16:59:08 -07:00
Gilles Debunne
6bd7668351
Merge "Bug 4571327: error popup empty when displayed on top"
2011-07-27 16:47:26 -07:00
Daniel Sandler
a36f16f712
Merge "Restore status icons to former size & opacity on tablets."
2011-07-27 16:36:11 -07:00
Ramesh Sudini
7c29339919
am 8ce53e38: am 9a87deb5: DataConnection: Clear cid when entering inactive state.
...
* commit '8ce53e387e2b4427265ae9e43bc15d9fe850643d':
DataConnection: Clear cid when entering inactive state.
2011-07-27 16:35:41 -07:00