From ac7c153cce4c535e76d95c591e83073379b09e64 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Tue, 3 Nov 2015 13:53:00 -0800
Subject: [PATCH] Remove ProgressBar4, it is deprecated from Lollipop

Change-Id: Ia2a038a973eb6c6021c73d157410be6e64c2b1a7
---
 samples/ApiDemos/AndroidManifest.xml          |  7 ---
 samples/ApiDemos/res/layout/progressbar_4.xml | 27 ----------
 .../android/apis/view/ProgressBar4.java       | 51 -------------------
 .../com/example/android/apis/view/_index.html |  3 --
 4 files changed, 88 deletions(-)
 delete mode 100644 samples/ApiDemos/res/layout/progressbar_4.xml
 delete mode 100644 samples/ApiDemos/src/com/example/android/apis/view/ProgressBar4.java

diff --git a/samples/ApiDemos/AndroidManifest.xml b/samples/ApiDemos/AndroidManifest.xml
index 3c0a259bc..2b84ba0b9 100644
--- a/samples/ApiDemos/AndroidManifest.xml
+++ b/samples/ApiDemos/AndroidManifest.xml
@@ -2413,13 +2413,6 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".view.ProgressBar4" android:label="Views/Progress Bar/4. In Title Bar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.SAMPLE_CODE" />
-            </intent-filter>
-        </activity>
-
         <activity android:name=".view.SeekBar1" android:label="Views/Seek Bar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/samples/ApiDemos/res/layout/progressbar_4.xml b/samples/ApiDemos/res/layout/progressbar_4.xml
deleted file mode 100644
index 6bacf7adb..000000000
--- a/samples/ApiDemos/res/layout/progressbar_4.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 
-    android:orientation="vertical"
-    android:layout_width="match_parent" 
-    android:layout_height="wrap_content">
-
-    <Button android:id="@+id/toggle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/progressbar_4_toggle" />
-
-</LinearLayout>
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar4.java b/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar4.java
deleted file mode 100644
index 86188f22b..000000000
--- a/samples/ApiDemos/src/com/example/android/apis/view/ProgressBar4.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2007 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.android.apis.view;
-
-import com.example.android.apis.R;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.view.Window;
-import android.view.View;
-import android.widget.Button;
-
-
-/**
- * Demonstrates how to use an indeterminate progress indicator in the window's title bar.
- */
-public class ProgressBar4 extends Activity {
-    private boolean mToggleIndeterminate = false;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        // Request progress bar
-        requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS);
-        setContentView(R.layout.progressbar_4);
-        setProgressBarIndeterminateVisibility(mToggleIndeterminate);
-        
-        Button button = (Button) findViewById(R.id.toggle);
-        button.setOnClickListener(new Button.OnClickListener() {
-            public void onClick(View v) {
-                mToggleIndeterminate = !mToggleIndeterminate;
-                setProgressBarIndeterminateVisibility(mToggleIndeterminate);
-            }
-        });
-    }
-}
diff --git a/samples/ApiDemos/src/com/example/android/apis/view/_index.html b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
index c5c7ed2f7..300525d08 100644
--- a/samples/ApiDemos/src/com/example/android/apis/view/_index.html
+++ b/samples/ApiDemos/src/com/example/android/apis/view/_index.html
@@ -320,9 +320,6 @@ href="DraggableDot.html"><code>DraggableDot</code></a> class.) </dd>
 
   <dt><a href="ProgressBar3.html">3. Dialogs</a></dt>
   <dd>Demonstrates a ProgressDialog, a popup dialog that hosts a progress bar. This example demonstrates both determinate and indeterminate progress indicators. </dd>
-
-  <dt><a href="ProgressBar4.html">4. In Title Bar</a></dt>
-  <dd>Demonstrates an Activity screen with a progress indicator loaded by setting the WindowPolicy's progress indicator feature. </dd>
 </dl>
 
 <h3>Focus</h3>