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

Commit daf7a6d2 authored by Michael W's avatar Michael W Committed by Michael Bestas
Browse files

LatinIME: Remove dividers everywhere 

* In order to make it look less like it doesn't
  belong to settings, remove the divider lines that
  are currently everywhere
* Instead of removing the dividers per fragment,
  create a custom fragment which does the job

Test:
* Go to every setting and verify that there are no
  divider lines between every preference

Change-Id: Id76dfa2e3ce3999242c8dd09a531ab06ccacd203
parent 1c93833c

java/src/com/android/inputmethod/dictionarypack/DictionarySettingsFragment.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,7 +31,6 @@ import android.net.Uri; 
import android.os.AsyncTask;

import android.os.AsyncTask;

import android.os.Bundle;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.Preference;

import android.preference.PreferenceFragment;

import android.preference.PreferenceGroup;

import android.preference.PreferenceGroup;

import android.text.TextUtils;

import android.text.TextUtils;

import android.util.Log;

import android.util.Log;
@@ -44,6 +43,7 @@ import android.view.ViewGroup; 
import android.view.animation.AnimationUtils;

import android.view.animation.AnimationUtils;





import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.settings.CustomPreferenceFragment;





import java.util.ArrayList;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Collection;
@@ -53,7 +53,7 @@ import java.util.TreeMap; 
/**

/**

 * Preference screen.

 * Preference screen.

 */

 */

public final class DictionarySettingsFragment extends PreferenceFragment

public final class DictionarySettingsFragment extends CustomPreferenceFragment

        implements UpdateHandler.UpdateEventListener {

        implements UpdateHandler.UpdateEventListener {

    private static final String TAG = DictionarySettingsFragment.class.getSimpleName();

    private static final String TAG = DictionarySettingsFragment.class.getSimpleName();

java/src/com/android/inputmethod/latin/settings/CustomInputStyleSettingsFragment.java

+1 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.SharedPreferences; 
import android.content.res.Resources;

import android.content.res.Resources;

import android.os.Bundle;

import android.os.Bundle;

import android.preference.Preference;

import android.preference.Preference;

import android.preference.PreferenceFragment;

import android.preference.PreferenceGroup;

import android.preference.PreferenceGroup;

import androidx.core.view.ViewCompat;

import androidx.core.view.ViewCompat;

import android.text.TextUtils;

import android.text.TextUtils;
@@ -47,7 +46,7 @@ import com.android.inputmethod.latin.utils.SubtypeLocaleUtils; 




import java.util.ArrayList;

import java.util.ArrayList;





public final class CustomInputStyleSettingsFragment extends PreferenceFragment

public final class CustomInputStyleSettingsFragment extends CustomPreferenceFragment

        implements CustomInputStylePreference.Listener {

        implements CustomInputStylePreference.Listener {

    private static final String TAG = CustomInputStyleSettingsFragment.class.getSimpleName();

    private static final String TAG = CustomInputStyleSettingsFragment.class.getSimpleName();

    // Note: We would like to turn this debug flag true in order to see what input styles are

    // Note: We would like to turn this debug flag true in order to see what input styles are

java/src/com/android/inputmethod/latin/settings/CustomPreferenceFragment.java

0 → 100644
+37 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2020 The LineageOS 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.inputmethod.latin.settings;



import android.os.Bundle;

import android.preference.PreferenceFragment;

import android.view.View;

import android.widget.ListView;



/**

 * A base abstract class for a {@link PreferenceFragment} that removes divider lines

 */

public abstract class CustomPreferenceFragment extends PreferenceFragment {

    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        // remove dividers

        View rootView = getView();

        ListView list = (ListView) rootView.findViewById(android.R.id.list);

        list.setDivider(null);

    }

}

java/src/com/android/inputmethod/latin/settings/SettingsFragment.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -26,6 +26,8 @@ import android.provider.Settings.Secure; 
import android.view.Menu;

import android.view.Menu;

import android.view.MenuInflater;

import android.view.MenuInflater;

import android.view.MenuItem;

import android.view.MenuItem;

import android.view.View;

import android.widget.ListView;





import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.R;

import com.android.inputmethod.latin.define.ProductionFlags;

import com.android.inputmethod.latin.define.ProductionFlags;
@@ -62,6 +64,16 @@ public final class SettingsFragment extends InputMethodSettingsFragment { 
        }

        }

    }

    }





    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);



        // remove dividers

        View rootView = getView();

        ListView list = (ListView) rootView.findViewById(android.R.id.list);

        list.setDivider(null);

    }



    @Override

    @Override

    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {

    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {

        if (FeedbackUtils.isHelpAndFeedbackFormSupported()) {

        if (FeedbackUtils.isHelpAndFeedbackFormSupported()) {

java/src/com/android/inputmethod/latin/settings/SubScreenFragment.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -24,7 +24,6 @@ import android.content.res.Resources; 
import android.os.Bundle;

import android.os.Bundle;

import android.preference.ListPreference;

import android.preference.ListPreference;

import android.preference.Preference;

import android.preference.Preference;

import android.preference.PreferenceFragment;

import android.preference.PreferenceScreen;

import android.preference.PreferenceScreen;

import android.util.Log;

import android.util.Log;
@@ -32,7 +31,7 @@ import android.util.Log; 
 * A base abstract class for a {@link PreferenceFragment} that implements a nested

 * A base abstract class for a {@link PreferenceFragment} that implements a nested

 * {@link PreferenceScreen} of the main preference screen.

 * {@link PreferenceScreen} of the main preference screen.

 */

 */

public abstract class SubScreenFragment extends PreferenceFragment

public abstract class SubScreenFragment extends CustomPreferenceFragment

        implements OnSharedPreferenceChangeListener {

        implements OnSharedPreferenceChangeListener {

    private OnSharedPreferenceChangeListener mSharedPreferenceChangeListener;

    private OnSharedPreferenceChangeListener mSharedPreferenceChangeListener;
@@ -97,6 +96,11 @@ public abstract class SubScreenFragment extends PreferenceFragment 
                getPreferenceScreen());

                getPreferenceScreen());

    }

    }





    @Override

    public void onActivityCreated(Bundle savedInstanceState) {

        super.onActivityCreated(savedInstanceState);

    }



    @Override

    @Override

    public void onCreate(final Bundle savedInstanceState) {

    public void onCreate(final Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        super.onCreate(savedInstanceState);