Update Radio to replace app-switch am: 1a76fe0f54 am: e29ebe583f
am: 776e5a763b
Change-Id: Ia568c6e2c4b5f687f51b031b57ff63c095868d3c
diff --git a/Android.mk b/Android.mk
index baf7678..7500191 100644
--- a/Android.mk
+++ b/Android.mk
@@ -73,8 +73,8 @@
androidx.room_room-runtime \
car-apps-common \
car-media-common \
- car-ui-lib \
- car-broadcastradio-support
+ car-broadcastradio-support \
+ car-ui-lib
# Including the resources for the static android libraries allows to pick up their static overlays.
LOCAL_RESOURCE_DIR += \
diff --git a/res/layout/radio_activity.xml b/res/layout/radio_activity.xml
index 1e7c29a..60ed8ff 100644
--- a/res/layout/radio_activity.xml
+++ b/res/layout/radio_activity.xml
@@ -24,8 +24,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
- app:layout_constraintGuide_begin="@dimen/appbar_first_row_height" />
-
+ app:layout_constraintGuide_begin="@dimen/car_ui_toolbar_first_row_height" />
<com.android.car.apps.common.widget.CarTabLayout
android:id="@+id/tabs"
@@ -44,20 +43,30 @@
android:layout_marginTop="@dimen/control_button_margin"
android:layout_marginRight="@dimen/control_button_margin"
android:scaleType="center"
- app:layout_constraintEnd_toStartOf="@+id/app_switch_container"
- app:layout_constraintTop_toTopOf="parent" />
+ app:layout_constraintEnd_toStartOf="@+id/app_selector_container"
+ app:layout_constraintBottom_toTopOf="@+id/app_bar_bottom"
+ app:layout_constraintTop_toTopOf="parent"/>
- <com.android.car.media.common.MediaAppSelectorWidget
- android:id="@+id/app_switch_container"
- android:layout_width="@dimen/app_switch_widget_width"
- android:layout_height="wrap_content"
+ <!-- TODO (b/143297376): Replace this and all the toolbar elements with
+ com.android.car.ui.toolbar.Toolbar -->
+ <FrameLayout
+ android:id="@+id/app_selector_container"
+ android:layout_width="@dimen/app_selector_icon_touch_target"
+ android:layout_height="@dimen/app_selector_icon_touch_target"
+ android:background="?android:attr/selectableItemBackground"
+ android:layout_marginRight="@dimen/app_selector_margin_x"
app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintBottom_toBottomOf="@+id/app_bar_bottom"
- app:layout_constraintRight_toRightOf="parent"
- android:padding="@dimen/app_switch_widget_icon_padding"
- android:orientation="horizontal"
- android:background="@drawable/appbar_view_icon_background"
- android:gravity="center" />
+ app:layout_constraintBottom_toTopOf="@+id/app_bar_bottom"
+ app:layout_constraintRight_toRightOf="parent">
+
+ <ImageView
+ android:id="@+id/app_selector"
+ android:layout_width="@dimen/app_selector_icon_size"
+ android:layout_height="@dimen/app_selector_icon_size"
+ android:layout_gravity="center"
+ android:src="@drawable/ic_app_switch"
+ android:tint="@color/icon_tint" />
+ </FrameLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewpager"
diff --git a/src/com/android/car/radio/RadioActivity.java b/src/com/android/car/radio/RadioActivity.java
index 0864f2b..3348d11 100644
--- a/src/com/android/car/radio/RadioActivity.java
+++ b/src/com/android/car/radio/RadioActivity.java
@@ -20,13 +20,14 @@
import android.content.Intent;
import android.os.Bundle;
import android.view.KeyEvent;
+import android.view.View;
import androidx.annotation.NonNull;
import androidx.fragment.app.FragmentActivity;
import androidx.viewpager.widget.ViewPager;
import com.android.car.apps.common.widget.CarTabLayout;
-import com.android.car.media.common.MediaAppSelectorWidget;
+import com.android.car.media.common.source.MediaSource;
import com.android.car.media.common.source.MediaSourceViewModel;
import com.android.car.radio.bands.ProgramType;
import com.android.car.radio.util.Log;
@@ -67,8 +68,9 @@
setContentView(R.layout.radio_activity);
mBandSelector = findViewById(R.id.band_toggle_button);
- MediaAppSelectorWidget appSelector = findViewById(R.id.app_switch_container);
- appSelector.setFragmentActivity(this);
+ View appSelector = findViewById(R.id.app_selector_container);
+ Intent appSelectorIntent = MediaSource.getSourceSelectorIntent(this, false);
+ appSelector.setOnClickListener(e -> startActivity(appSelectorIntent));
mRadioController = new RadioController(this);
mBandSelector.setCallback(mRadioController::switchBand);
