Revert "Settings : Nav ring"

* M no longer has nav ring

This reverts commit 9cf9098e3f3a6d71ec600b862005452068db86b8.

Change-Id: I1484c3b2b9d3656a9f928977ee2eeaec37170bbc

diff --git a/res/layout/nav_bar.xml b/res/layout/nav_bar.xml
index 8ddf05c..5130c93 100644 (file)
--- a/res/layout/nav_bar.xml
+++ b/res/layout/nav_bar.xml
@@ -6,7 +6,6 @@
     android:padding="25dp"
     android:orientation="vertical">
     <TextView
-        android:id="@+id/message"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="8dip"
@@ -83,4 +82,4 @@
                 android:textSize="14sp" />
         </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</LinearLayout>
\ No newline at end of file

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 6c076c8..2050c63 100644 (file)
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -447,9 +447,6 @@
     <string name="disable_navkeys_title">Enable on-screen nav bar</string>
     <string name="disable_navkeys_summary">Enable on-screen navigation bar and disable hardware buttons</string>
 
-    <string name="navigation_ring_title">Navigation ring targets</string>
-    <string name="navigation_ring_message">Tap the edit icon to open the navigation ring for editing.\n\nSelect a target to configure its behavior.\n\nTap the check mark icon to save your changes, or restore to reset the settings to defaults.</string>
-
     <!--- Advanced Settings -->
     <string name="advanced_settings">Advanced settings</string>
     <string name="advanced_settings_summary">Enable more settings options</string>

diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index 93dde2b..d62b538 100644 (file)
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -59,11 +59,6 @@
             android:fragment="com.android.settings.cyanogenmod.NavBar"
             android:title="@string/navigation_bar_title" />
 
-        <PreferenceScreen
-            android:key="navigation_bar_ring"
-            android:fragment="com.android.settings.cyanogenmod.NavRing"
-            android:title="@string/navigation_ring_title" />
-
         <ListPreference
             android:key="navigation_recents_long_press"
             android:dialogTitle="@string/navigation_bar_recents_title"

diff --git a/src/com/android/settings/cyanogenmod/NavRing.java b/src/com/android/settings/cyanogenmod/NavRing.java
deleted file mode 100644 (file)
index 2541277..0000000
--- a/src/com/android/settings/cyanogenmod/NavRing.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2015 The CyanogenMod 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.android.settings.cyanogenmod;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.app.Fragment;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.provider.Settings;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.LinearLayout;
-import android.widget.TextView;
-
-import com.android.settings.R;
-import cyanogenmod.providers.CMSettings;
-
-public class NavRing extends Fragment implements View.OnClickListener {
-    private LinearLayout mRestore, mSave, mEdit;
-    private final static Intent TRIGGER_INTENT =
-            new Intent("android.intent.action.NAVBAR_RING_EDIT");
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container,
-            Bundle savedInstanceState) {
-        return inflater.inflate(R.layout.nav_bar, container, false);
-    }
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        TextView message = (TextView) view.findViewById(R.id.message);
-        message.setText(R.string.navigation_ring_message);
-        mEdit = (LinearLayout) view.findViewById(R.id.navbar_edit);
-        mEdit.setOnClickListener(this);
-        mSave = (LinearLayout) view.findViewById(R.id.navbar_save);
-        mSave.setOnClickListener(this);
-        mRestore = (LinearLayout) view.findViewById(R.id.navbar_restore);
-        mRestore.setOnClickListener(this);
-    }
-
-    @Override
-    public void onClick(View v) {
-        if (v == mEdit) {
-            getActivity().sendBroadcast(TRIGGER_INTENT);
-        } else if (v == mRestore) {
-            new AlertDialog.Builder(getActivity())
-                    .setTitle(R.string.profile_reset_title)
-                    .setIcon(R.drawable.ic_navbar_restore)
-                    .setMessage(R.string.navigation_bar_reset_message)
-                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
-                        public void onClick(DialogInterface dialog, int id) {
-                            for (int i = 0; i < 3; i++) {
-                                CMSettings.Secure.putString(getActivity().getContentResolver(),
-                                        CMSettings.Secure.NAVIGATION_RING_TARGETS[i], null);
-                            }
-                        }
-                    })
-                    .setNegativeButton(R.string.cancel, null)
-                    .show();
-        }
-    }
-}