From f942335062857f752dafab0890dc2e171be6ade0 Mon Sep 17 00:00:00 2001
From: Stephen McDonald <steve@jupo.org>
Date: Tue, 8 Aug 2017 09:41:44 +1000
Subject: [PATCH] Remove LegalInfoActivity

Change-Id: I1e924cbad05f7cc44bb0593c659e8f3890bf27bd
---
 ApiDemos/app/src/main/AndroidManifest.xml     |  3 --
 .../example/mapdemo/LegalInfoActivity.java    | 45 -------------------
 .../com/example/mapdemo/MainActivity.java     | 19 --------
 .../app/src/main/res/menu/activity_main.xml   | 21 ---------
 ApiDemos/app/src/main/res/values/strings.xml  |  1 -
 5 files changed, 89 deletions(-)
 delete mode 100755 ApiDemos/app/src/main/java/com/example/mapdemo/LegalInfoActivity.java
 delete mode 100755 ApiDemos/app/src/main/res/menu/activity_main.xml

diff --git a/ApiDemos/app/src/main/AndroidManifest.xml b/ApiDemos/app/src/main/AndroidManifest.xml
index 28844702..c985f78f 100644
--- a/ApiDemos/app/src/main/AndroidManifest.xml
+++ b/ApiDemos/app/src/main/AndroidManifest.xml
@@ -57,9 +57,6 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
-        <activity
-            android:name=".LegalInfoActivity"
-            android:label="@string/legal_info"/>
         <activity
             android:name=".BasicMapDemoActivity"
             android:label="@string/basic_map_demo_label"/>
diff --git a/ApiDemos/app/src/main/java/com/example/mapdemo/LegalInfoActivity.java b/ApiDemos/app/src/main/java/com/example/mapdemo/LegalInfoActivity.java
deleted file mode 100755
index e7727822..00000000
--- a/ApiDemos/app/src/main/java/com/example/mapdemo/LegalInfoActivity.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2012 The Android Open Source Project
- *
- * 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
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * 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.example.mapdemo;
-
-import com.google.android.gms.common.GooglePlayServicesUtil;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-/**
- * Activity to show legal information.
- */
-public class LegalInfoActivity extends Activity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.legal_info);
-
-        TextView legalInfoTextView = (TextView) findViewById(R.id.legal_info);
-        String openSourceSoftwareLicenseInfo =
-                GooglePlayServicesUtil.getOpenSourceSoftwareLicenseInfo(this);
-        if (openSourceSoftwareLicenseInfo != null) {
-            legalInfoTextView.setText(openSourceSoftwareLicenseInfo);
-        } else {
-            legalInfoTextView.setText(R.string.play_services_not_installed);
-        }
-    }
-
-}
diff --git a/ApiDemos/app/src/main/java/com/example/mapdemo/MainActivity.java b/ApiDemos/app/src/main/java/com/example/mapdemo/MainActivity.java
index 7b3a567e..0d98f4a8 100644
--- a/ApiDemos/app/src/main/java/com/example/mapdemo/MainActivity.java
+++ b/ApiDemos/app/src/main/java/com/example/mapdemo/MainActivity.java
@@ -21,8 +21,6 @@ import android.content.Intent;
 import android.content.res.Resources;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
-import android.view.Menu;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -87,23 +85,6 @@ public final class MainActivity extends AppCompatActivity
         list.setEmptyView(findViewById(R.id.empty));
     }
 
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.activity_main, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        // Handle item selection
-        if (item.getItemId() == R.id.menu_legal) {
-            startActivity(new Intent(this, LegalInfoActivity.class));
-            return true;
-        }
-        return super.onOptionsItemSelected(item);
-    }
-
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         DemoDetails demo = (DemoDetails) parent.getAdapter().getItem(position);
diff --git a/ApiDemos/app/src/main/res/menu/activity_main.xml b/ApiDemos/app/src/main/res/menu/activity_main.xml
deleted file mode 100755
index 92d6f768..00000000
--- a/ApiDemos/app/src/main/res/menu/activity_main.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-     Copyright (C) 2013 The Android Open Source Project
-
-     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
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     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.
--->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/menu_legal"
-        android:showAsAction="never"
-        android:title="@string/legal_info" />
-</menu>
\ No newline at end of file
diff --git a/ApiDemos/app/src/main/res/values/strings.xml b/ApiDemos/app/src/main/res/values/strings.xml
index dd58dae9..8738cedb 100755
--- a/ApiDemos/app/src/main/res/values/strings.xml
+++ b/ApiDemos/app/src/main/res/values/strings.xml
@@ -15,7 +15,6 @@
 -->
 <resources>
     <string name="demo_title">Google Maps API Demos</string>
-    <string name="legal_info">Legal Info</string>
     <string name="no_demos">No demos</string>
     <string name="play_services_not_installed">Google Play services is not installed on this device.</string>