PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Enable scrolling in screen flash color selector dialog" into udc-qpr-dev am: 81a3646462

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23875506

Change-Id: Ifd3337358a62ba1eb28095e8111b673fc1fb7043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Angela Wang
2023-07-19 07:43:30 +00:00
committed by Automerger Merge Worker
parent 27c4b3b6c6 81a3646462
commit 079ac4f3a5
2 changed files with 152 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/layout/layout_color_selector.xml
View File

@@ -14,13 +14,18 @@
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/color_selector_root_view" android:id="@+id/color_selector_root_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="20dp"
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@@ -172,3 +177,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView>

10
res/layout/layout_color_selector_dialog.xml
View File

@@ -17,16 +17,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:gravity="center_horizontal"
android:paddingBottom="24dp"> android:orientation="vertical">
<com.android.settings.accessibility.ColorSelectorLayout <com.android.settings.accessibility.ColorSelectorLayout
android:id="@+id/color_selector_preference" android:id="@+id/color_selector_preference"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"/>
android:layout_marginBottom="2dp"
android:layout_marginHorizontal="25dp"
android:layout_marginTop="21dp"
android:orientation="vertical" />
</LinearLayout> </LinearLayout>