Merge pull request #9 from heremaps/package-directory-update

Update package directories and AndroidManifest.xmls to adapt new package names

geocoder-and-reverse-geocoder-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.geocoding">
+    package="com.here.android.example.geocoding">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/sampleapp/geocoding/MainActivity.java → geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/example/geocoding/MainActivity.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.geocoding;
+package com.here.android.example.geocoding;
 
 import java.util.ArrayList;
 import java.util.List;

geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/sampleapp/geocoding/MainView.java → geocoder-and-reverse-geocoder-android/app/src/main/java/com/here/android/example/geocoding/MainView.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.geocoding;
+package com.here.android.example.geocoding;
 
 import java.util.List;
 

geocoder-and-reverse-geocoder-android/app/src/main/res/layout/activity_main.xml

@@ -8,7 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.here.android.sampleapp.geocoding.MainActivity">
+    tools:context="com.here.android.example.geocoding.MainActivity">
 
 
     <Button

map-attribute-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.mapattribute">
+    package="com.here.android.example.map.attribute">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

map-attribute-android/app/src/main/java/com/here/android/sampleapp/mapattribute/MainActivity.java → map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/MainActivity.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.mapattribute;
+package com.here.android.example.map.attribute;
 
 import java.util.ArrayList;
 import java.util.List;

map-attribute-android/app/src/main/java/com/here/android/sampleapp/mapattribute/MapFragmentView.java → map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/MapFragmentView.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.mapattribute;
+package com.here.android.example.map.attribute;
 
 import com.here.android.mpa.common.GeoCoordinate;
 import com.here.android.mpa.common.OnEngineInitListener;

map-attribute-android/app/src/main/java/com/here/android/sampleapp/mapattribute/SettingsPanel.java → map-attribute-android/app/src/main/java/com/here/android/example/map/attribute/SettingsPanel.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.mapattribute;
+package com.here.android.example.map.attribute;
 
 import com.here.android.mpa.mapping.Map;
 import com.here.android.mpa.mapping.MapTrafficLayer;

map-customization-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.mapcustomization">
+    package="com.here.android.example.map.customization">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -14,7 +14,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.here.android.sampleapp.mapcustomization.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

map-objects-android/app/src/main/java/com/here/android/sampleapp/mapobjects/MainActivity.java → map-customization-android/app/src/main/java/com/here/android/example/map/customization/MainActivity.java

@@ -5,7 +5,7 @@
  * with a HERE company for the use or utilization of this software. In the
  * absence of such agreement, the use of the software is not allowed.
  */
-package com.here.android.sampleapp.mapobjects;
+package com.here.android.example.map.customization;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -54,7 +54,6 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             case REQUEST_CODE_ASK_PERMISSIONS: {
                 for (int index = 0; index < permissions.length; index++) {
                     if (grantResults[index] != PackageManager.PERMISSION_GRANTED) {
-
                         /**
                          * If the user turned down the permission request in the past and chose the
                          * Don't ask again option in the permission request system dialog.
@@ -72,7 +71,6 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                         }
                     }
                 }
-
                 /**
                  * All permission requests are being handled.Create map fragment view.Please note
                  * the HERE SDK requires all permissions defined above to operate properly.

map-customization-android/app/src/main/java/com/here/android/sampleapp/mapcustomization/MapFragmentView.java → map-customization-android/app/src/main/java/com/here/android/example/map/customization/MapFragmentView.java

@@ -5,7 +5,7 @@
  * with a HERE company for the use or utilization of this software. In the
  * absence of such agreement, the use of the software is not allowed.
  */
-package com.here.android.sampleapp.mapcustomization;
+package com.here.android.example.map.customization;
 
 import com.here.android.mpa.common.GeoCoordinate;
 import com.here.android.mpa.common.OnEngineInitListener;

map-downloader-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.mapdownloader">
+    package="com.here.android.example.map.downloader">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -15,7 +15,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.here.android.sampleapp.mapdownloader.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

map-downloader-android/app/src/main/java/com/here/android/sampleapp/mapdownloader/MainActivity.java → map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MainActivity.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.mapdownloader;
+package com.here.android.example.map.downloader;
 
 import java.util.ArrayList;
 import java.util.List;

map-downloader-android/app/src/main/java/com/here/android/sampleapp/mapdownloader/MapListAdapter.java → map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MapListAdapter.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.mapdownloader;
+package com.here.android.example.map.downloader;
 
 import java.util.List;
 

map-downloader-android/app/src/main/java/com/here/android/sampleapp/mapdownloader/MapListView.java → map-downloader-android/app/src/main/java/com/here/android/example/map/downloader/MapListView.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.mapdownloader;
+package com.here.android.example.map.downloader;
 
 import java.util.ArrayList;
 import java.util.List;

map-downloader-android/app/src/main/res/layout/activity_main.xml

@@ -8,7 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context="com.here.android.sampleapp.mapdownloader.MainActivity"
+    tools:context=".MainActivity"
     android:orientation="vertical">
 
     <LinearLayout

map-gestures-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.mapgesture">
+    package="com.here.android.example.map.gesture">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

map-gestures-android/app/src/main/java/com/here/android/sampleapp/mapgesture/MainActivity.java → map-gestures-android/app/src/main/java/com/here/android/example/map/gesture/MainActivity.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.mapgesture;
+package com.here.android.example.map.gesture;
 
 import java.util.ArrayList;
 import java.util.List;

map-gestures-android/app/src/main/java/com/here/android/sampleapp/mapgesture/MapFragmentView.java → map-gestures-android/app/src/main/java/com/here/android/example/map/gesture/MapFragmentView.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.mapgesture;
+package com.here.android.example.map.gesture;
 
 import java.io.IOException;
 import java.util.List;

map-objects-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.mapobjects">
+    package="com.here.android.example.map.objects">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -14,7 +14,7 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.here.android.sampleapp.mapobjects.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

map-customization-android/app/src/main/java/com/here/android/sampleapp/mapcustomization/MainActivity.java → map-objects-android/app/src/main/java/com/here/android/example/map/objects/MainActivity.java

@@ -5,7 +5,7 @@
  * with a HERE company for the use or utilization of this software. In the
  * absence of such agreement, the use of the software is not allowed.
  */
-package com.here.android.sampleapp.mapcustomization;
+package com.here.android.example.map.objects;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,6 +21,7 @@
 public class MainActivity extends AppCompatActivity {
 
     private final static int REQUEST_CODE_ASK_PERMISSIONS = 1;
+    private MapFragmentView m_mapFragmentView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -54,6 +55,7 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
             case REQUEST_CODE_ASK_PERMISSIONS: {
                 for (int index = 0; index < permissions.length; index++) {
                     if (grantResults[index] != PackageManager.PERMISSION_GRANTED) {
+
                         /**
                          * If the user turned down the permission request in the past and chose the
                          * Don't ask again option in the permission request system dialog.
@@ -71,11 +73,12 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis
                         }
                     }
                 }
+
                 /**
                  * All permission requests are being handled.Create map fragment view.Please note
                  * the HERE SDK requires all permissions defined above to operate properly.
                  */
-                new MapFragmentView(this);
+                m_mapFragmentView = new MapFragmentView(this);
                 break;
             }
             default:

map-objects-android/app/src/main/java/com/here/android/sampleapp/mapobjects/MapFragmentView.java → map-objects-android/app/src/main/java/com/here/android/example/map/objects/MapFragmentView.java

@@ -5,7 +5,7 @@
  * with a HERE company for the use or utilization of this software. In the
  * absence of such agreement, the use of the software is not allowed.
  */
-package com.here.android.sampleapp.mapobjects;
+package com.here.android.example.map.objects;
 
 import java.io.IOException;
 import java.util.ArrayList;

map-rendering-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.basicmap">
+    package="com.here.android.example.map.basic">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

routing-android/app/src/main/java/com/here/android/sampleapp/routing/MainActivity.java → map-rendering-android/app/src/main/java/com/here/android/example/map/basic/MainActivity.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.routing;
+package com.here.android.example.map.basic;
 
 import java.util.ArrayList;
 import java.util.List;

map-rendering-android/app/src/main/java/com/here/android/sampleapp/basicmap/MapFragmentView.java → map-rendering-android/app/src/main/java/com/here/android/example/map/basic/MapFragmentView.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.basicmap;
+package com.here.android.example.map.basic;
 
 import com.here.android.mpa.common.OnEngineInitListener;
 import com.here.android.mpa.mapping.Map;

routing-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.routing">
+    package="com.here.android.example.routing">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

map-rendering-android/app/src/main/java/com/here/android/sampleapp/basicmap/MainActivity.java → routing-android/app/src/main/java/com/here/android/example/routing/MainActivity.java

@@ -1,4 +1,4 @@
-package com.here.android.sampleapp.basicmap;
+package com.here.android.example.routing;
 
 import java.util.ArrayList;
 import java.util.List;

routing-android/app/src/main/java/com/here/android/sampleapp/routing/MapFragmentView.java → routing-android/app/src/main/java/com/here/android/example/routing/MapFragmentView.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.routing;
+package com.here.android.example.routing;
 
 import java.util.List;
 

search-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.search">
+    package="com.here.android.example.search">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
@@ -14,14 +14,14 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name="com.here.android.sampleapp.search.MainActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="com.here.android.sampleapp.search.ResultListActivity" />
+        <activity android:name=".ResultListActivity" />
 
         <!--Developers should put application credentials here.To obtain them, please register the application at developer.here.com-->
         <meta-data

search-android/app/src/main/java/com/here/android/sampleapp/search/MainActivity.java → search-android/app/src/main/java/com/here/android/example/search/MainActivity.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.search;
+package com.here.android.example.search;
 
 import java.util.ArrayList;
 import java.util.List;

search-android/app/src/main/java/com/here/android/sampleapp/search/MapFragmentView.java → search-android/app/src/main/java/com/here/android/example/search/MapFragmentView.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.search;
+package com.here.android.example.search;
 
 import java.io.IOException;
 import java.util.ArrayList;

search-android/app/src/main/java/com/here/android/sampleapp/search/ResultListActivity.java → search-android/app/src/main/java/com/here/android/example/search/ResultListActivity.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.search;
+package com.here.android.example.search;
 
 import com.here.android.mpa.common.GeoCoordinate;
 import com.here.android.mpa.search.DiscoveryResult;

search-android/app/src/main/java/com/here/android/sampleapp/search/ResultListAdapter.java → search-android/app/src/main/java/com/here/android/example/search/ResultListAdapter.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.search;
+package com.here.android.example.search;
 
 import java.util.List;
 

turn-by-turn-navigation-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.guidance">
+    package="com.here.android.example.guidance">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

turn-by-turn-navigation-android/app/src/main/java/com/here/android/sampleapp/guidance/MainActivity.java → turn-by-turn-navigation-android/app/src/main/java/com/here/android/example/guidance/MainActivity.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.guidance;
+package com.here.android.example.guidance;
 
 import java.util.ArrayList;
 import java.util.List;

turn-by-turn-navigation-android/app/src/main/java/com/here/android/sampleapp/guidance/MapFragmentView.java → turn-by-turn-navigation-android/app/src/main/java/com/here/android/example/guidance/MapFragmentView.java

@@ -6,7 +6,7 @@
  * absence of such agreement, the use of the software is not allowed.
  */
 
-package com.here.android.sampleapp.guidance;
+package com.here.android.example.guidance;
 
 import java.lang.ref.WeakReference;
 import java.util.List;

urban-mobility-android/app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.here.android.sampleapp.urbanmobility">
+    package="com.here.android.example.urbanmobility">
 
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />