rhodes 7.5.1 → 7.6.0

data/platform/android/Rhodes/res/layout/perrmission_alert_dialog.xml

@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="#FFFFFFFF">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:textSize="23sp"
+        android:text="Tau browser requires some additional permissions in order to make its job properly:"/>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="20dp"/>
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+            <LinearLayout
+                android:minHeight = "48dip"
+                android:minWidth = "88dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#F3F3F3"
+                android:layout_margin="3dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Accessibility Services"
+                    android:textSize="20sp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <Button
+                    android:id="@+id/accessibilityServiceBtn"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="#5CD9FF"
+                    android:gravity="center"
+                    android:text="Settings ..."
+                    android:textColor="#FFFFFF"
+                    android:textSize="15sp"
+                    android:layout_marginRight="3dp"
+                    android:visibility="visible"/>
+
+                <ImageView
+                    android:id="@+id/accessibilityServiceStatus"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/baseline_check_24"
+                    android:visibility="gone"/>
+            </LinearLayout>
+            
+            <LinearLayout
+                android:minHeight = "48dip"
+                android:minWidth = "88dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#F3F3F3"
+                android:layout_margin="3dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Notification Service"
+                    android:textSize="20sp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <Button
+                    android:id="@+id/notificationServiceBtn"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="#5CD9FF"
+                    android:gravity="center"
+                    android:text="Settings ..."
+                    android:textColor="#FFFFFF"
+                    android:textSize="15sp"
+                    android:layout_marginRight="3dp"
+                    android:visibility="visible"/>
+
+                <ImageView
+                    android:id="@+id/notificationServiceStatus"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/baseline_check_24"
+                    android:visibility="gone"/>
+            </LinearLayout>
+            
+            <LinearLayout
+                android:minHeight = "48dip"
+                android:minWidth = "88dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#F3F3F3"
+                android:layout_margin="3dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Default Launcher"
+                    android:textSize="20sp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <Button
+                    android:id="@+id/defaultLauncherBtn"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="#5CD9FF"
+                    android:gravity="center"
+                    android:text="Settings ..."
+                    android:textColor="#FFFFFF"
+                    android:textSize="15sp"
+                    android:layout_marginRight="3dp"
+                    android:visibility="visible"/>
+
+                <ImageView
+                    android:id="@+id/defaultLauncherStatus"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/baseline_check_24"
+                    android:visibility="gone"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/callPhoneLinearLayout"
+                android:minHeight = "48dip"
+                android:minWidth = "88dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#F3F3F3"
+                android:layout_margin="3dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Call Phone"
+                    android:textSize="20sp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <Button
+                    android:id="@+id/callPhoneBtn"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="#5CD9FF"
+                    android:gravity="center"
+                    android:text="Settings ..."
+                    android:textColor="#FFFFFF"
+                    android:textSize="15sp"
+                    android:layout_marginRight="3dp"
+                    android:visibility="visible"/>
+
+                <ImageView
+                    android:id="@+id/callPhoneStatus"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/baseline_check_24"
+                    android:visibility="gone"/>
+            </LinearLayout>
+
+            <LinearLayout
+                android:minHeight = "48dip"
+                android:minWidth = "88dip"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="#F3F3F3"
+                android:layout_margin="3dp"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="Overlay Service"
+                    android:textSize="20sp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"/>
+
+                <View
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    android:layout_weight="1"/>
+
+                <Button
+                    android:id="@+id/overlayServiceBtn"
+                    android:layout_width="130dp"
+                    android:layout_height="40dp"
+                    android:layout_gravity="center"
+                    android:background="#5CD9FF"
+                    android:gravity="center"
+                    android:text="Settings ..."
+                    android:textColor="#FFFFFF"
+                    android:textSize="15sp"
+                    android:layout_marginRight="3dp"
+                    android:visibility="visible"/>
+
+                <ImageView
+                    android:id="@+id/overlayServiceStatus"
+                    android:layout_width="wrap_content"
+                    android:layout_marginRight="10dp"
+                    android:layout_gravity="center"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/baseline_check_24"
+                    android:visibility="gone"/>
+            </LinearLayout>
+            <Button
+              android:id="@+id/restartBtn"
+              android:layout_width="wrap_content"
+              android:layout_height="40dp"
+              android:layout_gravity="left"
+              android:layout_margin="3dp"
+              android:layout_marginRight="3dp"
+              android:background="#5CD9FF"
+              android:gravity="center"
+              android:text="Restart Browser"
+              android:textColor="#FFFFFF"
+              android:textSize="15sp"
+              android:visibility="visible" />
+        </LinearLayout>
+    </ScrollView>
+</LinearLayout>

data/platform/android/Rhodes/src/com/rhomobile/rhodes/BaseActivity.java

@@ -1,18 +1,18 @@
 /*------------------------------------------------------------------------
 * (The MIT License)
-* 
+*
 * Copyright (c) 2008-2011 Rhomobile, Inc.
-* 
+*
 * Permission is hereby granted, free of charge, to any person obtaining a copy
 * of this software and associated documentation files (the "Software"), to deal
 * in the Software without restriction, including without limitation the rights
 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 * copies of the Software, and to permit persons to whom the Software is
 * furnished to do so, subject to the following conditions:
-* 
+*
 * The above copyright notice and this permission notice shall be included in
 * all copies or substantial portions of the Software.
-* 
+*
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -20,7 +20,7 @@
 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 * THE SOFTWARE.
-* 
+*
 * http://rhomobile.com
 *------------------------------------------------------------------------*/
 
@@ -29,6 +29,8 @@ package com.rhomobile.rhodes;
 import com.rhomobile.rhodes.osfunctionality.AndroidFunctionalityManager;
 import com.rhomobile.rhodes.util.PerformOnUiThread;
 import com.rhomobile.rhodes.util.Utils;
+import com.rhomobile.rhodes.permissioncheck.PermissionListGenerate;
+
 
 import android.app.Activity;
 import android.content.ComponentName;
@@ -48,17 +50,20 @@ import android.provider.Settings;
 import android.os.Build;
 
 public class BaseActivity extends Activity implements ServiceConnection {
-	
+
 	private static final String TAG = BaseActivity.class.getSimpleName();
-	
+
 	private static final boolean DEBUG = false;
-	
+
 	private static boolean setFullScreenFlag = false;
-	
+
 	public static final String INTENT_SOURCE = BaseActivity.class.getName();
-	
+
 	public boolean mEnableScreenOrientationOverride = false;
-	
+
+
+	private int mCurrentScreenOrientation = -1;
+
     public static class ScreenProperties {
         private int mScreenWidth;
         private int mScreenHeight;
@@ -67,12 +72,12 @@ public class BaseActivity extends Activity implements ServiceConnection {
         private int mScreenOrientation;
         private float mScreenPpiX;
         private float mScreenPpiY;
-        
-        
+
+
         ScreenProperties(Context context) {
             reread(context);
         }
-        
+
         public void reread(Context context) {
             Logger.T(TAG, "Updating screen properties");
 
@@ -117,7 +122,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
 
             Logger.D(TAG, "New screen properties - width: " + mScreenWidth + ", height: " + mScreenHeight + ", orientation: " + mScreenOrientation);
         }
-        
+
         public int getWidth() { return mScreenWidth; }
         public int getHeight() { return mScreenHeight; }
         public int getRealWidth() { return mRealScreenWidth; }
@@ -128,7 +133,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
     }
 
     private static ScreenProperties sScreenProp = null;
-    
+
     public static ScreenProperties getScreenProperties() { return sScreenProp; }
 
     private static boolean sFullScreen = RhoConf.isExist("full_screen") ? RhoConf.getBool("full_screen") : false;
@@ -138,7 +143,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
 
     private static int sActivitiesActive;
     private static BaseActivity sTopActivity = null;
-    
+
     private static boolean sScreenAutoRotate = true;
 
     public static void onActivityStarted(Activity activity) {
@@ -174,7 +179,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
         ++sActivitiesActive;
         Logger.D(TAG, "activityStarted (2): sActivitiesActive=" + sActivitiesActive);
     }
-    
+
     public static void activityStopped() {
         Logger.D(TAG, "activityStopped (1): sActivitiesActive=" + sActivitiesActive);
 
@@ -188,61 +193,84 @@ public class BaseActivity extends Activity implements ServiceConnection {
         }
         Logger.D(TAG, "activityStopped (2): sActivitiesActive=" + sActivitiesActive);
     }
-    
+
     public static int getActivitiesCount() {
         return sActivitiesActive;
     }
 
+    protected boolean mIsServiceAllreadyExist = false;
+
+    private PermissionListGenerate pl;
+    private boolean startedApp = false;
+
     @Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		Logger.T(TAG, "onCreate");
+        
+        pl = new PermissionListGenerate(this, this);
+        
+        if(pl.checkAllPermissionsStatus()){
+
+            mIsServiceAllreadyExist = false;
+
+            Intent intent = new Intent(this, RhodesService.class);
+            intent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
+
+            Logger.D(TAG, "onCreate() startForegroundService PRE");
+            ComponentName serviceName = null;
+            // use new mechanism for foregorund service only for 9.0 and later
+            int sdkVersion = Build.VERSION.SDK_INT;
+            
+            if(RhodesService.getInstance() == null) {
+                Logger.D(TAG, "onCreate() startForegroundService PRE");
+                if (sdkVersion >= 28) {
+                    serviceName = AndroidFunctionalityManager.getAndroidFunctionality().startForegroundService(this, intent);
+                }
+                else {
+                    serviceName = startService(intent);
+                }
+                Logger.D(TAG, "onCreate() startForegroundService POST");
+                //ComponentName serviceName = startService(intent);
+                if (serviceName == null)
+                    throw new RuntimeException("Can not start Rhodes service");
+                
+            } else {
+                Logger.D(TAG, "onCreate() RhodesService allready started");
+                mIsServiceAllreadyExist = true;
+            }
 
-		Intent intent = new Intent(this, RhodesService.class);
-		intent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
-
-		Logger.D(TAG, "onCreate() startForegroundService PRE");
-		ComponentName serviceName = null;
-		// use new mechanism for foregorund service only for 9.0 and later
-		int sdkVersion = Build.VERSION.SDK_INT;
-		if (sdkVersion >= 28) {
-			serviceName = AndroidFunctionalityManager.getAndroidFunctionality().startForegroundService(this, intent);
-		}
-		else {
-			serviceName = startService(intent);
-		}
-		Logger.D(TAG, "onCreate() startForegroundService POST");
+            bindService(intent, this, Context.BIND_AUTO_CREATE);
+            mBoundToService = true;
+            
 
-		//ComponentName serviceName = startService(intent);
-		if (serviceName == null)
-			throw new RuntimeException("Can not start Rhodes service");
-		bindService(intent, this, Context.BIND_AUTO_CREATE);
-		mBoundToService = true;
+            if (RhoConf.isExist("disable_screen_rotation")) {
+                sScreenAutoRotate = !RhoConf.getBool("disable_screen_rotation");
+            }
+            if (mEnableScreenOrientationOverride) {
+                sScreenAutoRotate = true;
+            }
 
-        if (RhoConf.isExist("disable_screen_rotation")) {
-            sScreenAutoRotate = !RhoConf.getBool("disable_screen_rotation");
-        }
-        if (mEnableScreenOrientationOverride) {
-        	sScreenAutoRotate = true;
-        }
+            if (sScreenProp == null) {
+                sScreenProp = new ScreenProperties(this);
+            } else {
+                if (!sScreenAutoRotate) {
+                    Logger.D(TAG, "Screen rotation is disabled. Force orientation: " + getScreenProperties().getOrientation());
+                    setRequestedOrientation(getScreenProperties().getOrientation());
+                }
+            }
 
-        if (sScreenProp == null) {
-            sScreenProp = new ScreenProperties(this);
-        } else {
-            if (!sScreenAutoRotate) { 
-                Logger.D(TAG, "Screen rotation is disabled. Force orientation: " + getScreenProperties().getOrientation());
-                setRequestedOrientation(getScreenProperties().getOrientation());
+            if (RhoConf.getInt("WebView.replaceContentBySplashWhenSnapshotBySystem") == 1) {
+                getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+            }
+            else
+            {
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
             }
-        }
 
-        if (RhoConf.getInt("WebView.replaceContentBySplashWhenSnapshotBySystem") == 1) {
-            getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+            startedApp = true;
         }
-        else
-        {
-            getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
-        }
-
+        
     }
 
 	@Override
@@ -265,13 +293,84 @@ public class BaseActivity extends Activity implements ServiceConnection {
         onActivityStarted(this);
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        if (pl.isShowPermissionDialog()){
+            pl.closePermissionsDialog();
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
+
+        if(pl != null && !pl.checkAllPermissionsStatus())
+            pl.showPermissionList();
+        else{
+            mIsServiceAllreadyExist = false;
+
+            Intent intent = new Intent(this, RhodesService.class);
+            intent.putExtra(RhodesService.INTENT_SOURCE, INTENT_SOURCE);
+
+            Logger.D(TAG, "onCreate() startForegroundService PRE");
+            ComponentName serviceName = null;
+            // use new mechanism for foregorund service only for 9.0 and later
+            int sdkVersion = Build.VERSION.SDK_INT;
+            
+            if(RhodesService.getInstance() == null) {
+                Logger.D(TAG, "onCreate() startForegroundService PRE");
+                if (sdkVersion >= 28) {
+                    serviceName = AndroidFunctionalityManager.getAndroidFunctionality().startForegroundService(this, intent);
+                }
+                else {
+                    serviceName = startService(intent);
+                }
+                Logger.D(TAG, "onCreate() startForegroundService POST");
+                //ComponentName serviceName = startService(intent);
+                if (serviceName == null)
+                    throw new RuntimeException("Can not start Rhodes service");
+                
+            } else {
+                Logger.D(TAG, "onCreate() RhodesService allready started");
+                mIsServiceAllreadyExist = true;
+            }
+
+            bindService(intent, this, Context.BIND_AUTO_CREATE);
+            mBoundToService = true;
+            
+
+            if (RhoConf.isExist("disable_screen_rotation")) {
+                sScreenAutoRotate = !RhoConf.getBool("disable_screen_rotation");
+            }
+            if (mEnableScreenOrientationOverride) {
+                sScreenAutoRotate = true;
+            }
+
+            if (sScreenProp == null) {
+                sScreenProp = new ScreenProperties(this);
+            } else {
+                if (!sScreenAutoRotate) {
+                    Logger.D(TAG, "Screen rotation is disabled. Force orientation: " + getScreenProperties().getOrientation());
+                    setRequestedOrientation(getScreenProperties().getOrientation());
+                }
+            }
+
+            if (RhoConf.getInt("WebView.replaceContentBySplashWhenSnapshotBySystem") == 1) {
+                getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE, WindowManager.LayoutParams.FLAG_SECURE);
+            }
+            else
+            {
+                getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
+            }
+
+            startedApp = true;
+        }
+
         if((RhoConf.isExist("full_screen") ? RhoConf.getBool("full_screen") : false ) && setFullScreenFlag ==false){
         	 setFullScreen(true);
         }else if(sFullScreen){
-        	setFullScreen(true);	
+        	setFullScreen(true);
         }else{
     		setFullScreen(false);
         }
@@ -287,10 +386,27 @@ public class BaseActivity extends Activity implements ServiceConnection {
         super.onStop();
     }
 
+	//public void setRequestedOrientationTau(int requestedOrientation) {
+	//	Logger.T(TAG, "$$$ setRequestedOrientationTau("+String.valueOf(requestedOrientation)+")");
+	//	Thread.dumpStack();
+	//	super.setRequestedOrientation(requestedOrientation);
+	//}
+
+	@Override
+	public void setRequestedOrientation(int requestedOrientation) {
+		//if (!sScreenAutoRotate) {
+		//	return;
+		//}
+		Logger.T(TAG, "$$$ setRequestedOrientation("+String.valueOf(requestedOrientation)+")");
+		mCurrentScreenOrientation = requestedOrientation;
+		//Thread.dumpStack();
+		super.setRequestedOrientation(requestedOrientation);
+	}
+
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
   		//Utils.platformLog("$$$$$", "BaseActivity.onConfigurationChanged()");
-        Logger.T(TAG, "onConfigurationChanged");
+        Logger.T(TAG, "$$$ onConfigurationChanged");
         super.onConfigurationChanged(newConfig);
         if(!sScreenAutoRotate)
         {
@@ -298,8 +414,9 @@ public class BaseActivity extends Activity implements ServiceConnection {
 
         	if (!mEnableScreenOrientationOverride) {
           		//Utils.platformLog("$$$$$", "BaseActivity.onConfigurationChanged() ###2");
-        		Logger.D(TAG, "Screen rotation is disabled. Force old orientation: " + getScreenProperties().getOrientation());
-            	setRequestedOrientation(getScreenProperties().getOrientation());
+        		//Logger.T(TAG, "$$$ Screen rotation is disabled. Force old orientation: " + getScreenProperties().getOrientation());
+				Logger.T(TAG, "$$$ Screen rotation is disabled. Force current orientation: " + String.valueOf(mCurrentScreenOrientation));
+            	setRequestedOrientation(mCurrentScreenOrientation);
         	}
         }
         else
@@ -350,7 +467,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
 			else {
 				if (!mEnableScreenOrientationOverride) {
 	          		//Utils.platformLog("$$$$$", "BaseActivity.onConfigurationChanged() ###2");
-	        		Logger.D(TAG, "Screen rotation is disabled by Android settings. ##### Force old orientation: " + getScreenProperties().getOrientation());
+	        		Logger.D(TAG, "$$$ Screen rotation is disabled by Android settings. ##### Force old orientation: " + getScreenProperties().getOrientation());
 	            	setRequestedOrientation(getScreenProperties().getOrientation());
 	        	}
 			}
@@ -382,11 +499,11 @@ public class BaseActivity extends Activity implements ServiceConnection {
             }
         });
     }
-    
+
     public static boolean getFullScreenMode() {
         return sFullScreen;
     }
-    
+
     public static void setScreenAutoRotateMode(boolean mode) {
    		//Utils.platformLog("$$$$$", "BaseActivity.setScreenAutoRotateMode("+String.valueOf(mode)+")");
         sScreenAutoRotate = mode;
@@ -397,7 +514,7 @@ public class BaseActivity extends Activity implements ServiceConnection {
 
     public static boolean getScreenAutoRotateMode() {
    	   //Utils.platformLog("$$$$$", "BaseActivity.getScreenAutoRotateMode("+String.valueOf(sScreenAutoRotate)+")");
-       return sScreenAutoRotate; 
+       return sScreenAutoRotate;
     }
 
     public void setFullScreen(boolean enable) {