Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Enable the new footer actions for everyone"" into tm-qpr-dev

Browse Source
This commit is contained in:
Jordan Demeulenaere
2022-10-06 08:12:18 +00:00
committed by Android (Google) Code Review
parent 26ed84b746 e5b8411279
commit cdbebee78a
6 changed files with 3 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res-keyguard/layout/footer_actions.xml
View File

@@ -61,7 +61,7 @@
</com.android.systemui.statusbar.phone.MultiUserSwitch>
<com.android.systemui.statusbar.AlphaOptimizedFrameLayout
android:id="@id/settings_button_container"
android:id="@+id/settings_button_container"
android:layout_width="@dimen/qs_footer_action_button_size"
android:layout_height="@dimen/qs_footer_action_button_size"
android:background="@drawable/qs_footer_action_circle"
@@ -85,7 +85,7 @@
</com.android.systemui.statusbar.AlphaOptimizedFrameLayout>
<com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@id/pm_lite"
android:id="@+id/pm_lite"
android:layout_width="@dimen/qs_footer_action_button_size"
android:layout_height="@dimen/qs_footer_action_button_size"
android:background="@drawable/qs_footer_action_circle_color"

5
packages/SystemUI/res/values/ids.xml
View File

@@ -188,10 +188,5 @@
<item type="id" name="face_scanning_anim"/>
<item type="id" name="qqs_tile_layout"/>
<!-- The buttons in the Quick Settings footer actions.-->
<item type="id" name="settings_button_container"/>
<item type="id" name="pm_lite"/>
</resources>

2
packages/SystemUI/src/com/android/systemui/flags/Flags.java
View File

@@ -169,7 +169,7 @@ public class Flags {
public static final ResourceBooleanFlag FULL_SCREEN_USER_SWITCHER =
new ResourceBooleanFlag(506, R.bool.config_enableFullscreenUserSwitcher);
public static final ReleasedFlag NEW_FOOTER_ACTIONS = new ReleasedFlag(507);
public static final UnreleasedFlag NEW_FOOTER_ACTIONS = new UnreleasedFlag(507, true);
/***************************************/
// 600- status bar

1
packages/SystemUI/src/com/android/systemui/qs/footer/ui/binder/FooterActionsViewBinder.kt
View File

@@ -222,7 +222,6 @@ object FooterActionsViewBinder {
private fun bindButton(button: IconButtonViewHolder, model: FooterActionsButtonViewModel?) {
val buttonView = button.view
buttonView.id = model?.id ?: View.NO_ID
buttonView.isVisible = model != null
if (model == null) {
return

1
packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsButtonViewModel.kt
View File

@@ -25,7 +25,6 @@ import com.android.systemui.common.shared.model.Icon
* power buttons.
*/
data class FooterActionsButtonViewModel(
val id: Int?,
val icon: Icon,
val iconTint: Int?,
@DrawableRes val background: Int,

3
packages/SystemUI/src/com/android/systemui/qs/footer/ui/viewmodel/FooterActionsViewModel.kt
View File

@@ -138,7 +138,6 @@ class FooterActionsViewModel(
/** The model for the settings button. */
val settings: FooterActionsButtonViewModel =
FooterActionsButtonViewModel(
id = R.id.settings_button_container,
Icon.Resource(
R.drawable.ic_settings,
ContentDescription.Resource(R.string.accessibility_quick_settings_settings)
@@ -152,7 +151,6 @@ class FooterActionsViewModel(
val power: FooterActionsButtonViewModel? =
if (showPowerButton) {
FooterActionsButtonViewModel(
id = R.id.pm_lite,
Icon.Resource(
android.R.drawable.ic_lock_power_off,
ContentDescription.Resource(R.string.accessibility_quick_settings_power_menu)
@@ -258,7 +256,6 @@ class FooterActionsViewModel(
}
return FooterActionsButtonViewModel(
id = null,
Icon.Loaded(
icon,
ContentDescription.Loaded(userSwitcherContentDescription(status.currentUserName)),