diff options
3 files changed, 18 insertions, 51 deletions
diff --git a/packages/SystemUI/res/layout/controls_management.xml b/packages/SystemUI/res/layout/controls_management.xml index 6da96d10c253..835e54e9e433 100644 --- a/packages/SystemUI/res/layout/controls_management.xml +++ b/packages/SystemUI/res/layout/controls_management.xml @@ -26,41 +26,15 @@ android:paddingStart="@dimen/controls_management_side_padding" android:paddingEnd="@dimen/controls_management_side_padding" > - <LinearLayout - android:orientation="horizontal" + + <TextView + android:id="@+id/title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:focusable="false" - android:clickable="false" - android:gravity="center_vertical"> - - <FrameLayout - android:id="@+id/icon_frame" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="start|center_vertical" - android:minWidth="56dp" - android:visibility="gone" - android:paddingTop="@dimen/controls_app_icon_frame_top_padding" - android:paddingBottom="@dimen/controls_app_icon_frame_bottom_padding" - android:paddingEnd="@dimen/controls_app_icon_frame_side_padding" - android:paddingStart="@dimen/controls_app_icon_frame_side_padding" > - - <ImageView - android:id="@android:id/icon" - android:layout_width="@dimen/controls_app_icon_size" - android:layout_height="@dimen/controls_app_icon_size" /> - </FrameLayout> - - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textSize="@dimen/controls_title_size" - android:textAlignment="center" /> + android:textAppearance="?android:attr/textAppearanceLarge" + android:textSize="@dimen/controls_title_size" + android:textAlignment="center" /> - </LinearLayout> <TextView diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt index 183bd7bb2b7a..9a2ccb52132b 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt @@ -20,7 +20,6 @@ import android.app.ActivityOptions import android.content.ComponentName import android.content.Intent import android.content.res.Configuration -import android.graphics.drawable.Drawable import android.os.Bundle import android.text.TextUtils import android.view.Gravity @@ -29,7 +28,6 @@ import android.view.ViewGroup import android.view.ViewStub import android.widget.Button import android.widget.FrameLayout -import android.widget.ImageView import android.widget.TextView import androidx.viewpager2.widget.ViewPager2 import com.android.systemui.Prefs @@ -76,11 +74,10 @@ class ControlsFavoritingActivity @Inject constructor( private lateinit var structurePager: ViewPager2 private lateinit var statusText: TextView private lateinit var titleView: TextView - private lateinit var iconView: ImageView - private lateinit var iconFrame: View private lateinit var pageIndicator: ManagementPageIndicator private var mTooltipManager: TooltipManager? = null private lateinit var doneButton: View + private lateinit var otherAppsButton: View private var listOfStructures = emptyList<StructureContainer>() private lateinit var comparator: Comparator<StructureContainer> @@ -99,17 +96,10 @@ class ControlsFavoritingActivity @Inject constructor( } private val listingCallback = object : ControlsListingController.ControlsListingCallback { - private var icon: Drawable? = null override fun onServicesUpdated(serviceInfos: List<ControlsServiceInfo>) { - val newIcon = serviceInfos.firstOrNull { it.componentName == component }?.loadIcon() - if (icon == newIcon) return - icon = newIcon - executor.execute { - if (icon != null) { - iconView.setImageDrawable(icon) - } - iconFrame.visibility = if (icon != null) View.VISIBLE else View.GONE + if (serviceInfos.size > 1) { + otherAppsButton.visibility = View.VISIBLE } } } @@ -271,8 +261,6 @@ class ControlsFavoritingActivity @Inject constructor( } requireViewById<TextView>(R.id.subtitle).text = resources.getText(R.string.controls_favorite_subtitle) - iconView = requireViewById(com.android.internal.R.id.icon) - iconFrame = requireViewById(R.id.icon_frame) structurePager = requireViewById<ViewPager2>(R.id.structure_pager) structurePager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { override fun onPageSelected(position: Int) { @@ -284,8 +272,7 @@ class ControlsFavoritingActivity @Inject constructor( } private fun bindButtons() { - requireViewById<Button>(R.id.other_apps).apply { - visibility = View.VISIBLE + otherAppsButton = requireViewById<Button>(R.id.other_apps).apply { setOnClickListener { val i = Intent() i.setComponent( diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt index 80cb96803f24..00448544d691 100644 --- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt +++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsProviderSelectorActivity.kt @@ -21,6 +21,7 @@ import android.content.ComponentName import android.content.Intent import android.os.Bundle import android.view.LayoutInflater +import android.view.View import android.view.ViewGroup import android.view.ViewStub import android.widget.Button @@ -90,9 +91,14 @@ class ControlsProviderSelectorActivity @Inject constructor( text = resources.getText(R.string.controls_providers_title) } - requireViewById<Button>(R.id.done).setOnClickListener { - this@ControlsProviderSelectorActivity.finishAffinity() + requireViewById<Button>(R.id.other_apps).apply { + visibility = View.VISIBLE + setText(com.android.internal.R.string.cancel) + setOnClickListener { + this@ControlsProviderSelectorActivity.finishAffinity() + } } + requireViewById<View>(R.id.done).visibility = View.GONE } override fun onStart() { |