diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2020-06-20 01:40:36 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-20 01:40:36 +0000 |
| commit | 8c52d7ea9da6648fdadf80a81d9dc3cee31bb623 (patch) | |
| tree | 4b711c8c94bb1e993d4c16feab68bd7e7b274b95 | |
| parent | 1a88206d927074a41ed70e55dcd12fae5f8813ac (diff) | |
| parent | a01a49fff85694f5265bb6890c381a472c0f5391 (diff) | |
| download | platform_packages_apps_Car_tests-android11-gsi.tar.gz platform_packages_apps_Car_tests-android11-gsi.tar.bz2 platform_packages_apps_Car_tests-android11-gsi.zip | |
Snap for 6610691 from 1a52e04b27ef7b59e4cc509854be405e61f3faaf to rvc-release am: a01a49fff8android11-gsi
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Car/tests/+/11939496
Change-Id: Ieee9f8d571caadb261160be4e6f840b8fb249e59
4 files changed, 25 insertions, 8 deletions
diff --git a/RotaryPlayground/res/layout/rotary_activity.xml b/RotaryPlayground/res/layout/rotary_activity.xml index 7086cb8..2a3b9e7 100644 --- a/RotaryPlayground/res/layout/rotary_activity.xml +++ b/RotaryPlayground/res/layout/rotary_activity.xml @@ -26,8 +26,8 @@ highlight is disabled, so it's invisible to the user no matter whether it's focused or not. --> <com.android.car.ui.FocusParkingView - android:layout_width="1dp" - android:layout_height="1dp"/> + android:layout_width="wrap_content" + android:layout_height="wrap_content"/> <FrameLayout android:id="@+id/rotary_menu" diff --git a/RotaryPlayground/res/layout/rotary_scroll.xml b/RotaryPlayground/res/layout/rotary_scroll.xml index 78c90c0..4153ca1 100644 --- a/RotaryPlayground/res/layout/rotary_scroll.xml +++ b/RotaryPlayground/res/layout/rotary_scroll.xml @@ -18,10 +18,23 @@ <com.android.car.ui.FocusArea xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:orientation="vertical"> + + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true"/> <com.android.car.ui.recyclerview.CarUiRecyclerView android:id="@+id/rotary_scroll_view" android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="0dp" + android:layout_weight="1"/> + + <EditText + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:singleLine="true"/> + </com.android.car.ui.FocusArea> diff --git a/RotaryPlayground/res/values/arrays.xml b/RotaryPlayground/res/values/arrays.xml index 18b0015..6c68e6e 100644 --- a/RotaryPlayground/res/values/arrays.xml +++ b/RotaryPlayground/res/values/arrays.xml @@ -44,6 +44,7 @@ height. Items here with '0' indicates the buttons item and items with value > 0 indicates the text item where the integer value is the height of the textview. --> <integer-array name="scroll_item_heights"> + <item>240</item> <item>0</item> <item>60</item> <item>0</item> @@ -64,6 +65,10 @@ <item>0</item> <item>240</item> <item>240</item> + <item>240</item> <item>0</item> + <item>240</item> + <item>240</item> + <item>240</item> </integer-array> </resources>
\ No newline at end of file diff --git a/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java b/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java index 32ab6a5..eada0cf 100644 --- a/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java +++ b/RotaryPlayground/src/com/android/car/rotaryplayground/RotaryActivity.java @@ -16,14 +16,13 @@ package com.android.car.rotaryplayground; import android.os.Bundle; -import androidx.fragment.app.Fragment; -import androidx.fragment.app.FragmentActivity; -import android.text.Html; -import android.text.Spanned; import android.util.Log; import android.view.View; import android.widget.Toast; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; + import java.util.Random; /** |