PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Audiosharing] When landscape mode, collapse app bar to make more space. Also refined fragments and make them scrollable.

Browse Source 
Bug: b/356302527, b/356300387, b/356297148
Flag: com.android.settingslib.flags.enable_le_audio_qr_code_private_broadcast_sharing
Test: atest
Change-Id: I5d94f0d05afc78c13cab5b75ad662af72ffa0350
This commit is contained in:
chelseahao
2024-08-02 11:47:27 +08:00
committed by Chelsea Hao
parent b068edadf1
commit e7a1762ef3
9 changed files with 177 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tests/robotests/src/com/android/settings/connecteddevice/audiosharing/audiostreams/AudioStreamsHelperTest.java
View File

@@ -16,6 +16,9 @@
package com.android.settings.connecteddevice.audiosharing.audiostreams;
import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
import static android.content.res.Configuration.ORIENTATION_PORTRAIT;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any;
@@ -32,9 +35,13 @@ import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothLeBroadcastMetadata;
import android.bluetooth.BluetoothLeBroadcastReceiveState;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import androidx.fragment.app.FragmentActivity;
import androidx.test.core.app.ApplicationProvider;
import com.android.settings.R;
import com.android.settings.testutils.shadow.ShadowThreadUtils;
import com.android.settingslib.bluetooth.CachedBluetoothDevice;
import com.android.settingslib.bluetooth.CachedBluetoothDeviceManager;
@@ -42,6 +49,7 @@ import com.android.settingslib.bluetooth.LocalBluetoothLeBroadcastAssistant;
import com.android.settingslib.bluetooth.LocalBluetoothManager;
import com.android.settingslib.bluetooth.LocalBluetoothProfileManager;
import com.google.android.material.appbar.AppBarLayout;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -91,8 +99,7 @@ public class AudioStreamsHelperTest {
@Test
public void addSource_noDevice_doNothing() {
when(mAssistant.getAllConnectedDevices())
.thenReturn(Collections.emptyList());
when(mAssistant.getAllConnectedDevices()).thenReturn(Collections.emptyList());
mHelper.addSource(mMetadata);
verify(mAssistant, never()).addSource(any(), any(), anyBoolean());
@@ -114,8 +121,7 @@ public class AudioStreamsHelperTest {
@Test
public void removeSource_noDevice_doNothing() {
when(mAssistant.getAllConnectedDevices())
.thenReturn(Collections.emptyList());
when(mAssistant.getAllConnectedDevices()).thenReturn(Collections.emptyList());
mHelper.removeSource(BROADCAST_ID_1);
verify(mAssistant, never()).removeSource(any(), anyInt());
@@ -236,4 +242,40 @@ public class AudioStreamsHelperTest {
verify(mContext).startService(any());
}
@Test
public void configureAppBarByOrientation_landscape_shouldNotExpand() {
FragmentActivity fragmentActivity = mock(FragmentActivity.class);
// AppBarLayout requires a Theme.AppCompat.
mContext.setTheme(R.style.Theme_Settings_Home);
AppBarLayout appBarLayout = spy(new AppBarLayout(mContext));
setUpFragment(fragmentActivity, appBarLayout, ORIENTATION_LANDSCAPE);
AudioStreamsHelper.configureAppBarByOrientation(fragmentActivity);
verify(appBarLayout).setExpanded(eq(false));
}
@Test
public void configureAppBarByOrientation_portrait_shouldExpand() {
FragmentActivity fragmentActivity = mock(FragmentActivity.class);
// AppBarLayout requires a Theme.AppCompat.
mContext.setTheme(R.style.Theme_Settings_Home);
AppBarLayout appBarLayout = spy(new AppBarLayout(mContext));
setUpFragment(fragmentActivity, appBarLayout, ORIENTATION_PORTRAIT);
AudioStreamsHelper.configureAppBarByOrientation(fragmentActivity);
verify(appBarLayout).setExpanded(eq(true));
}
private void setUpFragment(
FragmentActivity fragmentActivity, AppBarLayout appBarLayout, int orientationPortrait) {
Resources resources = mock(Resources.class);
when(fragmentActivity.getResources()).thenReturn(resources);
Configuration configuration = new Configuration();
configuration.orientation = orientationPortrait;
when(resources.getConfiguration()).thenReturn(configuration);
when(fragmentActivity.findViewById(anyInt())).thenReturn(appBarLayout);
}
}