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

Merge "App crash dialog polish"

Browse Source
This commit is contained in:
Adrian Roos
2016-02-04 22:39:20 +00:00
committed by Android (Google) Code Review
parent 2343f8dfcd 70b89ce0bd
commit 5df0661daf
8 changed files with 130 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/res/res/drawable/ic_close.xml Normal file
View File

@@ -0,0 +1,24 @@
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M19.000000,6.400000l-1.400000,-1.400000 -5.600000,5.600000 -5.600000,-5.600000 -1.400000,1.400000 5.600000,5.600000 -5.600000,5.600000 1.400000,1.400000 5.600000,-5.600000 5.600000,5.600000 1.400000,-1.400000 -5.600000,-5.600000z"
android:fillColor="#FF000000"/>
</vector>

27
core/res/res/drawable/ic_feedback.xml Normal file
View File

@@ -0,0 +1,27 @@
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:pathData="M0 0h24v24H0z"
android:fillColor="#00000000"/>
<path
android:fillColor="#FF000000"
android:pathData="M20.0,2.0L4.0,2.0c-1.1,0.0 -1.9,0.9 -1.99,2.0L2.0,22.0l4.0,-4.0l14.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L22.0,4.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-7.0,12.0l-2.0,0.0l0.0,-2.0l2.0,0.0l0.0,2.0zm0.0,-4.0l-2.0,0.0L11.0,6.0l2.0,0.0l0.0,4.0z"/>
</vector>

27
core/res/res/drawable/ic_refresh.xml Normal file
View File

@@ -0,0 +1,27 @@
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M17.65,6.35C16.2,4.9 14.21,4.0 12.0,4.0c-4.42,0.0 -7.99,3.58 -7.99,8.0s3.57,8.0 7.99,8.0c3.73,0.0 6.84,-2.55 7.73,-6.0l-2.08,0.0c-0.82,2.33 -3.04,4.0 -5.65,4.0 -3.31,0.0 -6.0,-2.69 -6.0,-6.0s2.69,-6.0 6.0,-6.0c1.66,0.0 3.1,0.69 4.22,1.78L13.0,11.0l7.0,0.0L20.0,4.0l-2.35,2.35z"/>
<path
android:pathData="M0 0h24v24H0z"
android:fillColor="#00000000"/>
</vector>

30
core/res/res/drawable/ic_schedule.xml Normal file
View File

@@ -0,0 +1,30 @@
<!--
Copyright (C) 2016 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24.0dp"
android:height="24.0dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M11.99,2.0C6.47,2.0 2.0,6.48 2.0,12.0s4.47,10.0 9.99,10.0C17.52,22.0 22.0,17.52 22.0,12.0S17.52,2.0 11.99,2.0zM12.0,20.0c-4.42,0.0 -8.0,-3.58 -8.0,-8.0s3.58,-8.0 8.0,-8.0 8.0,3.58 8.0,8.0 -3.58,8.0 -8.0,8.0z"/>
<path
android:pathData="M0 0h24v24H0z"
android:fillColor="#00000000"/>
<path
android:fillColor="#FF000000"
android:pathData="M12.5,7.0L11.0,7.0l0.0,6.0l5.25,3.1 0.75,-1.23 -4.5,-2.67z"/>
</vector>

11
core/res/res/layout/app_anr_dialog.xml
View File

@@ -18,28 +18,31 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="@dimen/dialog_list_padding_vertical_material"
android:paddingTop="@dimen/aerr_padding_list_top"
android:paddingBottom="@dimen/dialog_list_padding_vertical_material">
<TextView
<Button
android:id="@+id/aerr_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_close_app"
android:drawableStart="@drawable/ic_close"
style="@style/aerr_list_item" />
<TextView
<Button
android:id="@+id/aerr_wait"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_wait"
android:drawableStart="@drawable/ic_schedule"
style="@style/aerr_list_item" />
<TextView
<Button
android:id="@+id/aerr_report"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_report"
android:drawableStart="@drawable/ic_feedback"
style="@style/aerr_list_item" />
</LinearLayout>

10
core/res/res/layout/app_error_dialog.xml
View File

@@ -21,9 +21,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="@dimen/dialog_list_padding_vertical_material"
android:paddingBottom="@dimen/dialog_list_padding_vertical_material"
>
android:paddingTop="@dimen/aerr_padding_list_top"
android:paddingBottom="@dimen/dialog_list_padding_vertical_material">
<Button
@@ -31,6 +30,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_restart"
android:drawableStart="@drawable/ic_refresh"
style="@style/aerr_list_item"
/>
@@ -39,6 +39,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_reset"
android:drawableStart="@drawable/ic_refresh"
style="@style/aerr_list_item"
/>
@@ -47,6 +48,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_report"
android:drawableStart="@drawable/ic_feedback"
style="@style/aerr_list_item"
/>
@@ -55,6 +57,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_close"
android:drawableStart="@drawable/ic_close"
style="@style/aerr_list_item"
/>
@@ -63,6 +66,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/aerr_mute"
android:drawableStart="@drawable/ic_close"
style="@style/aerr_list_item"
/>

2
core/res/res/values/dimens.xml
View File

@@ -449,5 +449,7 @@
<item type="dimen" format="integer" name="time_picker_column_start_material">0</item>
<item type="dimen" format="integer" name="time_picker_column_end_material">1</item>
<item type="dimen" name="aerr_padding_list_top">15dp</item>
<item type="fraction" name="docked_stack_divider_fixed_ratio">34.15%</item>
</resources>

8
core/res/res/values/styles.xml
View File

@@ -1403,8 +1403,12 @@ please see styles_device_defaults.xml.
<item name="textAppearance">?attr/textAppearanceListItemSmall</item>
<item name="textColor">?attr/textColorAlertDialogListItem</item>
<item name="gravity">center_vertical</item>
<item name="paddingStart">?attr/listPreferredItemPaddingStart</item>
<item name="paddingEnd">?attr/listPreferredItemPaddingEnd</item>
<item name="paddingStart">?attr/dialogPreferredPadding</item>
<item name="paddingEnd">?attr/dialogPreferredPadding</item>
<item name="background">?attr/selectableItemBackground</item>
<item name="drawablePadding">32dp</item>
<item name="drawableTint">@color/accent_material_light</item>
<item name="drawableTintMode">src_atop</item>
</style>
<!-- Wifi dialog styles -->