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

Unverified Commit 02aba710 authored by Michael Bestas's avatar Michael Bestas
Browse files

Remove useless USB page header 

* This causes the options to go off screen and almost always
  require scrolling in order to reach all the options.

Change-Id: I3880982978aa50f11bf24b4da6e91a0917181811
parent 85ead7e3

res/xml/usb_details_fragment.xml

+0 −5
Original line number Diff line number Diff line
@@ -20,11 +20,6 @@ 
    android:title="@string/usb_pref"

    android:key="usb_details_fragment">



    <com.android.settingslib.widget.LayoutPreference

        android:key="usb_device_header"

        android:layout="@layout/settings_entity_header"

        android:selectable="false"/>



    <PreferenceCategory

        android:key="usb_details_data_role"

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

src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java

+0 −1
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ public class UsbDetailsFragment extends DashboardFragment { 
    private static List<UsbDetailsController> createControllerList(Context context,

            UsbBackend usbBackend, UsbDetailsFragment fragment) {

        List<UsbDetailsController> ret = new ArrayList<>();

        ret.add(new UsbDetailsHeaderController(context, fragment, usbBackend));

        ret.add(new UsbDetailsDataRoleController(context, fragment, usbBackend));

        ret.add(new UsbDetailsFunctionsController(context, fragment, usbBackend));

        ret.add(new UsbDetailsPowerRoleController(context, fragment, usbBackend));

src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderController.java

deleted100644 → 0
+0 −60
Original line number Diff line number Diff line 
/*

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

 */



package com.android.settings.connecteddevice.usb;



import android.content.Context;



import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.widget.LayoutPreference;



/**

 * This class adds a header with device name.

 */

public class UsbDetailsHeaderController extends UsbDetailsController {

    private static final String KEY_DEVICE_HEADER = "usb_device_header";



    private EntityHeaderController mHeaderController;



    public UsbDetailsHeaderController(Context context, UsbDetailsFragment fragment,

            UsbBackend backend) {

        super(context, fragment, backend);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        final LayoutPreference headerPreference = screen.findPreference(KEY_DEVICE_HEADER);

        mHeaderController = EntityHeaderController.newInstance(mFragment.getActivity(), mFragment,

                headerPreference.findViewById(R.id.entity_header));

    }





    @Override

    protected void refresh(boolean connected, long functions, int powerRole, int dataRole) {

        mHeaderController.setLabel(mContext.getString(R.string.usb_pref));

        mHeaderController.setIcon(mContext.getDrawable(R.drawable.ic_usb));

        mHeaderController.done(mFragment.getActivity(), true /* rebindActions */);

    }



    @Override

    public String getPreferenceKey() {

        return KEY_DEVICE_HEADER;

    }

}

tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDetailsHeaderControllerTest.java

deleted100644 → 0
+0 −116
Original line number Diff line number Diff line 
/*

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

 */



package com.android.settings.connecteddevice.usb;



import static android.hardware.usb.UsbPortStatus.DATA_ROLE_DEVICE;

import static android.hardware.usb.UsbPortStatus.POWER_ROLE_SINK;



import static org.mockito.ArgumentMatchers.argThat;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.content.Context;

import android.graphics.drawable.Drawable;

import android.hardware.usb.UsbManager;

import android.hardware.usb.UsbPort;



import androidx.fragment.app.FragmentActivity;

import androidx.lifecycle.LifecycleOwner;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settings.testutils.shadow.ShadowEntityHeaderController;

import com.android.settings.widget.EntityHeaderController;

import com.android.settingslib.core.lifecycle.Lifecycle;

import com.android.settingslib.testutils.DrawableTestHelper;

import com.android.settingslib.widget.LayoutPreference;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.ArgumentMatcher;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



@RunWith(RobolectricTestRunner.class)

@Config(shadows = ShadowEntityHeaderController.class)

public class UsbDetailsHeaderControllerTest {



    private UsbDetailsHeaderController mDetailsHeaderController;

    private Context mContext;

    private Lifecycle mLifecycle;

    private LifecycleOwner mLifecycleOwner;

    private LayoutPreference mPreference;

    private PreferenceManager mPreferenceManager;

    private PreferenceScreen mScreen;



    @Mock

    private UsbBackend mUsbBackend;

    @Mock

    private UsbDetailsFragment mFragment;

    @Mock

    private FragmentActivity mActivity;

    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private EntityHeaderController mHeaderController;



    @Before

    public void setUp() {

        MockitoAnnotations.initMocks(this);



        mContext = RuntimeEnvironment.application;

        mLifecycleOwner = () -> mLifecycle;

        mLifecycle = new Lifecycle(mLifecycleOwner);

        mPreferenceManager = new PreferenceManager(mContext);

        mScreen = mPreferenceManager.createPreferenceScreen(mContext);



        when(mFragment.getActivity()).thenReturn(mActivity);

        when(mActivity.getApplicationContext()).thenReturn(mContext);

        when(mFragment.getContext()).thenReturn(mContext);

        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);

        when(mFragment.getPreferenceScreen()).thenReturn(mScreen);



        ShadowEntityHeaderController.setUseMock(mHeaderController);

        mDetailsHeaderController = new UsbDetailsHeaderController(mContext, mFragment, mUsbBackend);

        mPreference = new LayoutPreference(mContext, R.layout.settings_entity_header);

        mPreference.setKey(mDetailsHeaderController.getPreferenceKey());

        mScreen.addPreference(mPreference);

    }



    @After

    public void tearDown() {

        ShadowEntityHeaderController.reset();

    }



    @Test

    public void displayRefresh_charging_shouldSetHeader() {

        mDetailsHeaderController.displayPreference(mScreen);

        mDetailsHeaderController.refresh(true, UsbManager.FUNCTION_NONE, POWER_ROLE_SINK,

                DATA_ROLE_DEVICE);

        verify(mHeaderController).setLabel(mContext.getString(R.string.usb_pref));

        verify(mHeaderController).setIcon(argThat((ArgumentMatcher<Drawable>) t -> {

            DrawableTestHelper.assertDrawableResId(t, R.drawable.ic_usb);

            return true;

        }));

        verify(mHeaderController).done(mActivity, true);

    }

}