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

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

Browse Source 
* commit '7d7d2fb6d6b8c30cd6549b9cb35e9a0d36f87981':
  A few little tweaks to system ui flag demos.
This commit is contained in:
Dianne Hackborn
2012-05-20 21:53:24 -07:00
committed by Android Git Automerger
parent 65e6090418 7d7d2fb6d6
commit 03239663fc
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" <activity android:name=".view.ContentBrowserActivity"
android:label="Views/System UI Visibility/Content Browser" 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"> android:uiOptions="splitActionBarWhenNarrow">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <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_height="wrap_content"
android:layout_gravity="top|center_horizontal" android:layout_gravity="top|center_horizontal"
android:textColor="#ff000000" android:textColor="#ff000000"
android:background="#c0f0f0f0" android:background="#c0ffffff"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:gravity="left" android:gravity="center"
android:padding="16dp" android:padding="16dp"
android:text="A title goes here" 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) { void setPlayPaused(boolean paused) {
mPaused = paused; mPaused = paused;
mPlayButton.setText(paused ? R.string.play : R.string.pause); mPlayButton.setText(paused ? R.string.play : R.string.pause);
setKeepScreenOn(!paused);
setNavVisibility(true); setNavVisibility(true);
} }
@@ -166,7 +167,7 @@ public class VideoPlayerActivity extends Activity
h.removeCallbacks(mNavHider); h.removeCallbacks(mNavHider);
if (!mMenusOpen && !mPaused) { if (!mMenusOpen && !mPaused) {
// If the menus are open or play is paused, we will not auto-hide. // If the menus are open or play is paused, we will not auto-hide.
h.postDelayed(mNavHider, 3000); h.postDelayed(mNavHider, 1500);
} }
} }
} }