LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "A few little tweaks to system ui flag demos." into jb-dev

Browse Source
This commit is contained in:
Dianne Hackborn
2012-05-20 10:17:58 -07:00
committed by Android (Google) Code Review
parent d699ad1877 58ce6f06a1
commit 7d7d2fb6d6
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
samples/ApiDemos/AndroidManifest.xml
View File

@@ -2225,7 +2225,7 @@
<activity android:name=".view.ContentBrowserActivity"
android:label="Views/System UI Visibility/Content Browser"
android:theme="@android:style/Theme.Holo.Light"
android:theme="@android:style/Theme.Holo.Light.DarkActionBar"
android:uiOptions="splitActionBarWhenNarrow">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

4
samples/ApiDemos/res/layout/content_browser.xml
View File

@@ -34,9 +34,9 @@
android:layout_height="wrap_content"
android:layout_gravity="top|center_horizontal"
android:textColor="#ff000000"
android:background="#c0f0f0f0"
android:background="#c0ffffff"
android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="left"
android:gravity="center"
android:padding="16dp"
android:text="A title goes here"
/>

3
samples/ApiDemos/src/com/example/android/apis/view/VideoPlayerActivity.java
View File

@@ -147,6 +147,7 @@ public class VideoPlayerActivity extends Activity
void setPlayPaused(boolean paused) {
mPaused = paused;
mPlayButton.setText(paused ? R.string.play : R.string.pause);
setKeepScreenOn(!paused);
setNavVisibility(true);
}
@@ -166,7 +167,7 @@ public class VideoPlayerActivity extends Activity
h.removeCallbacks(mNavHider);
if (!mMenusOpen && !mPaused) {
// If the menus are open or play is paused, we will not auto-hide.
h.postDelayed(mNavHider, 3000);
h.postDelayed(mNavHider, 1500);
}
}
}