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

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

Merge "Apply LightActionBar theme to Settings app."

parents b2531ebd e96b5b9f

res/drawable/ic_search_24dp.xml

0 → 100644
+27 −0
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  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="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:pathData="M15.5,14l-0.8,0l-0.3,-0.3c1,-1.1 1.6,-2.6 1.6,-4.2C16,5.9 13.1,3 9.5,3C5.9,3 3,5.9 3,9.5S5.9,16 9.5,16c1.6,0 3.1,-0.6 4.2,-1.6l0.3,0.3l0,0.8l5,5l1.5,-1.5L15.5,14zM9.5,14C7,14 5,12 5,9.5S7,5 9.5,5C12,5 14,7 14,9.5S12,14 9.5,14z"

        android:fillColor="#ffffff"/>

</vector>

res/layout/apps_filter_spinner.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,6 @@ 
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="?android:attr/actionBarSize"

    android:layout_height="?android:attr/actionBarSize"

    android:background="@drawable/switchbar_background"

    android:gravity="center_vertical"

    android:gravity="center_vertical"

    android:paddingEnd="@dimen/switchbar_subsettings_margin_end"

    android:paddingEnd="@dimen/switchbar_subsettings_margin_end"

    android:theme="?attr/switchBarTheme" >

    android:theme="?attr/switchBarTheme" >

res/values/styles.xml

+0 −1
Original line number Original line Diff line number Diff line
@@ -437,5 +437,4 @@ 
    </style>

    </style>





    <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>

    <style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>



</resources>
 
</resources>

res/values/themes.xml

+7 −8
Original line number Original line Diff line number Diff line
@@ -120,7 +120,7 @@ 
         layouts against a remote context using our local theme colors. Due to the implementation

         layouts against a remote context using our local theme colors. Due to the implementation

         details of Theme, we can't reference any local resources and MUST instead use the values

         details of Theme, we can't reference any local resources and MUST instead use the values

         directly. So use #ff263238 instead of @color/theme_primary and so on. -->

         directly. So use #ff263238 instead of @color/theme_primary and so on. -->

    <style name="Theme.SettingsBase" parent="@android:style/Theme.DeviceDefault.Settings" />

    <style name="Theme.SettingsBase" parent="@*android:style/Theme.DeviceDefault.Settings.LightActionBar" />





    <style name="Theme.Settings" parent="Theme.SettingsBase">

    <style name="Theme.Settings" parent="Theme.SettingsBase">

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>
@@ -175,7 +175,7 @@ 
        <item name="android:backgroundDimEnabled">false</item>

        <item name="android:backgroundDimEnabled">false</item>

    </style>

    </style>





    <style name="Theme.ActionBar" parent="@android:style/Widget.Material.ActionBar.Solid">

    <style name="Theme.ActionBar" parent="@android:style/Widget.DeviceDefault.Light.ActionBar">

        <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>

        <item name="android:contentInsetStart">@dimen/actionbar_contentInsetStart</item>

    </style>

    </style>
@@ -183,16 +183,16 @@ 
        <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>

        <item name="android:contentInsetStart">@dimen/actionbar_subsettings_contentInsetStart</item>

    </style>

    </style>





    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.Dark.ActionBar.Accent">

    <style name="ThemeOverlay.SwitchBar.Settings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent">

        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>

        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>

        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>

        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>

        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>

        <item name="switchBarBackgroundColor">?android:attr/colorBackground</item>

    </style>

    </style>





    <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar">

    <style name="ThemeOverlay.SwitchBar.SubSettings" parent="@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent">

        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>

        <item name="switchBarMarginStart">@dimen/switchbar_subsettings_margin_start</item>

        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>

        <item name="switchBarMarginEnd">@dimen/switchbar_subsettings_margin_end</item>

        <item name="switchBarBackgroundColor">?android:attr/colorSecondary</item>

        <item name="switchBarBackgroundColor">?android:attr/colorBackground</item>

    </style>

    </style>





    <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">

    <style name="Theme.DialogWhenLarge" parent="@*android:style/Theme.DeviceDefault.Settings.DialogWhenLarge">
@@ -217,8 +217,7 @@ 
    <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">

    <style name="Theme.SubSettingsDialogWhenLarge" parent="Theme.DialogWhenLarge">

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="preferenceTheme">@style/PreferenceTheme</item>

        <item name="android:actionBarWidgetTheme">@null</item>

        <item name="android:actionBarWidgetTheme">@null</item>

        <item name="android:actionBarTheme">@android:style/ThemeOverlay.Material.Dark.ActionBar</item>

        <item name="android:actionBarTheme">@*android:style/ThemeOverlay.DeviceDefault.ActionBar.Accent</item>



        <item name="preferenceBackgroundColor">@drawable/preference_background</item>

        <item name="preferenceBackgroundColor">@drawable/preference_background</item>

    </style>

    </style>

src/com/android/settings/search2/SearchFeatureProviderImpl.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -46,7 +46,7 @@ public class SearchFeatureProviderImpl implements SearchFeatureProvider { 
        }

        }

        String menuTitle = activity.getString(R.string.search_menu);

        String menuTitle = activity.getString(R.string.search_menu);

        MenuItem menuItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, menuTitle)

        MenuItem menuItem = menu.add(Menu.NONE, Menu.NONE, Menu.NONE, menuTitle)

                .setIcon(R.drawable.abc_ic_search_api_material)

                .setIcon(R.drawable.ic_search_24dp)

                .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {

                .setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {

                    @Override

                    @Override

                    public boolean onMenuItemClick(MenuItem item) {

                    public boolean onMenuItemClick(MenuItem item) {