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

am cbe87010: am 29c857fe: Merge "Restore immersive mode when volume button has been pressed."

Browse Source 
* commit 'cbe870105d87898f4ed8687fde0952143946962e':
  Restore immersive mode when volume button has been pressed.
This commit is contained in:
Andrew Hsieh
2013-12-30 06:10:21 +00:00
committed by Android Git Automerger
parent 0862223e51 cbe870105d
commit 1fd910a7df
2 changed files with 56 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
View File

@@ -31,6 +31,22 @@ public class TeapotNativeActivity extends NativeActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Hide toolbar
int SDK_INT = android.os.Build.VERSION.SDK_INT;
if(SDK_INT >= 19)
{
setImmersiveSticky();
View decorView = getWindow().getDecorView();
decorView.setOnSystemUiVisibilityChangeListener
(new View.OnSystemUiVisibilityChangeListener() {
@Override
public void onSystemUiVisibilityChange(int visibility) {
setImmersiveSticky();
}
});
}
}
protected void onResume() {
@@ -48,14 +64,22 @@ public class TeapotNativeActivity extends NativeActivity {
}
else if(SDK_INT >= 19)
{
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
setImmersiveSticky();
}
}
// Our popup window, you will call it from your C/C++ code later
void setImmersiveSticky() {
View decorView = getWindow().getDecorView();
decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
}
TeapotNativeActivity _activity;
PopupWindow _popupWindow;
TextView _label;

33
ndk/platforms/android-18/samples/MoreTeapots/src/com/sample/moreteapots/MoreTeapotsNativeActivity.java
View File

@@ -17,7 +17,9 @@
package com.sample.moreteapots;
import android.app.NativeActivity;
import android.content.res.Configuration;
import android.os.Bundle;
import android.util.Log;
import android.view.Gravity;
import android.view.LayoutInflater;
import android.view.View;
@@ -31,6 +33,22 @@ public class MoreTeapotsNativeActivity extends NativeActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
//Hide toolbar
int SDK_INT = android.os.Build.VERSION.SDK_INT;
Log.i("OnCreate", "OnCreate!!!");
if(SDK_INT >= 19)
{
setImmersiveSticky();
View decorView = getWindow().getDecorView();
decorView.setOnSystemUiVisibilityChangeListener
(new View.OnSystemUiVisibilityChangeListener() {
@Override
public void onSystemUiVisibilityChange(int visibility) {
setImmersiveSticky();
}
});
}
}
protected void onResume() {
@@ -48,9 +66,7 @@ public class MoreTeapotsNativeActivity extends NativeActivity {
}
else if(SDK_INT >= 19)
{
getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY);
setImmersiveSticky();
}
}
@@ -65,6 +81,16 @@ public class MoreTeapotsNativeActivity extends NativeActivity {
}
// Our popup window, you will call it from your C/C++ code later
void setImmersiveSticky() {
View decorView = getWindow().getDecorView();
decorView.setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN
| View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY
| View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
| View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
| View.SYSTEM_UI_FLAG_LAYOUT_STABLE);
}
MoreTeapotsNativeActivity _activity;
PopupWindow _popupWindow;
TextView _label;
@@ -112,7 +138,6 @@ public class MoreTeapotsNativeActivity extends NativeActivity {
@Override
public void run() {
_label.setText(String.format("%2.2f FPS", fFPS));
}});
}
}