John Wang
647975b59c
Merge "Add UI to handle SIM swap." into honeycomb-LTE
2011-05-20 17:18:56 -07:00
Jim Miller
89bbe8d827
am 2c7906eb: Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
...
* commit '2c7906eb392c6349e6f75fd2681310b934d6e262':
Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI
2011-05-20 16:51:49 -07:00
Jim Miller
643ad1de51
Merge "Fix 4462474: Use new sw600dp resource target for LockScreen & SystemUI" into honeycomb-mr2
2011-05-20 16:49:08 -07:00
Wink Saville
080fe5c2c1
Merge "Fix broken data retry" into honeycomb-LTE
2011-05-20 16:47:54 -07:00
Adam Powell
87360924a4
am bdc26dc3: Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
...
* commit 'bdc26dc34a5d848883d5acdee62f5b4403e8fe04':
Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations.
2011-05-20 16:02:21 -07:00
Adam Powell
a7a8ea1f6f
Merge "Change measurement of effective screen height for PopupWindow now that DisplayMetrics reports it without system decorations." into honeycomb-mr2
2011-05-20 15:59:19 -07:00
Wink Saville
4ee7a7cd52
Merge "Change getLteOnCdmaModeStatic to dynamically determine its result." into honeycomb-LTE
2011-05-20 15:27:03 -07:00
Dianne Hackborn
7e4c1982d3
am 1b144e62: Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
...
* commit '1b144e625fb0d34cd680c44cbcfb2deb8a76d4c6':
Add ParcelFileDescriptor.fromFd() and .adoptFd().
2011-05-20 14:32:35 -07:00
Dianne Hackborn
cbc706222f
Merge "Add ParcelFileDescriptor.fromFd() and .adoptFd()." into honeycomb-mr2
2011-05-20 14:28:43 -07:00
Robert Greenwalt
26e447eff3
Merge "Simplfy getActive* calls in ConnectivityService" into honeycomb-LTE
2011-05-20 14:25:29 -07:00
Jim Miller
2d99f8540a
am 14e45f9b: Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
...
* commit '14e45f9b19a846af074d73b3792e35de0448ac21':
Fix 4462497: Move layouts from xlarge to large to enable 7" tablets
2011-05-20 13:16:47 -07:00
Jim Miller
894077b7bf
am 5e731140: Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
...
* commit '5e731140f38e06c42885fa300efc30da00711c76':
Fix 4462474: Fixes crash on 7" tablet due to using wrong resource
2011-05-20 13:16:43 -07:00
Jim Miller
43e0fc2793
Merge "Fix 4462497: Move layouts from xlarge to large to enable 7" tablets" into honeycomb-mr2
2011-05-20 13:13:19 -07:00
Jim Miller
d01bbac731
Merge "Fix 4462474: Fixes crash on 7" tablet due to using wrong resource" into honeycomb-mr2
2011-05-20 13:12:57 -07:00
Adam Powell
0233c6ef98
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
d415a61653
Merge "New opaque cab assets; search dialog tweaks." into honeycomb-mr2
2011-05-20 12:59:43 -07:00
Gloria Wang
8c9b1529d7
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
satok
551d68b90c
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
Dianne Hackborn
6c87dbce9f
am 69cb8757: Add new "-swNNNdp" resource qualifier.
...
* commit '69cb87576ba163b61bb0e6477a3b7c57a9b11d40':
Add new "-swNNNdp" resource qualifier.
2011-05-19 19:30:32 -07:00
Dianne Hackborn
22585947ff
Add new "-swNNNdp" resource qualifier.
...
Change-Id: I0101e88ca9d8d44138bdcaf571f24b0352f4f6ce
2011-05-19 18:23:29 -07:00
Adam Powell
87c442a9b7
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
3da5b00cf0
Merge "DO NOT MERGE Action bar config changes" into honeycomb-mr2
2011-05-19 15:48:38 -07:00
Irfan Sheriff
a0bda8e5fc
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
5cd336e4d9
Merge "Move softap config handling to WifiConfigStore" into honeycomb-mr2
2011-05-19 14:54:25 -07:00
Chet Haase
5f953706cb
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
31808fa85d
Merge "DO NOT MERGE: Add custom fragment anims for popping backstack" into honeycomb-mr2
2011-05-19 13:57:03 -07:00
Wink Saville
fe0380f2e6
Merge "Reset connection while data state changed." into honeycomb-LTE
2011-05-19 11:25:45 -07:00
Joe Fernandez
ecaf66a1b9
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
10f5d9880b
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
5986a9eb56
Merge "docs: Cherrypicking change from honeycomb Change-Id: I6b62a5c608d3f17f5ff3c81773dc3055d0428d74" into honeycomb-mr1
2011-05-19 10:49:45 -07:00
Mike Lockwood
ff0662ead6
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
Adam Powell
c14243ec52
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
ff661a6e78
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
Xavier Ducrohet
c1a72346bb
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
04a238006c
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
8b836da477
Merge "LayoutLib: support the new baseline/margin query API." into honeycomb-mr1
2011-05-18 17:36:16 -07:00
James Dong
ebc9266940
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
502019a5df
Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2
2011-05-18 16:06:14 -07:00
Dianne Hackborn
65cec3f349
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
9a11c3710a
Merge "Fix fake display size when rotated." into honeycomb-mr2
2011-05-18 15:09:58 -07:00
Gloria Wang
0ec18622dd
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
4bee0c6039
Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2
2011-05-18 09:17:50 -07:00
Wink Saville
5e5c8507a6
Merge "Remove SIM operator name hack" into honeycomb-LTE
2011-05-17 20:35:35 -07:00
Adam Powell
9187214d41
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
57d723dfaf
Merge "Fix bug 4416126 - orientation change bug with action bar overflow menu" into honeycomb-mr2
2011-05-17 20:24:39 -07:00
Dianne Hackborn
c9ba3c8870
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
0265a6ba75
Merge "Improve compat mode scaling implementation." into honeycomb-mr2
2011-05-17 18:38:37 -07:00
Adam Powell
8fe8db60fe
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
39bbfc22a9
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
Katie McCormick
a46e385cf1
am 4ef5f4dc: am 566489db: Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
...
* commit '4ef5f4dce666b90c786da61bb2371dc51ea8dc40':
Cherrypick from HC--3.0 appwidget features. Change-Id: Idf9e0003db0f45264ca34e513ad132cc089cf62d
2011-05-17 17:40:38 -07:00