diff options
| -rw-r--r-- | Android.mk | 10 | ||||
| -rw-r--r-- | core/res/res/layout/keyguard_screen_tab_unlock.xml | 2 | ||||
| -rw-r--r-- | docs/html/resources/resources-data.js | 10 | ||||
| -rw-r--r-- | docs/html/resources/samples/images/ActionBarCompat1.png | bin | 0 -> 19637 bytes | |||
| -rw-r--r-- | docs/html/resources/samples/images/ActionBarCompat2.png | bin | 0 -> 22271 bytes | |||
| -rw-r--r-- | tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java | 2 |
6 files changed, 18 insertions, 6 deletions
diff --git a/Android.mk b/Android.mk index 2311f3ce59f5..5a403187b7d6 100644 --- a/Android.mk +++ b/Android.mk @@ -400,6 +400,8 @@ web_docs_sample_code_flags := \ resources/samples/AccessibilityService "Accessibility Service" \ -samplecode $(sample_dir)/AccelerometerPlay \ resources/samples/AccelerometerPlay "Accelerometer Play" \ + -samplecode $(sample_dir)/ActionBarCompat \ + resources/samples/ActionBarCompat "Action Bar Compatibility" \ -samplecode $(sample_dir)/AndroidBeam \ resources/samples/AndroidBeam "Android Beam" \ -samplecode $(sample_dir)/ApiDemos \ @@ -416,12 +418,12 @@ web_docs_sample_code_flags := \ resources/samples/BusinessCard "Business Card" \ -samplecode $(sample_dir)/ContactManager \ resources/samples/ContactManager "Contact Manager" \ - -samplecode $(sample_dir)/CubeLiveWallpaper \ - resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \ + -samplecode $(sample_dir)/CubeLiveWallpaper \ + resources/samples/CubeLiveWallpaper "Cube Live Wallpaper" \ -samplecode $(sample_dir)/Home \ resources/samples/Home "Home" \ - -samplecode $(sample_dir)/HoneycombGallery \ - resources/samples/HoneycombGallery "Honeycomb Gallery" \ + -samplecode $(sample_dir)/HoneycombGallery \ + resources/samples/HoneycombGallery "Honeycomb Gallery" \ -samplecode $(sample_dir)/JetBoy \ resources/samples/JetBoy "JetBoy" \ -samplecode $(sample_dir)/LunarLander \ diff --git a/core/res/res/layout/keyguard_screen_tab_unlock.xml b/core/res/res/layout/keyguard_screen_tab_unlock.xml index 4349c5bb0e87..0ec8f75871e0 100644 --- a/core/res/res/layout/keyguard_screen_tab_unlock.xml +++ b/core/res/res/layout/keyguard_screen_tab_unlock.xml @@ -121,7 +121,7 @@ <RelativeLayout android:layout_width="match_parent" - android:layout_height="292dip"> + android:layout_height="302dip"> <com.android.internal.widget.multiwaveview.MultiWaveView android:id="@+id/unlock_widget" diff --git a/docs/html/resources/resources-data.js b/docs/html/resources/resources-data.js index 796b30a90b44..926737388915 100644 --- a/docs/html/resources/resources-data.js +++ b/docs/html/resources/resources-data.js @@ -408,6 +408,16 @@ var ANDROID_RESOURCES = [ } }, { + tags: ['sample', 'new', 'ui', 'compatibility', 'newfeature'], + path: 'samples/ActionBarCompat/index.html', + title: { + en: 'Action Bar Compatibility' + }, + description: { + en: 'Shows how to use the action bar on both pre-API 11 and API 11+ devices, maximizing code re-use.' + } + }, + { tags: ['sample', 'new'], path: 'samples/AndroidBeam/index.html', title: { diff --git a/docs/html/resources/samples/images/ActionBarCompat1.png b/docs/html/resources/samples/images/ActionBarCompat1.png Binary files differnew file mode 100644 index 000000000000..64d3e66f621b --- /dev/null +++ b/docs/html/resources/samples/images/ActionBarCompat1.png diff --git a/docs/html/resources/samples/images/ActionBarCompat2.png b/docs/html/resources/samples/images/ActionBarCompat2.png Binary files differnew file mode 100644 index 000000000000..04a7e6c5feca --- /dev/null +++ b/docs/html/resources/samples/images/ActionBarCompat2.png diff --git a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java index 5df018e68eaf..c3ac22ca05e4 100644 --- a/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java +++ b/tests/permission/src/com/android/framework/permission/tests/WindowManagerPermissionTests.java @@ -423,7 +423,7 @@ public class WindowManagerPermissionTests extends TestCase { } try { - mWm.freezeRotation(); + mWm.freezeRotation(-1); mWm.getSwitchState(0); fail("IWindowManager.freezeRotation did not throw SecurityException as" + " expected"); |
