PD#139386: add launcher startup selection

Change-Id: Ic5dd05075b45c2db92fdae2bba5c22dd6b784d29

6 files changed, 87 insertions, 39 deletions

diff --git a/Android.mk b/Android.mk
index f535c20..f535c20 100755..100644
--- a/Android.mk
+++ b/Android.mk
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 77dc1cd..246c638 100755..100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,40 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>

-<manifest xmlns:android="http://schemas.android.com/apk/res/android"

-    package="com.droidlogic.mboxlauncher"

-    android:sharedUserId="android.uid.system"

-    android:minSdkVersion="21">

-

-    	<uses-permission android:name="android.permission.INTERNET"></uses-permission>  

-	    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
-	    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> 
-		<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>    
-	    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>  
-	    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
-		<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-	    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
-	    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />  
-		<uses-permission android:name="android.permission.READ_PHONE_STATE" />
-		<uses-permission android:name="android.permission.BROADCAST_STICKY" />

-		<uses-permission android:name="droidlogic.permission.SYSTEM_CONTROL" />

-

-    <application

-        android:icon="@drawable/ic_launcher"

-        android:label="@string/app_name"

-        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">

-

-        <activity

-            android:label="@string/app_name"

-            android:name=".Launcher"

-            android:launchMode="singleTask"

+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.droidlogic.mboxlauncher"
+    android:sharedUserId="android.uid.system"
+    android:minSdkVersion="21">
+
+    <uses-permission android:name="android.permission.INTERNET"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"></uses-permission>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"></uses-permission>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS"/>
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.BROADCAST_STICKY" />
+    <uses-permission android:name="droidlogic.permission.SYSTEM_CONTROL" />
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen">
+
+        <activity
+            android:name=".LauncherMainActivity"
+            android:label="@string/app_name"
+            android:theme="@android:style/Theme.NoDisplay" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.HOME" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+
+        <activity
+            android:label="@string/app_name"
+            android:name=".Launcher"
+            android:launchMode="singleTask"
             android:clearTaskOnLaunch="true"
-            android:stateNotNeeded="true">

-            <intent-filter >

-  				 <action android:name="android.intent.action.MAIN" />
-                 <category android:name="android.intent.category.HOME" /> 
- 				 <category android:name="android.intent.category.DEFAULT" /> 
-  				 <category android:name="android.intent.category.MONKEY" /> 

-            </intent-filter>

-        </activity>

-    </application>

-

-</manifest>
\ No newline at end of file
+            android:stateNotNeeded="true">
+            <intent-filter >
+                <category android:name="android.intent.category.MONKEY" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
diff --git a/proguard.cfg b/proguard.cfg
index b1cdf17..b1cdf17 100755..100644
--- a/proguard.cfg
+++ b/proguard.cfg
diff --git a/proguard.flags b/proguard.flags
index b1cdf17..b1cdf17 100755..100644
--- a/proguard.flags
+++ b/proguard.flags
diff --git a/project.properties b/project.properties
index 0a80e64..0a80e64 100755..100644
--- a/project.properties
+++ b/project.properties
diff --git a/src/com/droidlogic/mboxlauncher/LauncherMainActivity.java b/src/com/droidlogic/mboxlauncher/LauncherMainActivity.java
new file mode 100644
index 0000000..9f2be0a
--- a/dev/null
+++ b/src/com/droidlogic/mboxlauncher/LauncherMainActivity.java
@@ -0,0 +1,40 @@
+package com.droidlogic.mboxlauncher;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.provider.Settings;
+import android.text.TextUtils;
+import android.util.Log;
+import com.droidlogic.app.SystemControlManager;
+import android.content.ComponentName;
+
+public class LauncherMainActivity extends Activity {
+    private static String TAG = "LauncherMainActivity";
+    private static String COMPONENT_TV_APP = "com.droidlogic.tvsource/com.droidlogic.tvsource.DroidLogicTv";
+
+    private SystemControlManager mSystemControlManager;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Log.d(TAG, "------onCreate");
+
+        mSystemControlManager = new SystemControlManager(this);
+        if (TextUtils.equals(mSystemControlManager.getProperty("ro.platform.has.tvuimode"), "true") &&
+            !TextUtils.equals(mSystemControlManager.getProperty("tv.launcher.firsttime.start"), "false") &&
+            Settings.System.getInt(getContentResolver(), "tv_start_up_enter_app", 0) > 0) {
+            Log.d(TAG, "starting tvapp...");
+            Intent intent = new Intent();
+            intent.setComponent(ComponentName.unflattenFromString(COMPONENT_TV_APP));
+            startActivity(intent);
+        } else {
+            Log.d(TAG, "starting launcher...");
+            Intent intent = new Intent();
+            intent.setClass(this, Launcher.class);
+            startActivity(intent);
+        }
+        mSystemControlManager.setProperty("tv.launcher.firsttime.start", "false");
+        finish();
+    }
+}