47960 Commits

Author SHA1 Message Date
Adam Powell
f5abccefb1 am 73a31ec9: Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
* commit '73a31ec91c3e472503e9fbbfe82b8c3bbc5140ed':
  New opaque cab assets; search dialog tweaks.
2011-05-20 13:04:11 -07:00
Adam Powell
73a31ec91c Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2 2011-05-20 12:59:43 -07:00
Gloria Wang
dbfd055d51 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
2011-05-20 10:57:51 -07:00
Gloria Wang
a6f1104b9d Use pread() to get the decrypted data for container based DRM file.
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
2011-05-20 10:15:21 -07:00
satok
d9435bcecc am b4788fdb: Do not merge. Backport two fixes for InputMethethodFramework
* commit 'b4788fdbfdda97bd9cfd0e483276934114d9c438':
  Do not merge. Backport two fixes for InputMethethodFramework
2011-05-20 06:41:03 -07:00
satok
b4788fdbfd Do not merge. Backport two fixes for InputMethethodFramework
Bug: 3420384

backport cl1: Iaf293cf6c6fb35a994f344b0afc30e9f523032f4
backport cl2: I29d2555aeb7d0e51205d9f1fe0da708df0890942

Change-Id: Ia71ba27957fa818dc4ef8ff05b5fdb120b9650e0
2011-05-20 22:11:54 +09:00
Dianne Hackborn
c851ea5672 am 69cb8757: Add new "-swNNNdp" resource qualifier.
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
  Add new "-swNNNdp" resource qualifier.
2011-05-19 19:30:32 -07:00
Adam Powell
8abebcde3f New opaque cab assets; search dialog tweaks.
* New opaque assets (now actually opaque!)

* SearchDialog determines theme to use from parent context

* SearchDialog now disallows action modes

Change-Id: If05fe64d7cc4460678d78412275ee988ddb47e9e
2011-05-19 18:48:44 -07:00
Dianne Hackborn
69cb87576b Add new "-swNNNdp" resource qualifier.
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -07:00
Adam Powell
d40575eb98 am b9537db8: Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
* commit 'b9537db8d9ee27efb4a98415ad2d6b50c1806e5d':
  DO NOT MERGE Action bar config changes
2011-05-19 17:06:09 -07:00
Adam Powell
b9537db8d9 Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2 2011-05-19 15:48:38 -07:00
Adam Powell
dacbb746c9 DO NOT MERGE Action bar config changes
Handle action bar padding on configuration changes when the app
handles these changes itself.

Change-Id: I044da9253a0be6b4bbabdc12891b6d4786725afa
2011-05-19 15:38:27 -07:00
Irfan Sheriff
a4815c0ec0 am 9c9088a5: Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
* commit '9c9088a54f6dee7a13dcc7a12297137147b01baa':
  Move softap config handling to WifiConfigStore
2011-05-19 14:57:54 -07:00
Irfan Sheriff
9c9088a54f Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2 2011-05-19 14:54:25 -07:00
Chet Haase
f0c6ddd99b am 51fb9703: Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
* commit '51fb97031f62b1181fc9eb6c636d09a68987d939':
  DO NOT MERGE: Add custom fragment anims for popping backstack
2011-05-19 13:59:06 -07:00
Chet Haase
51fb97031f Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2 2011-05-19 13:57:03 -07:00
Chet Haase
19e748a3d1 DO NOT MERGE: Add custom fragment anims for popping backstack
The previous fragment implementation allowed for animations
during fragment transitions, but did not account for the
different behavior of fragments when popping the back stack.
In general, you probably don't want to run the same animation
for putting a fragment on the stack as for popping it off, which
is what happens now. For example, you might fade a fragment out when
putting it on the stack. But when popping ot off, fading it out
is probably not the behavior you want.

The new API (setCustomAnimations() overload with two additional
parameters) allows developers to specify animations to be run
in the popping operation. Otherwise, the animations are null and
the operation will not be animated.

Change-Id: I53bbc6e6ec4e953b7ecdd99e2452d81857917de2
2011-05-19 13:44:40 -07:00
Wink Saville
ab5baa1d5f Merge "Reset connection while data state changed." into honeycomb-LTE 2011-05-19 11:25:45 -07:00
Joe Fernandez
605be31c4a am 146a0b45: am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit '146a0b4522db2d782953a464fe63adcd7e1569c2':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:59:16 -07:00
Joe Fernandez
146a0b4522 am fde9ac72: Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
* commit 'fde9ac72668ced2e473ad247cacc8a4bdd05996f':
  docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74
2011-05-19 10:53:04 -07:00
Joe Fernandez
fde9ac7266 Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1 2011-05-19 10:49:45 -07:00
Mike Lockwood
ae448e2c90 am a88b42d5: USB: Add method to access raw USB device descriptors
* commit 'a88b42d569a91290477d8f5731a2ee43931271da':
  USB: Add method to access raw USB device descriptors
2011-05-19 10:01:53 -07:00
Mike Lockwood
a88b42d569 USB: Add method to access raw USB device descriptors
Change-Id: Id5b46ede14a838198a59bdc8ed4732942044cfa8
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-19 12:57:41 -04:00
Adam Powell
d466a4631f am b7ec3e41: Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2
* commit 'b7ec3e41a6b3423d1669ae784a8ad8fbe32df29d':
  DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
2011-05-18 19:14:44 -07:00
Adam Powell
b7ec3e41a6 Merge "DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets." into honeycomb-mr2 2011-05-18 19:13:22 -07:00
Adam Powell
67a0a6ab09 DO NOT MERGE Adjust action bar home/up sizing/padding for smaller tablets.
Change-Id: I56a75189ae48f04934882661ce5014549a089769
2011-05-18 19:10:46 -07:00
Xavier Ducrohet
582841e734 am b18e700c: am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'b18e700cb9c1d7090904449fc6878b8eae1d4693':
  LayoutLib: support the new baseline/margin query API.
2011-05-18 17:43:27 -07:00
Xavier Ducrohet
b18e700cb9 am aa0834e3: Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
* commit 'aa0834e3e6c3ceef6f78e3e03d1d27046e5237a0':
  LayoutLib: support the new baseline/margin query API.
2011-05-18 17:40:08 -07:00
Xavier Ducrohet
aa0834e3e6 Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1 2011-05-18 17:36:16 -07:00
James Dong
380244e9d6 am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
  Using widevine:// to stream adaptive bitrate wvm content no longer
2011-05-18 16:09:58 -07:00
James Dong
d148a499c2 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 2011-05-18 16:06:14 -07:00
Wink Saville
be2b058ec1 Reset connection while data state changed.
Check data call states and reset connection if any link properties changed.


Change-Id: I008aea969378648192852161959fdf4aad6211a1
2011-05-18 15:59:04 -07:00
Irfan Sheriff
ffcea7ae73 Move softap config handling to WifiConfigStore
Move softap config to flat file and read/write on a seperate handler thread

Bug: 4391796

Change-Id: Iafe43200d7f829df7ced20a4e7b0ed451ad22a05
2011-05-18 15:29:31 -07:00
Robert Greenwalt
59b1a4ede7 Switch to use netd to add/remove routes.
Also adds support for v6 routes and for removing single routes.

Change-Id: I1c4f08c7938371090944d8d6f603e1e0d6d70c01
2011-05-18 15:25:43 -07:00
Dianne Hackborn
8416e5cf0a am 6ad07db7: Merge "Fix fake display size when rotated." into honeycomb-mr2
* commit '6ad07db7a2c289d036f081eb0c7a666cdb77b548':
  Fix fake display size when rotated.
2011-05-18 15:12:07 -07:00
Dianne Hackborn
6ad07db7a2 Merge "Fix fake display size when rotated." into honeycomb-mr2 2011-05-18 15:09:58 -07:00
Dianne Hackborn
8f7c271ac9 Fix fake display size when rotated.
Change-Id: Ic8a1dbe32cf0cb3c5cdc9b9294b98e810558f875
2011-05-18 15:07:48 -07:00
Gloria Wang
5a6c3d491c am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
  DO NOT MERGE For bug 4422428 Squashed commit of the following:
2011-05-18 09:19:56 -07:00
Gloria Wang
07e9267d33 Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 2011-05-18 09:17:50 -07:00
Kazuhiro Ondo
01758e81b3 Linkproperties update via unsol data call state change.
Handles the scenario of radio technology handover with IP continuity.
Once RIL/Modem finished a handover operation, an unsol data call state
change will be send up to FW notifying all link propertes changes.
FW will then re-configure the device with new link properties
including iptable used by Tethering.

Change-Id: I05e29f66ac3db8ba4274d3662642607742ba1d12
2011-05-17 20:53:40 -07:00
Wink Saville
258208a78c Merge "Remove SIM operator name hack" into honeycomb-LTE 2011-05-17 20:35:35 -07:00
Adam Powell
98603eed2f am 30a76196: Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
* commit '30a76196c8f426b530a80166817d3280acb2b100':
  Fix bug 4416126 - orientation change bug with action bar overflow menu
2011-05-17 20:25:58 -07:00
Adam Powell
30a76196c8 Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2 2011-05-17 20:24:39 -07:00
Adam Powell
5d6c990b7f Fix bug 4416126 - orientation change bug with action bar overflow menu
Change-Id: I8e327bd41e610c792db4eed36ed46b58e94c0ea0
2011-05-17 20:20:52 -07:00
Dianne Hackborn
c2db21445d am a429d5df: Merge "Improve compat mode scaling implementation." into honeycomb-mr2
* commit 'a429d5df1aa59d817d694b96a07351224cc5d146':
  Improve compat mode scaling implementation.
2011-05-17 18:40:12 -07:00
Dianne Hackborn
a429d5df1a Merge "Improve compat mode scaling implementation." into honeycomb-mr2 2011-05-17 18:38:37 -07:00
Adam Powell
16c692229d am 185d9c4d: Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2
* commit '185d9c4dbf4b0ee976e4d0c3ea9d3ba307491339':
  Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space.
2011-05-17 18:32:06 -07:00
Adam Powell
185d9c4dbf Merge "Tweak padding and sizing of alert dialog elements to fit better in landscape mode on large screen devices. Integrate new dialog frame assets that take up less space." into honeycomb-mr2 2011-05-17 18:30:08 -07:00
Dianne Hackborn
ffb3d939cc Improve compat mode scaling implementation.
Rip out the old funky code for trying to restrict the app window
sizes to be within the compat mode range.  Instead, we know rely
entirely on scaling -- we deal with windows always with the scaling
applied so that the window manager doesn't have to deal with them
specially.  Instead, we just apply the inverse scale at the few
points we need to do something the app sees.

Change-Id: I785409dd4513b5f738684e1635dc8f770c249651
2011-05-17 18:29:51 -07:00
Adam Powell
bd964f9624 Tweak padding and sizing of alert dialog elements to fit better in
landscape mode on large screen devices. Integrate new dialog frame
assets that take up less space.

Change-Id: Icd1261063511355844579d6c5c34f32284031f82
2011-05-17 18:25:56 -07:00