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

Makes PIP buttons <Button> / <ImageButton>

Browse Source 
Bug: 115594369
Test: Enable TalkBack and tap on Expand / Previous / Next
Change-Id: I51caaba95d3defe8219979be8c81e3b2bdd3ddf5
This commit is contained in:
Hongwei Wang
2019-06-20 13:18:43 -07:00
parent e493e60354
commit a6e034ed62
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/res/layout/pip_menu_action.xml
View File

@@ -13,10 +13,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<ImageView
<ImageButton
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="@dimen/pip_action_size"
android:layout_height="@dimen/pip_action_size"
android:padding="@dimen/pip_action_padding"
android:background="?android:selectableItemBackgroundBorderless"
android:forceHasOverlappingRendering="false" />
android:forceHasOverlappingRendering="false" />

6
packages/SystemUI/res/layout/pip_menu_activity.xml
View File

@@ -32,7 +32,7 @@
android:id="@+id/expand_container"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
<ImageButton
android:id="@+id/expand_button"
android:layout_width="60dp"
android:layout_height="60dp"
@@ -60,7 +60,7 @@
</FrameLayout>
</FrameLayout>
<ImageView
<ImageButton
android:id="@+id/settings"
android:layout_width="@dimen/pip_action_size"
android:layout_height="@dimen/pip_action_size"
@@ -70,7 +70,7 @@
android:src="@drawable/ic_settings"
android:background="?android:selectableItemBackgroundBorderless" />
<ImageView
<ImageButton
android:id="@+id/dismiss"
android:layout_width="@dimen/pip_action_size"
android:layout_height="@dimen/pip_action_size"

8
packages/SystemUI/src/com/android/systemui/pip/phone/PipMenuActivity.java
View File

@@ -69,7 +69,7 @@ import android.view.ViewGroup;
import android.view.WindowManager.LayoutParams;
import android.view.accessibility.AccessibilityManager;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.ImageButton;
import android.widget.LinearLayout;
import com.android.systemui.Interpolators;
@@ -115,7 +115,6 @@ public class PipMenuActivity extends Activity {
private LinearLayout mActionsGroup;
private View mSettingsButton;
private View mDismissButton;
private ImageView mExpandButton;
private int mBetweenActionPaddingLand;
private AnimatorSet mMenuContainerAnimator;
@@ -246,7 +245,6 @@ public class PipMenuActivity extends Activity {
mActionsGroup = findViewById(R.id.actions_group);
mBetweenActionPaddingLand = getResources().getDimensionPixelSize(
R.dimen.pip_between_action_padding_land);
mExpandButton = findViewById(R.id.expand_button);
updateFromIntent(getIntent());
setTitle(R.string.pip_menu_title);
@@ -482,7 +480,7 @@ public class PipMenuActivity extends Activity {
// Ensure we have as many buttons as actions
final LayoutInflater inflater = LayoutInflater.from(this);
while (mActionsGroup.getChildCount() < mActions.size()) {
final ImageView actionView = (ImageView) inflater.inflate(
final ImageButton actionView = (ImageButton) inflater.inflate(
R.layout.pip_menu_action, mActionsGroup, false);
mActionsGroup.addView(actionView);
}
@@ -499,7 +497,7 @@ public class PipMenuActivity extends Activity {
(stackBounds.width() > stackBounds.height());
for (int i = 0; i < mActions.size(); i++) {
final RemoteAction action = mActions.get(i);
final ImageView actionView = (ImageView) mActionsGroup.getChildAt(i);
final ImageButton actionView = (ImageButton) mActionsGroup.getChildAt(i);
// TODO: Check if the action drawable has changed before we reload it
action.getIcon().loadDrawableAsync(this, d -> {