[android] Added separate folder for Samsung Lite with new package com.mapswithme.maps.samsung

10 files changed, 295 insertions, 1 deletions

diff --git a/.gitignore b/.gitignore
index 98c476d6e3..59ee5b3aed 100644
--- a/.gitignore
+++ b/.gitignore
@@ -72,7 +72,6 @@ android/.settings
 android/.classpath
 android/.cproject
 android/.project
-android/assets
 android/local.properties
 android/ant.properties
 android/lint.xml
@@ -107,6 +106,21 @@ android/MapsWithMeLite/ant.properties
 # local android scripts, such as debugger helper scrips
 android/MapsWithMeLite/local
 
+# android MapsWithMeLite.Samsung
+android/MapsWithMeLite.Samsung/bin
+android/MapsWithMeLite.Samsung/gen
+android/MapsWithMeLite.Samsung/libs
+android/MapsWithMeLite.Samsung/obj
+android/MapsWithMeLite.Samsung/.settings
+android/MapsWithMeLite.Samsung/.classpath
+android/MapsWithMeLite.Samsung/.cproject
+android/MapsWithMeLite.Samsung/.project
+android/MapsWithMeLite.Samsung/assets
+android/MapsWithMeLite.Samsung/local.properties
+android/MapsWithMeLite.Samsung/ant.properties
+# local android scripts, such as debugger helper scrips
+android/MapsWithMeLite.Samsung/local
+
 # android MapsWithMePro
 android/MapsWithMePro/bin
 android/MapsWithMePro/gen
diff --git a/android/MapsWithMeLite.Samsung/AndroidManifest.xml b/android/MapsWithMeLite.Samsung/AndroidManifest.xml
new file mode 100644
index 0000000000..1d8c75a77a
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/AndroidManifest.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.mapswithme.maps.samsung"
+      android:versionCode="221"
+      android:versionName="2.2.1"
+      android:installLocation="preferExternal"
+      android:sharedUserId="com.mapswithme"
+      android:sharedUserLabel="@string/shared_user_label">
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="17"/>
+    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
+    <uses-feature android:required="true" android:name="android.hardware.touchscreen" />
+    <uses-feature android:required="false" android:name="android.hardware.wifi" />
+    <uses-feature android:required="false" android:name="android.hardware.location" />
+    <uses-feature android:required="false" android:name="android.hardware.location.network" />
+    <uses-feature android:required="false" android:name="android.hardware.location.gps" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
+    
+    <supports-screens android:largeScreens="true" android:xlargeScreens="true"/>
+
+    <application android:icon="@drawable/ic_launcher" 
+        				 android:label="@string/app_name"
+        				 android:name="com.mapswithme.maps.MWMApplication">
+        				 
+        <activity android:name="com.mapswithme.maps.DownloadResourcesActivity"
+                  android:label="@string/app_name"
+                  android:screenOrientation="behind"
+                  android:theme="@style/MWMNoTitle"
+                  android:configChanges="orientation|screenLayout|screenSize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.mapswithme.maps.MWMActivity"
+                  android:label="@string/app_name"
+                  android:screenOrientation="behind"
+                  android:theme="@style/MWMNoTitle"
+                  android:configChanges="orientation|screenLayout|screenSize">
+        </activity>
+        <activity android:name="com.mapswithme.maps.DownloadUI"
+                  android:label="@string/download_maps"
+                  android:screenOrientation="behind"
+                  android:noHistory="true"
+                  android:configChanges="orientation|screenLayout|screenSize">
+        </activity>
+        <activity android:name="com.mapswithme.maps.SearchActivity"
+                  android:label="@string/search_map"
+                  android:screenOrientation="behind"
+                  android:noHistory="true"
+                  android:configChanges="orientation|screenLayout|screenSize">
+        </activity>
+        <activity android:name="com.mapswithme.maps.settings.SettingsActivity"
+                  android:label="@string/settings"
+                  android:screenOrientation="behind"
+                  android:configChanges="orientation|screenLayout|screenSize">
+        </activity>
+        <activity android:name="com.mapswithme.maps.settings.StoragePathActivity"
+                  android:label="@string/maps_storage"
+                  android:screenOrientation="behind"
+                  android:configChanges="orientation|screenLayout|screenSize">
+        </activity>
+    </application>
+</manifest>
diff --git a/android/MapsWithMeLite.Samsung/build.xml b/android/MapsWithMeLite.Samsung/build.xml
new file mode 100644
index 0000000000..d5428eb9a6
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/build.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="MapsWithMeLite" default="help">
+
+    <property name="mwm.tools.dir" value="../../tools"/>
+    <property name="mwm.data.dir" value="../../../data"/>
+    <property name="renderscript.opt.level" value="O0"/>
+
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <property file="local.properties" />
+
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
+         Here are some properties you may want to change/update:
+
+         source.dir
+             The name of the source directory. Default is 'src'.
+         out.dir
+             The name of the output directory. Default is 'bin'.
+
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
+         Properties related to the SDK location or the project target should
+         be updated using the 'android' tool with the 'update' action.
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems.
+
+         -->
+    <property file="ant.properties" />
+
+    <!-- if sdk.dir was not set from one of the property file, then
+         get it from the ANDROID_HOME env var.
+         This must be done before we load project.properties since
+         the proguard config can use sdk.dir -->
+    <property environment="env" />
+    <condition property="sdk.dir" value="${env.ANDROID_HOME}">
+        <isset property="env.ANDROID_HOME" />
+    </condition>
+
+    <!-- The project.properties file is created and updated by the 'android'
+         tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
+         This file is an integral part of the build system for your
+         application and should be checked into Version Control Systems. -->
+    <loadproperties srcFile="project.properties" />
+
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable."
+            unless="sdk.dir"
+    />
+
+    <!--
+        Import per project custom build rules if present at the root of the project.
+        This is the place to put custom intermediary targets such as:
+            -pre-build
+            -pre-compile
+            -post-compile (This is typically used for code obfuscation.
+                           Compiled code location: ${out.classes.absolute.dir}
+                           If this is not done in place, override ${out.dex.input.absolute.dir})
+            -post-package
+            -post-build
+            -pre-clean
+    -->
+    <import file="custom_rules.xml" optional="true" />    
+
+    <!-- Import the actual build file.
+
+         To customize existing targets, there are two options:
+         - Customize only one target:
+             - copy/paste the target into this file, *before* the
+               <import> task.
+             - customize it to your needs.
+         - Customize the whole content of build.xml
+             - copy/paste the content of the rules files (minus the top node)
+               into this file, replacing the <import> task.
+             - customize to your needs.
+
+         ***********************
+         ****** IMPORTANT ******
+         ***********************
+         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+         in order to avoid having your file be overridden by tools such as "android update project"
+    -->
+    <!-- version-tag: 1 -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
+
+</project>
diff --git a/android/MapsWithMeLite.Samsung/custom_rules.xml b/android/MapsWithMeLite.Samsung/custom_rules.xml
new file mode 100644
index 0000000000..4a82b8d14d
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/custom_rules.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="MapsWithMe" default="help">
+
+  <target name="-set-production-mode" depends="android_rules.-set-mode-check">
+    <property name="out.packaged.file" location="${out.absolute.dir}/${ant.project.name}-production-unsigned.apk" />
+    <property name="out.final.file" location="${out.absolute.dir}/${ant.project.name}-production.apk" />
+    <property name="build.is.mode.set" value="true" />
+
+    <!-- record the current build target -->
+    <property name="build.target" value="production" />
+    
+    <property name="build.is.instrumented" value="false" />
+
+    <!-- production mode is only valid if the manifest does not explicitly                                                                                                     
+         set debuggable to true. default is false. -->
+    <xpath input="AndroidManifest.xml" expression="/manifest/application/@android:debuggable"
+           output="build.is.packaging.debug" default="false"/>
+    
+    <!-- signing mode: production -->
+    <property name="build.is.signing.debug" value="false" />
+    
+    <if condition="${build.is.packaging.debug}">
+      <then>
+        <echo>*************************************************</echo>
+        <echo>****  Android Manifest has debuggable=true   ****</echo>
+        <echo>** Doing DEBUG packaging with PRODUCTION keys ***</echo>
+        <echo>*************************************************</echo>
+      </then>
+      <else>
+        <!-- property only set in release mode.                                                                                                                            
+             Useful for if/unless attributes in target node                                                                                                                
+             when using Ant before 1.8 -->
+        <property name="build.is.mode.release" value="true"/>
+      </else>
+    </if>
+  </target>
+
+  <target name="production" depends="-exclude-text-drules, -set-production-mode,                                                                                
+				     android_rules.-release-obfuscation-check, android_rules.-package, android_rules.-release-prompt-for-password, android_rules.-release-nosign"
+          if="has.keystore" description="Production target - almost the same as release, but with real word config.">
+    <!-- only create apk if *not* a library project -->
+    <do-only-if-not-library elseText="Library project: do not create apk..." >
+      <sequential>
+        <property name="out.unaligned.file" location="${out.absolute.dir}/${ant.project.name}-production-unaligned.apk" />
+        <!-- Signs the APK -->
+        <echo>Signing final apk...</echo>
+        <signjar
+           jar="${out.packaged.file}"
+           signedjar="${out.unaligned.file}"
+           keystore="${key.store}"
+           storepass="${key.store.password}"
+           alias="${key.alias}"
+           keypass="${key.alias.password}"
+           verbose="${verbose}" />
+	
+        <!-- Zip aligns the APK -->
+        <zipalign-helper in.package="${out.unaligned.file}"
+                         out.package="${out.final.file}" />
+        <echo>Release Package: ${out.final.file}</echo>
+      </sequential>
+    </do-only-if-not-library>
+    <record-build-info />
+  </target>
+
+  <import file="../common_custom_rules.xml"/>
+
+</project>
+
diff --git a/android/MapsWithMeLite.Samsung/proguard-project.txt b/android/MapsWithMeLite.Samsung/proguard-project.txt
new file mode 100644
index 0000000000..f2fe1559a2
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/proguard-project.txt
@@ -0,0 +1,20 @@
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
diff --git a/android/MapsWithMeLite.Samsung/project.properties b/android/MapsWithMeLite.Samsung/project.properties
new file mode 100644
index 0000000000..5ff5827776
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-17
+android.library.reference.1=..
diff --git a/android/MapsWithMeLite.Samsung/res/values/strings.xml b/android/MapsWithMeLite.Samsung/res/values/strings.xml
new file mode 100644
index 0000000000..d08bf552de
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="app_name">Maps With Me</string>
+</resources>
diff --git a/android/MapsWithMeLite.Samsung/res/values/styles.xml b/android/MapsWithMeLite.Samsung/res/values/styles.xml
new file mode 100644
index 0000000000..4dba0d0a4c
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/res/values/styles.xml
@@ -0,0 +1,5 @@
+<resources>
+
+    <style name="AppTheme" parent="android:Theme.Light" />
+
+</resources>
\ No newline at end of file
diff --git a/android/MapsWithMeLite.Samsung/src/readme.txt b/android/MapsWithMeLite.Samsung/src/readme.txt
new file mode 100644
index 0000000000..1b01e11165
--- /dev/null
+++ b/android/MapsWithMeLite.Samsung/src/readme.txt
@@ -0,0 +1 @@
+This file is needed to keep directory in git.
diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh
index fdc8a77c1e..f0904c349e 100755
--- a/tools/android/update_assets.sh
+++ b/tools/android/update_assets.sh
@@ -1,3 +1,4 @@
 ./update_assets_for_version.sh ../../android/MapsWithMePro/assets
 ./update_assets_for_version.sh ../../android/MapsWithMeLite/assets
+./update_assets_for_version.sh ../../android/MapsWithMeLite.Samsung/assets
 ./update_flags.sh
\ No newline at end of file