Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d3337a3 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move the app permission widget icon to the bottom."

parents c6dace30 43f4ce5a

res/layout/app_permission.xml

+36 −38
Original line number Diff line number Diff line
@@ -58,18 +58,40 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content" >



                    <RadioButton

                        android:id="@+id/allow_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_allow_always"

                        style="@style/PermissionGrantRadioButton" />



                    <RadioButton

                        android:id="@+id/foreground_only_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_allow_foreground"

                        style="@style/PermissionGrantRadioButton" />



                    <RadioButton

                        android:id="@+id/deny_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_deny"

                        style="@style/PermissionGrantRadioButton" />



                </RadioGroup>



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="horizontal">



                        <RadioButton

                            android:id="@+id/allow_radio_button"

                    <TextView

                        android:id="@+id/permission_details"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                            android:layout_weight="1"

                            android:text="@string/app_permission_button_allow_always"

                            style="@style/PermissionGrantRadioButton" />

                        android:layout_marginStart="@dimen/app_permission_detail_margin_start"

                        android:layout_marginTop="@dimen/app_permission_detail_margin_top" />



                    <LinearLayout

                        android:id="@+id/two_target_divider"
@@ -90,34 +112,10 @@ 
                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:gravity="center"

                            android:minWidth="64dp"

                            android:orientation="vertical" />

                        android:minWidth="64dp" />



                </LinearLayout>



                    <RadioButton

                        android:id="@+id/foreground_only_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_allow_foreground"

                        style="@style/PermissionGrantRadioButton" />



                    <RadioButton

                        android:id="@+id/deny_radio_button"

                        android:layout_width="match_parent"

                        android:layout_height="wrap_content"

                        android:text="@string/app_permission_button_deny"

                        style="@style/PermissionGrantRadioButton" />



                </RadioGroup>



                <TextView

                    android:id="@+id/permission_details"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginStart="@dimen/app_permission_detail_margin_start"

                    android:layout_marginTop="@dimen/app_permission_detail_margin_top" />



            </LinearLayout>



            <View