Xia Wang
2dc7afd9c4
Add opengl bench mark test:
...
-- display icons with livewallpaper background (galaxy)
Change-Id: I5b49bc732180069957abb47d206b5849c47469df
2011-06-15 17:51:52 -07:00
Svetoslav Ganov
fa59d178bb
Merge "Invisible views should not be visible to accessibility services (interrogation)"
2011-06-15 17:30:10 -07:00
Svetoslav Ganov
ea1da3d2e6
Invisible views should not be visible to accessibility services (interrogation)
...
1. Infisible children of a ViewGroup are reported by View group
while constructing an AccessibilityNodeInfo.
2. AncestorView does not check whether a found view is shown before
returining it or perform action on it.
bug:4672230
Change-Id: Ic620ea71b7755c598407bdd813a2beeee400c89c
2011-06-15 17:28:10 -07:00
Xia Wang
11900410e0
Merge "Fill in opengl benchmark test: - display a list view"
2011-06-15 17:25:23 -07:00
Xia Wang
7c7d135790
Fill in opengl benchmark test:
...
- display a list view
Change-Id: I72ac8e4c84ae497f2297ed3c803a62db2600ef08
2011-06-15 17:16:42 -07:00
Chia-chi Yeh
b2eeb05889
Merge "VpnDialogs: use IConnectivityManager instead or ConnectivityManager."
2011-06-15 17:07:09 -07:00
Chia-chi Yeh
f530da67b4
VpnDialogs: use IConnectivityManager instead or ConnectivityManager.
...
Change-Id: I8870a43ecbffa606d2e29f6c4b1b1a605b2b79e5
2011-06-15 17:05:25 -07:00
Dave Santoro
7ff1c2aefd
Merge "Added profile string descriptions and limits."
2011-06-15 16:56:45 -07:00
John Wang
59c17fbb98
Merge "Don't clean up operator properties in RuimRecords."
2011-06-15 16:51:41 -07:00
Michael Jurka
d727cf7e3f
Merge "Port recent apps from tablet to phone"
2011-06-15 16:51:22 -07:00
Michael Jurka
3b1fc47d00
Port recent apps from tablet to phone
...
- wire up to long press on home
- remove unused recents activity
- remove duplicate recents resources in -large directories (using -sw600dp instead)
- fix issue with zoom/scale translation when recents was brought up
Change-Id: I45538ccaff49b46ac3659c4828f9e2b0cd075241
2011-06-15 16:50:04 -07:00
Romain Guy
81d7848f17
Merge "Properly refcount SurfaceTexture in the JNI layer."
2011-06-15 16:49:57 -07:00
Dave Santoro
7fb888ac89
Added profile string descriptions and limits.
...
Bug: 4584896
Change-Id: I0b73022a179a850c047a17ea03117f54931a748a
2011-06-15 16:47:26 -07:00
John Wang
f4a9e1a8a4
Don't clean up operator properties in RuimRecords.
...
Don't clean up PROPERTY_ICC_OPERATOR_ISO_COUNTRY and
PROPERTY_ICC_OPERATOR_NUMERIC here. Since not all CDMA
devices have RUIM, these properties should keep the original
values, e.g. build time settings, when there is no RUIM but
set new values when RUIM is available and loaded.
bug:4552029
Change-Id: I37c2cea32b582a00873b7f85b70abe30253e1241
2011-06-15 16:33:41 -07:00
Romain Guy
e5e0c50f7d
Properly refcount SurfaceTexture in the JNI layer.
...
Change-Id: I4b4c8020c13b8d6ce0d302fe42410033bf5785a6
2011-06-15 16:14:26 -07:00
Xavier Ducrohet
576715c759
Merge "Fix changed native method delegates in layoutlib for ICS."
2011-06-15 15:46:30 -07:00
Svetoslav Ganov
13774d2e38
AccessibilityNodeInfo not properly returning checked status
...
1. CompundButton was not setting its checked state in the info.
bug:4674048
Change-Id: Ic711d4ee9b2214e9bdf86546df406b497aaa90b5
2011-06-15 15:32:11 -07:00
The Android Open Source Project
f66abd3c07
Reconcile with gingerbread-release
...
Change-Id: I500f9a10cdfb891919b1e5618a42330ba00fcfb6
2011-06-15 15:09:49 -07:00
Justin Ho
f4b56eaaba
am 40fc6e0d: am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
...
* commit '40fc6e0de578198c9cc5d9a493cb7db77bc938b8':
Updated art for compat mode dialog.
2011-06-15 15:01:42 -07:00
Justin Ho
40fc6e0de5
am c407ef22: am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
...
* commit 'c407ef22222f8f7e6f82abd081ecb65149336f99':
Updated art for compat mode dialog.
2011-06-15 14:58:56 -07:00
Justin Ho
c407ef2222
am f4096041: Merge "Updated art for compat mode dialog." into honeycomb-mr2
...
* commit 'f409604122f959653fb789e9133e94a51e369693':
Updated art for compat mode dialog.
2011-06-15 14:56:03 -07:00
Justin Ho
f409604122
Merge "Updated art for compat mode dialog." into honeycomb-mr2
2011-06-15 14:52:52 -07:00
Xavier Ducrohet
66743a1ec0
Fix changed native method delegates in layoutlib for ICS.
...
Change-Id: I49306868cd8a41b6b7d919c3e8b108d5c014530e
2011-06-15 14:43:42 -07:00
Wink Saville
3d8fcebc98
am ec18268e: am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
...
* commit 'ec18268eb42641cd2a6ae9c8b26e35d67bb41021':
Always clear settings when entering Inactive state.
2011-06-15 14:37:00 -07:00
Wink Saville
ec18268eb4
am 1146bddf: Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
...
* commit '1146bddf92fc91dad384bdaea740f9472bebd911':
Always clear settings when entering Inactive state.
2011-06-15 14:34:08 -07:00
Wink Saville
1146bddf92
Merge "Always clear settings when entering Inactive state." into honeycomb-LTE
2011-06-15 14:31:16 -07:00
Jean-Baptiste Queru
cbeac2b06d
am edfdef92: Merge 5137711109783dcbb20143d3e5cab2fa931218dd
...
* commit 'edfdef926e4ddd123c9112e97605ff8d97ba9fad':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
2011-06-15 14:28:50 -07:00
Jean-Baptiste Queru
edfdef926e
Merge 5137711109783dcbb20143d3e5cab2fa931218dd
...
Change-Id: I5046a54648bdeea6f9661c46329d7b502f2f52b9
2011-06-15 14:25:47 -07:00
Mathias Agopian
5137711109
am afffa8fa: fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
...
* commit 'afffa8fa9f82a7343e1158bf921931fd3e3df615':
fix RefBase so it retains binary-compatibility with gingerbread (DO NOT MERGE)
2011-06-15 14:13:04 -07:00
Irfan Sheriff
1e8b3e4e76
am 11954872: am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit '1195487228e1eb6c8859368286168051bd505b2f':
Fix lease duration handling
2011-06-15 14:10:51 -07:00
Irfan Sheriff
1195487228
am 5af3405f: am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit '5af3405f0d24c853bd10eb239c081e31972d3e1d':
Fix lease duration handling
2011-06-15 14:07:54 -07:00
Irfan Sheriff
5af3405f0d
am ecda5461: Merge "Fix lease duration handling" into honeycomb-mr2
...
* commit 'ecda5461603b6de77beb045dfdf82dad7ae48d61':
Fix lease duration handling
2011-06-15 14:04:23 -07:00
Wink Saville
f3e3edb2f9
am aff9ec70: am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
...
* commit 'aff9ec70e22abb64149e335ae2eb519c6027eb4a':
Clean up some debug statements.
2011-06-15 14:03:31 -07:00
Dianne Hackborn
abfb5f95cc
am 27f889d0: am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI:
...
* commit '27f889d07ced48fbc7fa61c41a4a32ec3e1a95f3':
Clean up some edge cases in the compat mode UI:
2011-06-15 14:00:29 -07:00
Irfan Sheriff
ecda546160
Merge "Fix lease duration handling" into honeycomb-mr2
2011-06-15 14:00:23 -07:00
Wink Saville
aff9ec70e2
am 4d6233b2: Merge "Clean up some debug statements." into honeycomb-LTE
...
* commit '4d6233b2edd24c83efe10f4403456b8d0c87241a':
Clean up some debug statements.
2011-06-15 13:58:20 -07:00
Wink Saville
4d6233b2ed
Merge "Clean up some debug statements." into honeycomb-LTE
2011-06-15 13:55:06 -07:00
Wink Saville
eddc3a579c
Clean up some debug statements.
...
Change-Id: Id60020f09dd858f2d2c83bdd8f8d4384e5bfc934
2011-06-15 13:45:29 -07:00
Marco Nelissen
181aafd75c
am 9c3c3004: am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
...
* commit '9c3c3004c4206da3f2579e863ce89a2f99269dd6':
Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 13:44:56 -07:00
Dianne Hackborn
27f889d07c
am 3dc1b5e2: am ed31bbf6: Clean up some edge cases in the compat mode UI:
...
* commit '3dc1b5e26fac2c6a6161d617f99fd901ee2ffc9e':
Clean up some edge cases in the compat mode UI:
2011-06-15 13:44:16 -07:00
Martijn Coenen
554344ee74
Merge "Added vcard query parameter for not attaching photo."
2011-06-15 13:31:53 -07:00
Daniel Sandler
e25f8336a0
Updated art for compat mode dialog.
...
Also finalizes on the following language & ordering in the menu:
( ) Stretch to fill screen
( ) Zoom to fill screen
Bug: 4595256
Change-Id: Ie92b1e0d829341fd73043a562e78437af2b128ec
2011-06-15 16:14:55 -04:00
Irfan Sheriff
56878760c3
Fix lease duration handling
...
Convert lease time in seconds to long before alarm
set up and add sanity check
Change-Id: I99524c97d9a643ffa8234d016d0e819a284977a1
2011-06-15 12:58:18 -07:00
Dianne Hackborn
3dc1b5e26f
am ed31bbf6: Clean up some edge cases in the compat mode UI:
...
* commit 'ed31bbf65267c1f383dd0dff37acd034f3b9b59f':
Clean up some edge cases in the compat mode UI:
2011-06-15 12:35:57 -07:00
Marco Nelissen
9c3c3004c4
am d8f9a83c: resolved conflicts for merge of d027329c to gingerbread-plus-aosp
...
* commit 'd8f9a83cab34de38981dc3ba5ca9df8dda02dbc0':
Ignore duplicate WAP push PDU source/destination port if configured
2011-06-15 12:20:57 -07:00
Chia-chi Yeh
f71e546944
Merge "VPN: change some strings in VPN notifications."
2011-06-15 11:31:34 -07:00
Dianne Hackborn
ed31bbf652
Clean up some edge cases in the compat mode UI:
...
- Don't put up multiple dialogs if a switch happens between activities
that both can use compat mode.
- Remove the help dialog if the user switches away from an app that
can use compat mode.
- Don't set the "don't show" preference until the user explicitly hits
the button.
- Hide the compat mode switch UI if the compat mode button is hidden.
Change-Id: I8dd2aab1385a264232a9256284d4a75b8e058e47
2011-06-15 11:24:07 -07:00
Chia-chi Yeh
f8905fd13d
VPN: change some strings in VPN notifications.
...
Also remove a small piece of dead code.
Change-Id: Idd10f3d72a92228951278bf360d08ba9bede02d2
2011-06-15 11:06:52 -07:00
Jeff Sharkey
7b5998578c
Merge "Fix NetworkPolicy tests after notifications."
2011-06-15 11:02:26 -07:00
Jeff Sharkey
2ef2aeb18d
Fix NetworkPolicy tests after notifications.
...
Change-Id: I569e9ceba6d89459b347ed151fd9bda2909dc892
2011-06-15 11:01:31 -07:00