Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 84caa256 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am b56a1036: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)" into mnc-dev 

* commit 'b56a1036':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (2/2)
parents 8f4bf867 b56a1036

res/layout/manage_assist_footer.xml

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>



<!--

  ~ Copyright (C) 2015 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

  -->

<TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@android:style/TextAppearance.Material.Body1"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:textColor="?android:attr/textColorSecondary"

    android:paddingTop="16dp"

    android:paddingStart="16dp"

    android:paddingEnd="16dp"

    android:paddingBottom="16dp"

    android:selectable="false"

    android:clickable="false"

    android:text="@string/assist_footer">

</TextView>
 
 No newline at end of file

res/xml/manage_assist.xml

+6 −1
Original line number Diff line number Diff line
@@ -24,4 +24,9 @@ 
        android:title="@string/assist_access_context_title"

        android:summary="@string/assist_access_context_summary"

        android:persistent="false"/>



    <Preference

        android:summary="@string/assist_footer"

        android:selectable="false"/>



</PreferenceScreen>

src/com/android/settings/InstrumentedFragment.java

+2 −0
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ public abstract class InstrumentedFragment extends PreferenceFragment { 
    // Declare new temporary categories here, starting after this value.

    public static final int UNDECLARED = 100000;



    public static final int APPLICATIONS_MANAGE_ASSIST = UNDECLARED+1;



    /**

     * Declare the view of this category.

     *

src/com/android/settings/applications/ManageAssist.java

+1 −15
Original line number Diff line number Diff line
@@ -16,17 +16,11 @@ 


package com.android.settings.applications;



import android.annotation.Nullable;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.SwitchPreference;

import android.provider.Settings;

import android.text.method.LinkMovementMethod;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.TextView;



import com.android.internal.logging.MetricsLogger;

import com.android.settings.InstrumentedFragment;

import com.android.settings.R;

import com.android.settings.SettingsPreferenceFragment;
@@ -51,17 +45,9 @@ public class ManageAssist extends SettingsPreferenceFragment 
        mContextPref.setOnPreferenceChangeListener(this);

    }



    @Override

    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {

        super.onViewCreated(view, savedInstanceState);

        TextView v = (TextView) LayoutInflater.from(view.getContext()).inflate(

                R.layout.manage_assist_footer, null);

        getListView().addFooterView(v);

    }



    @Override

    protected int getMetricsCategory() {

        return MetricsLogger.APPLICATIONS_MANAGE_ASSIST;

        return InstrumentedFragment.APPLICATIONS_MANAGE_ASSIST;

    }



    @Override