diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2019-04-29 21:06:10 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-04-29 21:06:10 +0000 |
| commit | ece3a41e48e5fff14edff10605cc0fcc91479cd3 (patch) | |
| tree | 1fa057193d95cfe219c62dc5b8fb85a67918b5bf /src | |
| parent | a2fd0a11399f1cbc39ac775df22eac0652c1b925 (diff) | |
| parent | 6d90fcf07c6cd53dd0d47d2d8b40cc9d722ad20f (diff) | |
| download | Media-ece3a41e48e5fff14edff10605cc0fcc91479cd3.tar.gz | |
Merge "Disable settings button when in driving mode" into pi-car-dev
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/car/media/widgets/AppBarView.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/car/media/widgets/AppBarView.java b/src/com/android/car/media/widgets/AppBarView.java index 438e87b..4162031 100644 --- a/src/com/android/car/media/widgets/AppBarView.java +++ b/src/com/android/car/media/widgets/AppBarView.java @@ -23,6 +23,7 @@ import android.widget.TextView; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintSet; +import com.android.car.apps.common.UxrImageView; import com.android.car.apps.common.widget.CarTabLayout; import com.android.car.media.R; import com.android.car.media.common.MediaAppSelectorWidget; @@ -45,7 +46,7 @@ public class AppBarView extends ConstraintLayout { private ViewGroup mNavIconContainer; private TextView mTitle; /** Visible if mHasSettings && mShowSettings. */ - private View mSettingsButton; + private UxrImageView mSettingsButton; private boolean mHasSettings; private boolean mShowSettings; private View mSearchButton; |