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

Unverified Commit ba54eb5e authored by BestPig's avatar BestPig Committed by Michael Bestas
Browse files

SystemUI: Add USB Tether tile 

Author: BestPig <bestpig82@gmail.com>
Date:   Sun Feb 1 03:04:41 2015 +0100

    SystemUI: add USB Tether tile

     * Added vector drawables (blunden)

     * Long click action changed to open Tethering options, in the same way
       as Google does for Hotspot tile (bgcngm)

     * USB Tethering enablement check refactored (bgcngm and luca020400)

    Change-Id: Ic44f2b596fe32152f3f722347a855325c52113c6

Author: Gabriele M <moto.falcon.git@gmail.com>
Date:   Fri Apr 27 20:51:42 2018 +0200

    SystemUI: Toggle USB tethering only when USB is connected

    Pressing the tile when unplugged causes USB tethering to turn on
    as soon as the cable is connected. This can happen long after the
    tile has been pressed, so don't do anything if unplugged.

    Change-Id: Ib8bbdc758097ca7af5d4e7c3483c28ba42fb9ce1

Change-Id: Ibbc0ba9de2cc3eee2a7f6a9c9f005730244f0b3a
parent 5f26f6e7

packages/SystemUI/res/drawable/ic_qs_usb_tether.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

    Copyright (C) 2015 The CyanogenMod Open Source Project

    Copyright (C) 2017 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.

-->

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

        android:width="64dp"

        android:height="64dp"

        android:viewportWidth="64"

        android:viewportHeight="64">



    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M48.677,29.724h5.255V22.47h4.401l-7.047-9.611l-7.052,9.611h4.443V29.724z M48.677,34.537h5.255v7.254h4.401l-7.047,9.611 l-7.052-9.611h4.443V34.537z M38.85,16.447h-8.444v8.445h2.11v3.251l-8.574,4.36V14.337h4.562l-6.547-8.975l-6.545,8.975h4.561 v21.805l-8.571-3.715v-3.896c1.257-0.734,2.111-2.079,2.111-3.639c0-2.33-1.887-4.222-4.224-4.222c-2.332,0-4.222,1.892-4.222,4.222c0,1.56,0.854,2.905,2.113,3.639v6.668l12.794,5.547v5.609c-2.518,0.837-4.348,3.184-4.348,5.987c0,3.495,2.835,6.333,6.332,6.333c3.501,0,6.337-2.838,6.337-6.333c0-2.802-1.83-5.15-4.352-5.987v-9.113l12.798-6.512v-5.839h2.11L38.85,16.447L38.85,16.447z" />

</vector>

packages/SystemUI/res/values/cm_strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -51,4 +51,7 @@ 
    <string name="accessibility_quick_settings_sync_on">Sync on.</string>

    <string name="accessibility_quick_settings_sync_changed_off">Sync turned off.</string>

    <string name="accessibility_quick_settings_sync_changed_on">Sync turned on.</string>



    <!-- USB tethering QS tile -->

    <string name="quick_settings_usb_tether_label">USB tethering</string>

</resources>

packages/SystemUI/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ 


    <!-- Tiles native to System UI. Order should match "quick_settings_tiles_default" -->

    <string name="quick_settings_tiles_stock" translatable="false">

        internet,wifi,cell,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,ambient_display,caffeine,heads_up,sync

        internet,wifi,cell,bt,flashlight,dnd,alarm,airplane,controls,wallet,rotation,battery,cast,screenrecord,mictoggle,cameratoggle,location,hotspot,inversion,saver,dark,work,night,reverse,reduce_brightness,ambient_display,caffeine,heads_up,sync,usb_tether

    </string>



    <!-- The tiles to display in QuickSettings -->

packages/SystemUI/src/com/android/systemui/qs/tileimpl/QSFactoryImpl.java

+7 −1
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ import com.android.systemui.qs.tiles.RotationLockTile; 
import com.android.systemui.qs.tiles.ScreenRecordTile;

import com.android.systemui.qs.tiles.SyncTile;

import com.android.systemui.qs.tiles.UiModeNightTile;

import com.android.systemui.qs.tiles.UsbTetherTile;

import com.android.systemui.qs.tiles.UserTile;

import com.android.systemui.qs.tiles.WifiTile;

import com.android.systemui.qs.tiles.WorkModeTile;
@@ -99,6 +100,7 @@ public class QSFactoryImpl implements QSFactory { 
    private final Provider<CaffeineTile> mCaffeineTileProvider;

    private final Provider<HeadsUpTile> mHeadsUpTileProvider;

    private final Provider<SyncTile> mSyncTileProvider;

    private final Provider<UsbTetherTile> mUsbTetherTileProvider;



    private final Lazy<QSHost> mQsHostLazy;

    private final Provider<CustomTile.Builder> mCustomTileBuilderProvider;
@@ -137,7 +139,8 @@ public class QSFactoryImpl implements QSFactory { 
            Provider<AmbientDisplayTile> ambientDisplayTileProvider,

            Provider<CaffeineTile> caffeineTileProvider,

            Provider<HeadsUpTile> headsUpTileProvider,

            Provider<SyncTile> syncTileProvider) {

            Provider<SyncTile> syncTileProvider,

            Provider<UsbTetherTile> usbTetherTileProvider) {

        mQsHostLazy = qsHostLazy;

        mCustomTileBuilderProvider = customTileBuilderProvider;
@@ -172,6 +175,7 @@ public class QSFactoryImpl implements QSFactory { 
        mCaffeineTileProvider = caffeineTileProvider;

        mHeadsUpTileProvider = headsUpTileProvider;

        mSyncTileProvider = syncTileProvider;

        mUsbTetherTileProvider = usbTetherTileProvider;

    }



    public QSTile createTile(String tileSpec) {
@@ -247,6 +251,8 @@ public class QSFactoryImpl implements QSFactory { 
                return mHeadsUpTileProvider.get();

            case "sync":

                return mSyncTileProvider.get();

            case "usb_tether":

                return mUsbTetherTileProvider.get();

        }



        // Custom tiles

packages/SystemUI/src/com/android/systemui/qs/tiles/UsbTetherTile.java

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

 * Copyright (C) 2015 The Android Open Source Project

 * Copyright (C) 2017-2018 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.systemui.qs.tiles;



import static com.android.internal.logging.MetricsLogger.VIEW_UNKNOWN;



import android.content.BroadcastReceiver;

import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.IntentFilter;

import android.hardware.usb.UsbManager;

import android.os.Handler;

import android.os.Looper;

import android.provider.Settings;

import android.net.TetheringManager;

import android.service.quicksettings.Tile;

import android.view.View;



import androidx.annotation.Nullable;



import com.android.internal.logging.MetricsLogger;

import com.android.systemui.R;

import com.android.systemui.dagger.qualifiers.Background;

import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.plugins.FalsingManager;

import com.android.systemui.plugins.qs.QSTile.BooleanState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.qs.QSHost;

import com.android.systemui.qs.logging.QSLogger;

import com.android.systemui.qs.tileimpl.QSTileImpl;



import javax.inject.Inject;



/**

 * USB Tether quick settings tile

 */

public class UsbTetherTile extends QSTileImpl<BooleanState> {



    private final Icon mIcon = ResourceIcon.get(R.drawable.ic_qs_usb_tether);



    private static final Intent TETHER_SETTINGS = new Intent().setComponent(new ComponentName(

            "com.android.settings", "com.android.settings.TetherSettings"));



    private final TetheringManager mTetheringManager;



    private boolean mListening;



    private boolean mUsbConnected = false;

    private boolean mUsbTetherEnabled = false;



    @Inject

    public UsbTetherTile(

            QSHost host,

            @Background Looper backgroundLooper,

            @Main Handler mainHandler,

            FalsingManager falsingManager,

            MetricsLogger metricsLogger,

            StatusBarStateController statusBarStateController,

            ActivityStarter activityStarter,

            QSLogger qsLogger

    ) {

        super(host, backgroundLooper, mainHandler, falsingManager, metricsLogger,

                statusBarStateController, activityStarter, qsLogger);

        mTetheringManager = mContext.getSystemService(TetheringManager.class);

    }



    public BooleanState newTileState() {

        return new BooleanState();

    }



    @Override

    public void handleSetListening(boolean listening) {

        if (mListening == listening) {

            return;

        }

        mListening = listening;

        if (listening) {

            final IntentFilter filter = new IntentFilter();

            filter.addAction(UsbManager.ACTION_USB_STATE);

            mContext.registerReceiver(mReceiver, filter);

        } else {

            mContext.unregisterReceiver(mReceiver);

        }

    }



    @Override

    protected void handleClick(@Nullable View view) {

        if (mUsbConnected) {

            mTetheringManager.setUsbTethering(!mUsbTetherEnabled);

        }

    }



    @Override

    public Intent getLongClickIntent() {

        return new Intent(TETHER_SETTINGS);

    }



    private final BroadcastReceiver mReceiver = new BroadcastReceiver() {

        @Override

        public void onReceive(Context context, Intent intent) {

            mUsbConnected = intent.getBooleanExtra(UsbManager.USB_CONNECTED, false);

            if (mUsbConnected && mTetheringManager.isTetheringSupported()) {

                mUsbTetherEnabled = intent.getBooleanExtra(UsbManager.USB_FUNCTION_RNDIS, false);

            } else {

                mUsbTetherEnabled = false;

            }

            refreshState();

        }

    };



    @Override

    protected void handleUpdateState(BooleanState state, Object arg) {

        state.value = mUsbTetherEnabled;

        state.label = mContext.getString(R.string.quick_settings_usb_tether_label);

        state.icon = mIcon;

        state.state = !mUsbConnected ? Tile.STATE_UNAVAILABLE

                : mUsbTetherEnabled ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;

    }



    @Override

    public CharSequence getTileLabel() {

        return mContext.getString(R.string.quick_settings_usb_tether_label);

    }



    @Override

    public int getMetricsCategory() {

        return VIEW_UNKNOWN;

    }

}