updated license header

PlaceSearch/src/main/java/com/arcgis/android/samples/search/placesearch/MainActivity.java

@@ -1,13 +1,16 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 

PopupInWebMapForEditing/src/main/java/com/esri/arcgis/android/samples/popupinwebmapforediting/PopupInWebmapForEditing.java

@@ -1,25 +1,21 @@
-/* Copyright 2012 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 
 package com.esri.arcgis.android.samples.popupinwebmapforediting;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -60,6 +56,13 @@
 import com.esri.core.tasks.ags.query.Query;
 import com.esri.core.tasks.ags.query.QueryTask;
 
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /*
  * NOTE: TO RUN THIS SAMPLE YOU NEED THE ANDROID SUPPORT LIBRARY! 
  * 

PopupInWebMapForViewing/src/main/java/com/esri/arcgis/android/samples/popupinwebmapforviewing/PopupInWebmapForViewing.java

@@ -1,21 +1,21 @@
-/* Copyright 2010 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the �Sample code usage restrictions� document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 
 package com.esri.arcgis.android.samples.popupinwebmapforviewing;
 
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import android.app.Activity;
 import android.app.Dialog;
 import android.app.ProgressDialog;
@@ -41,6 +41,9 @@
 import com.esri.core.tasks.ags.query.Query;
 import com.esri.core.tasks.ags.query.QueryTask;
 
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /*
  * NOTE: TO RUN THIS SAMPLE YOU NEED THE ANDROID SUPPORT LIBRARY! 
  * 

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/LayerQueryTask.java

@@ -1,21 +1,21 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 
 package com.esri.arcgis.android.samples.PopupUICustomization;
 
-import java.util.ArrayList;
-import java.util.concurrent.atomic.AtomicInteger;
-
 import android.app.Activity;
 import android.content.Context;
 import android.os.AsyncTask;
@@ -45,6 +45,9 @@
 import com.esri.core.tasks.query.QueryParameters;
 import com.esri.core.tasks.query.QueryTask;
 
+import java.util.ArrayList;
+import java.util.concurrent.atomic.AtomicInteger;
+
 /*
  * This class will loop through and query each layer in the mapview. The query result will
  * be displayed in pop-ups. The layout and style of the pop-ups will be customized through

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/MyAttachmentsView.java

@@ -1,20 +1,21 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 
 package com.esri.arcgis.android.samples.PopupUICustomization;
 
-import java.util.Locale;
-
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Typeface;
@@ -24,6 +25,8 @@
 import com.esri.android.map.popup.Popup;
 import com.esri.android.map.popup.PopupUtil;
 
+import java.util.Locale;
+
 /*
  * Customized attachment view which will display attachments in a pop-up.
  */

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/MyEditAttributesAdapter.java

@@ -1,20 +1,21 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 
 package com.esri.arcgis.android.samples.PopupUICustomization;
 
-import java.util.Calendar;
-
 import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
@@ -28,6 +29,8 @@
 import com.esri.android.map.popup.ArcGISEditAttributesAdapter;
 import com.esri.android.map.popup.Popup;
 
+import java.util.Calendar;
+
 /*
  * Customized Attribute adapter to display graphic's attributes in edit mode
  * 

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/MyMediaAdapter.java

@@ -1,13 +1,16 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/MyMediaView.java

@@ -1,20 +1,21 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 
 package com.esri.arcgis.android.samples.PopupUICustomization;
 
-import java.util.Locale;
-
 import android.app.Activity;
 import android.content.Context;
 import android.widget.TextView;
@@ -23,6 +24,8 @@
 import com.esri.android.map.popup.Popup;
 import com.esri.android.map.popup.PopupUtil;
 
+import java.util.Locale;
+
 /*
  * Customized media view
  */

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/MyReadOnlyAttributesAdapter.java

@@ -1,13 +1,16 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/MyTitleView.java

@@ -1,13 +1,16 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */
 

PopupUICustomization/src/main/java/com/esri/arcgis/android/samples/PopupUICustomization/PopupFragment.java

@@ -1,13 +1,16 @@
-/* Copyright 2014 ESRI
+/* Copyright 2015 Esri
  *
- * All rights reserved under the copyright laws of the United States
- * and applicable international laws, treaties, and conventions.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * You may freely redistribute and use this sample code, with or
- * without modification, provided you include the original copyright
- * notice and use restrictions.
+ *    http://www.apache.org/licenses/LICENSE-2.0
  *
- * See the Sample code usage restrictions document for further information.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  *
  */