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

Commit 09e18f9b authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Add colorProgressBackgroundNormal" into pi-dev 

am: 62ff4029

Change-Id: If2325c1acff1ebaf1ec88a7e4278ecfc73a8aa7a
parents 32b5f83b 62ff4029

core/res/res/color/control_nodisable_material.xml→core/res/res/color/config_progress_background_tint.xml

+1 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2015 The Android Open Source Project

<!-- Copyright (C) 2018 The Android Open Source Project





     Licensed under the Apache License, Version 2.0 (the "License");

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     you may not use this file except in compliance with the License.

core/res/res/drawable/progress_horizontal_material.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <item android:id="@id/background"

    <item android:id="@id/background"

          android:gravity="center_vertical|fill_horizontal">

          android:gravity="center_vertical|fill_horizontal">

        <shape android:shape="rectangle"

        <shape android:shape="rectangle"

               android:tint="?attr/colorControlNormal">

               android:tint="?attr/colorProgressBackgroundNormal">

            <corners android:radius="?attr/progressBarCornerRadius" />

            <corners android:radius="?attr/progressBarCornerRadius" />

            <size android:height="@dimen/progress_bar_height_material" />

            <size android:height="@dimen/progress_bar_height_material" />

            <solid android:color="@color/white_disabled_material" />

            <solid android:color="@color/white_disabled_material" />

core/res/res/drawable/seekbar_track_material.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
    <item android:id="@id/background"

    <item android:id="@id/background"

          android:gravity="center_vertical|fill_horizontal">

          android:gravity="center_vertical|fill_horizontal">

        <shape android:shape="rectangle"

        <shape android:shape="rectangle"

               android:tint="@color/control_nodisable_material">

               android:tint="?attr/colorProgressBackgroundNormal">

            <corners android:radius="?attr/progressBarCornerRadius" />

            <corners android:radius="?attr/progressBarCornerRadius" />

            <size android:height="@dimen/seekbar_track_background_height_material" />

            <size android:height="@dimen/seekbar_track_background_height_material" />

            <solid android:color="@color/white_disabled_material" />

            <solid android:color="@color/white_disabled_material" />

core/res/res/values/attrs.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -1114,6 +1114,9 @@ 
        <!-- The color applied to framework switch thumbs in their normal state. -->

        <!-- The color applied to framework switch thumbs in their normal state. -->

        <attr name="colorSwitchThumbNormal" format="color" />

        <attr name="colorSwitchThumbNormal" format="color" />





        <!-- The color applied to framework progress and seek bar backgrounds in their normal state. -->

        <attr name="colorProgressBackgroundNormal" format="color" />



        <!-- The color applied to the edge effect on scrolling containers. -->

        <!-- The color applied to the edge effect on scrolling containers. -->

        <attr name="colorEdgeEffect" format="color" />

        <attr name="colorEdgeEffect" format="color" />

core/res/res/values/symbols.xml

+1 −0
Original line number Original line Diff line number Diff line
@@ -2457,6 +2457,7 @@ 
  <java-symbol type="bool" name="config_defaultWindowFeatureOptionsPanel" />

  <java-symbol type="bool" name="config_defaultWindowFeatureOptionsPanel" />

  <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" />

  <java-symbol type="bool" name="config_defaultWindowFeatureContextMenu" />

  <java-symbol type="bool" name="config_overrideRemoteViewsActivityTransition" />

  <java-symbol type="bool" name="config_overrideRemoteViewsActivityTransition" />

  <java-symbol type="attr" name="colorProgressBackgroundNormal" />





  <java-symbol type="layout" name="simple_account_item" />

  <java-symbol type="layout" name="simple_account_item" />

  <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />

  <java-symbol type="string" name="prohibit_manual_network_selection_in_gobal_mode" />