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

Commit c6e8f4b4 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Add Quick Settings USB Tether tile (1 of 2)" into cm-10.1

parents 851bcc0f 1deada8c

res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -5064,6 +5064,7 @@ 
    <string name="title_tile_networkmode">Network mode</string>

    <string name="title_tile_nfc">NFC</string>

    <string name="title_tile_screen_timeout">Screen timeout</string>

    <string name="title_tile_usb_tether">USB Tether</string>



    <string name="title_dynamic_tiles">Dynamic tiles</string>

    <string name="dynamic_tiles_note_title">Note</string>
@@ -5071,6 +5072,7 @@ 
    <string name="title_dynamic_alarm">Alarm clock</string>

    <string name="title_dynamic_bugreport">Bug report</string>

    <string name="title_dynamic_ime">IME changer</string>

    <string name="title_dynamic_usbtether">USB Tether</string>

    <string name="title_dynamic_wifi">Wi-Fi display</string>



    <string name="title_general">General</string>

res/xml/quick_settings_panel_settings.xml

+4 −0
Original line number Diff line number Diff line
@@ -92,6 +92,10 @@ 
            android:key="dynamic_ime"

            android:title="@string/title_dynamic_ime" />



        <CheckBoxPreference

            android:key="dynamic_usbtether"

            android:title="@string/title_dynamic_usbtether" />



        <CheckBoxPreference

            android:key="dynamic_wifi"

            android:title="@string/title_dynamic_wifi" />

src/com/android/settings/cyanogenmod/QuickSettings.java

+15 −0
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ package com.android.settings.cyanogenmod; 


import android.bluetooth.BluetoothAdapter;

import android.content.ContentResolver;

import android.content.Context;

import android.content.pm.PackageManager;

import android.content.res.Resources;

import android.net.ConnectivityManager;

import android.nfc.NfcAdapter;

import android.os.Bundle;

import android.preference.CheckBoxPreference;
@@ -55,6 +57,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
    private static final String DYNAMIC_ALARM = "dynamic_alarm";

    private static final String DYNAMIC_BUGREPORT = "dynamic_bugreport";

    private static final String DYNAMIC_IME = "dynamic_ime";

    private static final String DYNAMIC_USBTETHER = "dynamic_usbtether";

    private static final String DYNAMIC_WIFI = "dynamic_wifi";

    private static final String QUICK_PULLDOWN = "quick_pulldown";

    private static final String COLLAPSE_PANEL = "collapse_panel";
@@ -68,6 +71,7 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
    CheckBoxPreference mDynamicBugReport;

    CheckBoxPreference mDynamicWifi;

    CheckBoxPreference mDynamicIme;

    CheckBoxPreference mDynamicUsbTether;

    CheckBoxPreference mCollapsePanel;

    ListPreference mQuickPulldown;

    PreferenceCategory mGeneralSettings;
@@ -132,6 +136,8 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
        mDynamicBugReport.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_BUGREPORT, 1) == 1);

        mDynamicIme = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_IME);

        mDynamicIme.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_IME, 1) == 1);

        mDynamicUsbTether = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_USBTETHER);

        mDynamicUsbTether.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_USBTETHER, 1) == 1);

        mDynamicWifi = (CheckBoxPreference) prefSet.findPreference(DYNAMIC_WIFI);

        mDynamicWifi.setChecked(Settings.System.getInt(resolver, Settings.System.QS_DYNAMIC_WIFI, 1) == 1);
@@ -203,6 +209,10 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
            Settings.System.putInt(resolver, Settings.System.QS_DYNAMIC_IME,

                    mDynamicIme.isChecked() ? 1 : 0);

            return true;

        } else if (preference == mDynamicUsbTether) {

            Settings.System.putInt(resolver, Settings.System.QS_DYNAMIC_USBTETHER,

                    mDynamicUsbTether.isChecked() ? 1 : 0);

            return true;

        } else if (preference == mDynamicWifi) {

            Settings.System.putInt(resolver, Settings.System.QS_DYNAMIC_WIFI,

                    mDynamicWifi.isChecked() ? 1 : 0);
@@ -306,4 +316,9 @@ public class QuickSettings extends SettingsPreferenceFragment implements OnPrefe 
            return val.toString().split(SEPARATOR);

        }

    }



    private boolean deviceSupportsUsbTether() {

        ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);

        return (cm.getTetherableUsbRegexs().length != 0);

    }

}