diff --git a/.idea/misc.xml b/.idea/misc.xml index 0ad17cb..8978d23 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - diff --git a/automotive/src/main/AndroidManifest.xml b/automotive/src/main/AndroidManifest.xml index a03b7bb..b0c2496 100644 --- a/automotive/src/main/AndroidManifest.xml +++ b/automotive/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ android:name="android.hardware.type.automotive" android:required="true" /> + = (mSplitPosition - mHandleSize / 2) && y <= (mSplitPosition + mHandleSize / 2); + return y >= (mSplitPosition - (mHandleSize*2)) && y <= (mSplitPosition + (mHandleSize*2)); } else { - return x >= (mSplitPosition - mHandleSize / 2) && x <= (mSplitPosition + mHandleSize / 2); + return x >= (mSplitPosition - (mHandleSize*2)) && x <= (mSplitPosition + (mHandleSize*2)); } } @@ -389,4 +395,15 @@ public class SplitLayout extends ViewGroup { public int getDragForgroundColor() { return dragForgroundColor; } + + public void switchChildViewPosition() { + checkChildren(); + removeAllViews(); + addView(mChild1); + addView(mChild0); + View tempView = mChild0; + mChild0 = mChild1; + mChild1 = tempView; + requestLayout(); + } } diff --git a/automotive/src/main/java/com/mixiaoxiao/splitlayoutsample/SplitLayoutActivity.java b/automotive/src/main/java/com/mixiaoxiao/splitlayoutsample/SplitLayoutActivity.java index bc616c9..55b0229 100644 --- a/automotive/src/main/java/com/mixiaoxiao/splitlayoutsample/SplitLayoutActivity.java +++ b/automotive/src/main/java/com/mixiaoxiao/splitlayoutsample/SplitLayoutActivity.java @@ -22,29 +22,29 @@ public class SplitLayoutActivity extends Activity { mVerticalSplitLayout = (SplitLayout) findViewById(R.id.splitlayout_vertical); mHorizontalSplitLayout = (SplitLayout) findViewById(R.id.splitlayout_horizontal); - findViewById(R.id.tv_child0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Toast.makeText(SplitLayoutActivity.this, "CHILD 0", Toast.LENGTH_SHORT).show(); - Log.d("SplitLayoutActivity", "tv_child0 clicked"); - } - }); +// findViewById(R.id.tv_child0).setOnClickListener(new View.OnClickListener() { +// @Override +// public void onClick(View v) { +// Toast.makeText(SplitLayoutActivity.this, "CHILD 0", Toast.LENGTH_SHORT).show(); +// Log.d("SplitLayoutActivity", "tv_child0 clicked"); +// } +// }); - findViewById(R.id.tv_child0).setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - Log.d("SplitLayoutActivity", "tv_child0 onTouch"); - return false; - } - }); - - findViewById(R.id.layout_child0).setOnTouchListener(new View.OnTouchListener() { - @Override - public boolean onTouch(View v, MotionEvent event) { - Log.d("SplitLayoutActivity", "layout_child0 onTouch"); - return false; - } - }); +// findViewById(R.id.tv_child0).setOnTouchListener(new View.OnTouchListener() { +// @Override +// public boolean onTouch(View v, MotionEvent event) { +// Log.d("SplitLayoutActivity", "tv_child0 onTouch"); +// return false; +// } +// }); +// +// findViewById(R.id.layout_child0).setOnTouchListener(new View.OnTouchListener() { +// @Override +// public boolean onTouch(View v, MotionEvent event) { +// Log.d("SplitLayoutActivity", "layout_child0 onTouch"); +// return false; +// } +// }); } public void onClickVerticalSample(View v) { @@ -63,11 +63,14 @@ public class SplitLayoutActivity extends Activity { // Toast.makeText(this, "CHILD 1", Toast.LENGTH_SHORT).show(); // } public void onClickRotateScreen(View v) { - if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); - } else { - setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); +// if (getResources().getConfiguration().orientation == Configuration.ORIENTATION_PORTRAIT) { +// setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); +// } else { +// setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT); +// +// } - } + // 切换两个子View的显示位置 + mHorizontalSplitLayout.switchChildViewPosition(); } } diff --git a/automotive/src/main/res/layout/activity_split_layout.xml b/automotive/src/main/res/layout/activity_split_layout.xml index b0f3b43..bcca7e5 100644 --- a/automotive/src/main/res/layout/activity_split_layout.xml +++ b/automotive/src/main/res/layout/activity_split_layout.xml @@ -40,6 +40,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_marginBottom="48dp" + app:splitFraction="0.3" app:splitHandleDrawable="@drawable/split_drawable" app:splitDragForgroundColor="@color/material_yellow_500" app:splitOrientation="horizontal">