diff options
20 files changed, 256 insertions, 10 deletions
diff --git a/core/res/res/drawable/floating_popup_background_dark.xml b/core/res/res/drawable/floating_popup_background_dark.xml new file mode 100644 index 000000000000..ded1137576de --- /dev/null +++ b/core/res/res/drawable/floating_popup_background_dark.xml @@ -0,0 +1,23 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +/* Copyright 2015, 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. +*/ +--> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> + <solid android:color="@color/background_floating_material_dark" /> + <corners android:radius="2dp" /> +</shape> + diff --git a/core/res/res/drawable/floating_popup_background.xml b/core/res/res/drawable/floating_popup_background_light.xml index b6700b3ab8b3..9c7a8860dde7 100644 --- a/core/res/res/drawable/floating_popup_background.xml +++ b/core/res/res/drawable/floating_popup_background_light.xml @@ -17,7 +17,7 @@ --> <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle"> - <solid android:color="?attr/colorBackgroundFloating" /> + <solid android:color="@color/background_floating_material_light" /> <corners android:radius="2dp" /> </shape> diff --git a/core/res/res/drawable/ic_ab_back_material_dark.xml b/core/res/res/drawable/ic_ab_back_material_dark.xml new file mode 100644 index 000000000000..7cdd1393a4a3 --- /dev/null +++ b/core/res/res/drawable/ic_ab_back_material_dark.xml @@ -0,0 +1,27 @@ +<?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.0" + android:viewportHeight="24.0" + android:autoMirrored="true" + android:tint="@color/secondary_text_material_dark"> + <path + android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z" + android:fillColor="@color/white"/> +</vector> diff --git a/core/res/res/drawable/ic_ab_back_material_light.xml b/core/res/res/drawable/ic_ab_back_material_light.xml new file mode 100644 index 000000000000..65dab8112ef2 --- /dev/null +++ b/core/res/res/drawable/ic_ab_back_material_light.xml @@ -0,0 +1,27 @@ +<?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.0" + android:viewportHeight="24.0" + android:autoMirrored="true" + android:tint="@color/secondary_text_material_light"> + <path + android:pathData="M20,11L7.8,11l5.6,-5.6L12,4l-8,8l8,8l1.4,-1.4L7.8,13L20,13L20,11z" + android:fillColor="@color/white"/> +</vector> diff --git a/core/res/res/drawable/ic_menu_moreoverflow_material.xml b/core/res/res/drawable/ic_menu_moreoverflow_material.xml index 502ad6910a32..3f534517e64b 100644 --- a/core/res/res/drawable/ic_menu_moreoverflow_material.xml +++ b/core/res/res/drawable/ic_menu_moreoverflow_material.xml @@ -1,3 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2014 The Android Open Source Project diff --git a/core/res/res/drawable/ic_menu_moreoverflow_material_dark.xml b/core/res/res/drawable/ic_menu_moreoverflow_material_dark.xml new file mode 100644 index 000000000000..fa350a66bedf --- /dev/null +++ b/core/res/res/drawable/ic_menu_moreoverflow_material_dark.xml @@ -0,0 +1,26 @@ +<?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.0" + android:viewportHeight="24.0" + android:tint="@color/secondary_text_material_dark"> + <path + android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z" + android:fillColor="@color/white"/> +</vector> diff --git a/core/res/res/drawable/ic_menu_moreoverflow_material_light.xml b/core/res/res/drawable/ic_menu_moreoverflow_material_light.xml new file mode 100644 index 000000000000..7af234fda2e4 --- /dev/null +++ b/core/res/res/drawable/ic_menu_moreoverflow_material_light.xml @@ -0,0 +1,26 @@ +<?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.0" + android:viewportHeight="24.0" + android:tint="@color/secondary_text_material_light"> + <path + android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z" + android:fillColor="@color/white"/> +</vector> diff --git a/core/res/res/drawable/item_background_borderless_material_dark.xml b/core/res/res/drawable/item_background_borderless_material_dark.xml new file mode 100644 index 000000000000..685c52a848c7 --- /dev/null +++ b/core/res/res/drawable/item_background_borderless_material_dark.xml @@ -0,0 +1,18 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_material_dark" /> diff --git a/core/res/res/drawable/item_background_borderless_material_light.xml b/core/res/res/drawable/item_background_borderless_material_light.xml new file mode 100644 index 000000000000..3ef6674c9326 --- /dev/null +++ b/core/res/res/drawable/item_background_borderless_material_light.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2015 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 + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_material_light" /> diff --git a/core/res/res/drawable/item_background_material_dark.xml b/core/res/res/drawable/item_background_material_dark.xml new file mode 100644 index 000000000000..06eb531c5330 --- /dev/null +++ b/core/res/res/drawable/item_background_material_dark.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_material_dark"> + <item android:id="@id/mask"> + <color android:color="@color/white" /> + </item> +</ripple> diff --git a/core/res/res/drawable/item_background_material_light.xml b/core/res/res/drawable/item_background_material_light.xml new file mode 100644 index 000000000000..2f3d1577bb88 --- /dev/null +++ b/core/res/res/drawable/item_background_material_light.xml @@ -0,0 +1,22 @@ +<?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. +--> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_material_light"> + <item android:id="@id/mask"> + <color android:color="@color/white" /> + </item> +</ripple> diff --git a/core/res/res/layout/floating_popup_close_overflow_button.xml b/core/res/res/layout/floating_popup_close_overflow_button.xml index 0dbf7f7ad866..4dae1aeb7ffe 100644 --- a/core/res/res/layout/floating_popup_close_overflow_button.xml +++ b/core/res/res/layout/floating_popup_close_overflow_button.xml @@ -20,6 +20,6 @@ android:layout_height="match_parent" android:minWidth="@dimen/floating_toolbar_menu_button_minimum_width" android:minHeight="@dimen/floating_toolbar_height" - android:src="?android:attr/actionModeCloseDrawable" + android:src="?attr/floatingToolbarCloseDrawable" android:contentDescription="@string/floating_toolbar_close_overflow_description" - android:background="?attr/selectableItemBackgroundBorderless" /> + android:background="?attr/floatingToolbarItemBackgroundBorderlessDrawable" /> diff --git a/core/res/res/layout/floating_popup_container.xml b/core/res/res/layout/floating_popup_container.xml index f37aee15ce0d..63dae4470cbe 100644 --- a/core/res/res/layout/floating_popup_container.xml +++ b/core/res/res/layout/floating_popup_container.xml @@ -24,4 +24,4 @@ android:elevation="2dp" android:focusable="true" android:focusableInTouchMode="true" - android:background="@drawable/floating_popup_background"/> + android:background="?attr/floatingToolbarPopupBackgroundDrawable"/> diff --git a/core/res/res/layout/floating_popup_menu_button.xml b/core/res/res/layout/floating_popup_menu_button.xml index b54919876997..1b58ce530c1f 100644 --- a/core/res/res/layout/floating_popup_menu_button.xml +++ b/core/res/res/layout/floating_popup_menu_button.xml @@ -30,5 +30,5 @@ android:fontFamily="sans-serif-medium" android:textSize="@dimen/floating_toolbar_text_size" android:textAllCaps="true" - android:textColor="?attr/colorForeground" - android:background="?attr/selectableItemBackground" /> + android:textColor="?attr/floatingToolbarForegroundColor" + android:background="?attr/floatingToolbarItemBackgroundDrawable" /> diff --git a/core/res/res/layout/floating_popup_menu_image_button.xml b/core/res/res/layout/floating_popup_menu_image_button.xml index 07eb7a3757b7..1ba784866f3a 100644 --- a/core/res/res/layout/floating_popup_menu_image_button.xml +++ b/core/res/res/layout/floating_popup_menu_image_button.xml @@ -32,5 +32,5 @@ android:paddingEnd="@dimen/floating_toolbar_menu_button_side_padding" android:paddingBottom="@dimen/floating_toolbar_menu_image_button_vertical_padding" android:scaleType="centerInside" - android:background="?attr/selectableItemBackground" /> + android:background="?attr/floatingToolbarItemBackgroundDrawable" /> </LinearLayout> diff --git a/core/res/res/layout/floating_popup_open_overflow_button.xml b/core/res/res/layout/floating_popup_open_overflow_button.xml index 30275652fe89..f6a3e8d3fbc1 100644 --- a/core/res/res/layout/floating_popup_open_overflow_button.xml +++ b/core/res/res/layout/floating_popup_open_overflow_button.xml @@ -24,6 +24,6 @@ android:paddingTop="0dp" android:paddingBottom="0dp" android:paddingEnd="4dp" - android:src="@drawable/ic_menu_moreoverflow_material" + android:src="?attr/floatingToolbarOpenDrawable" android:contentDescription="@string/floating_toolbar_open_overflow_description" - android:background="?attr/selectableItemBackgroundBorderless" /> + android:background="?attr/floatingToolbarItemBackgroundBorderlessDrawable" /> diff --git a/core/res/res/layout/floating_popup_overflow_list_item.xml b/core/res/res/layout/floating_popup_overflow_list_item.xml index 2ff45bb36a74..22f4e68b1e25 100644 --- a/core/res/res/layout/floating_popup_overflow_list_item.xml +++ b/core/res/res/layout/floating_popup_overflow_list_item.xml @@ -31,6 +31,6 @@ android:ellipsize="end" android:fontFamily="sans-serif-medium" android:textSize="@dimen/floating_toolbar_text_size" - android:textColor="?attr/colorForeground" + android:textColor="?attr/floatingToolbarForegroundColor" android:textAllCaps="true" /> diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml index d5c2d197bf43..a3cc4aed214d 100644 --- a/core/res/res/values/arrays.xml +++ b/core/res/res/values/arrays.xml @@ -310,7 +310,11 @@ <item>@drawable/fastscroll_label_right_material</item> <item>@drawable/fastscroll_thumb_material</item> <item>@drawable/fastscroll_track_material</item> + <item>@drawable/floating_popup_background_dark</item> + <item>@drawable/floating_popup_background_light</item> <item>@drawable/ic_ab_back_material</item> + <item>@drawable/ic_ab_back_material_dark</item> + <item>@drawable/ic_ab_back_material_light</item> <item>@drawable/ic_clear_material</item> <item>@drawable/ic_commit_search_api_material</item> <item>@drawable/ic_dialog_alert_material</item> @@ -330,7 +334,11 @@ <item>@drawable/ic_search_api_material</item> <item>@drawable/ic_voice_search_api_material</item> <item>@drawable/item_background_borderless_material</item> + <item>@drawable/item_background_borderless_material_dark</item> + <item>@drawable/item_background_borderless_material_light</item> <item>@drawable/item_background_material</item> + <item>@drawable/item_background_material_dark</item> + <item>@drawable/item_background_material_light</item> <item>@drawable/list_divider_material</item> <item>@drawable/list_section_divider_material</item> <item>@drawable/notification_material_action_background</item> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 52e2cf0c5999..c08d511a15a1 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -550,6 +550,17 @@ <attr name="windowTransitionBackgroundFadeDuration" format="integer"/> <!-- ============ --> + <!-- Floating toolbar styles --> + <!-- ============ --> + <eat-comment /> + <attr name="floatingToolbarCloseDrawable" format="reference" /> + <attr name="floatingToolbarForegroundColor" format="reference|color" /> + <attr name="floatingToolbarItemBackgroundBorderlessDrawable" format="reference" /> + <attr name="floatingToolbarItemBackgroundDrawable" format="reference" /> + <attr name="floatingToolbarOpenDrawable" format="reference" /> + <attr name="floatingToolbarPopupBackgroundDrawable" format="reference" /> + + <!-- ============ --> <!-- Alert Dialog styles --> <!-- ============ --> <eat-comment /> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index ecf00f01b5ed..b7acdd44b82f 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -389,6 +389,14 @@ please see themes_device_defaults.xml. <item name="segmentedButtonStyle">@style/SegmentedButton</item> <item name="fingerprintAuthDrawable">@drawable/ic_fingerprint</item> + <!-- Floating toolbar styles --> + <item name="floatingToolbarCloseDrawable">@drawable/ic_ab_back_material_dark</item> + <item name="floatingToolbarForegroundColor">@color/foreground_material_dark</item> + <item name="floatingToolbarItemBackgroundBorderlessDrawable">@drawable/item_background_borderless_material_dark</item> + <item name="floatingToolbarItemBackgroundDrawable">@drawable/item_background_material_dark</item> + <item name="floatingToolbarOpenDrawable">@drawable/ic_menu_moreoverflow_material_dark</item> + <item name="floatingToolbarPopupBackgroundDrawable">@drawable/floating_popup_background_dark</item> + <!-- SearchView attributes --> <item name="searchViewStyle">@style/Widget.Holo.SearchView</item> <item name="searchDialogTheme">@style/Theme.SearchBar</item> @@ -538,6 +546,14 @@ please see themes_device_defaults.xml. <item name="mediaRouteButtonStyle">@style/Widget.DeviceDefault.Light.MediaRouteButton</item> <item name="findOnPageNextDrawable">@drawable/ic_find_next_holo_light</item> <item name="findOnPagePreviousDrawable">@drawable/ic_find_previous_holo_light</item> + + <!-- Floating toolbar styles --> + <item name="floatingToolbarCloseDrawable">@drawable/ic_ab_back_material_light</item> + <item name="floatingToolbarForegroundColor">@color/foreground_material_light</item> + <item name="floatingToolbarItemBackgroundBorderlessDrawable">@drawable/item_background_borderless_material_light</item> + <item name="floatingToolbarItemBackgroundDrawable">@drawable/item_background_material_light</item> + <item name="floatingToolbarOpenDrawable">@drawable/ic_menu_moreoverflow_material_light</item> + <item name="floatingToolbarPopupBackgroundDrawable">@drawable/floating_popup_background_light</item> </style> <!-- Variant of {@link #Theme_Light} with no title bar --> |