diff options
author | Maurice Lam <yukl@google.com> | 2014-08-06 20:13:36 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2014-08-06 20:23:47 -0700 |
commit | 5859dee3b09ba9a516d37736fd61613cb55184c2 (patch) | |
tree | 6dc009f7fcd7d4a7d365d48af21ec7d0004cb9cd | |
parent | 2626dc3ece4319c81987bc440564d71c0eca9ff0 (diff) | |
download | android_frameworks_opt_setupwizard-5859dee3b09ba9a516d37736fd61613cb55184c2.tar.gz android_frameworks_opt_setupwizard-5859dee3b09ba9a516d37736fd61613cb55184c2.tar.bz2 android_frameworks_opt_setupwizard-5859dee3b09ba9a516d37736fd61613cb55184c2.zip |
SetupWizardNavBar Style fixes
Nav bar buttons now use regular font, and the chevron is now created
from converted SVGs from https://icons.googleplex.com/.
Also used autoMirrored attribute for icons.
Bug: 16851823
Bug: 16850334
Change-Id: Ic4c034f966a21f536da5aad1cb355602edc27cc4
5 files changed, 45 insertions, 96 deletions
diff --git a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml deleted file mode 100644 index d21c8b3..0000000 --- a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_back.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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="24dp" android:height="24dp" - android:viewportWidth="24" android:viewportHeight="24" > - <path - android:fillColor="@android:color/transparent" - android:pathData="M9,6 L15,12 L9,18" - android:strokeColor="?attr/setup_wizard_navbar_text_color" - android:strokeWidth="2.5" - android:strokeLineCap="square" - /> -</vector> diff --git a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml deleted file mode 100644 index 373fadf..0000000 --- a/navigationbar/res/drawable-ldrtl/setup_wizard_navbar_ic_next.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - Copyright (C) 2014 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="24dp" android:height="24dp" - android:viewportWidth="24" android:viewportHeight="24" > - <path - android:fillColor="@android:color/transparent" - android:pathData="M15,6 L9,12 L15,18" - android:strokeColor="?attr/setup_wizard_navbar_text_color" - android:strokeWidth="3" - android:strokeLineCap="square" - /> -</vector> diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml index e3e0ef9..7f044fc 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_back.xml @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 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 + 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 + 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. + 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="24dp" android:height="24dp" - android:viewportWidth="24" android:viewportHeight="24" > + android:autoMirrored="true" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path - android:fillColor="@android:color/transparent" - android:pathData="M15,6 L9,12 L15,18" - android:strokeColor="?attr/setup_wizard_navbar_text_color" - android:strokeWidth="2.5" - android:strokeLineCap="square" - /> + android:fillColor="?attr/setup_wizard_navbar_text_color" + android:pathData="M15.4,7.4l-1.4,-1.4 -6,6 6,6 1.4,-1.4 -4.6,-4.6z" /> + </vector> diff --git a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml index 0350279..056b0bf 100644 --- a/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml +++ b/navigationbar/res/drawable/setup_wizard_navbar_ic_next.xml @@ -1,27 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <!-- - Copyright (C) 2014 The Android Open Source Project + Copyright (C) 2014 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 + 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 + 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. + 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="24dp" android:height="24dp" - android:viewportWidth="24" android:viewportHeight="24" > + android:autoMirrored="true" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24" + android:viewportHeight="24"> + <path - android:fillColor="@android:color/transparent" - android:pathData="M9,6 L15,12 L9,18" - android:strokeColor="?attr/setup_wizard_navbar_text_color" - android:strokeWidth="3" - android:strokeLineCap="square" - /> + android:fillColor="?attr/setup_wizard_navbar_text_color" + android:pathData="M10,6 l-1.4,1.4 4.6,4.6 -4.6,4.6 1.4,1.4 6,-6z" /> + </vector> diff --git a/navigationbar/res/values/styles.xml b/navigationbar/res/values/styles.xml index 394e117..56f43a2 100644 --- a/navigationbar/res/values/styles.xml +++ b/navigationbar/res/values/styles.xml @@ -26,17 +26,18 @@ </style> <style name="setup_wizard_navbar_button_style" parent="@android:style/Widget.Material.Button.Borderless"> - <item name="android:layout_height">match_parent</item> <item name="android:layout_width">wrap_content</item> + <item name="android:layout_height">match_parent</item> <item name="android:layout_weight">0</item> - <item name="android:textAllCaps">true</item> - <item name="android:textSize">16sp</item> - <item name="android:minWidth">0dp</item> <item name="android:background">@drawable/setup_wizard_navbar_btn_bg</item> <item name="android:drawablePadding">6dp</item> - <item name="android:textColor">?attr/setup_wizard_navbar_text_color</item> - <item name="android:paddingStart">10dp</item> + <item name="android:fontFamily">sans-serif</item> + <item name="android:minWidth">0dp</item> <item name="android:paddingEnd">10dp</item> + <item name="android:paddingStart">10dp</item> + <item name="android:textAllCaps">true</item> + <item name="android:textColor">?attr/setup_wizard_navbar_text_color</item> + <item name="android:textSize">16sp</item> </style> </resources> |