Merge "Move SignalDrawable to SettingsLib so every can enjoy it" (6b83824a) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/values/dimens.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -83,4 +83,12 @@
		<dimen name="zen_mode_condition_detail_item_interline_spacing">4dp</dimen>
		<!-- Zen mode panel: bottom padding, a bit less than qs_panel_padding -->
		<dimen name="zen_mode_condition_detail_bottom_padding">4dp</dimen>

		<!-- SignalDrawable -->
		<dimen name="signal_icon_size">17dp</dimen>
		<!-- How far to inset the rounded edges -->
		<dimen name="stat_sys_mobile_signal_circle_inset">0.9dp</dimen>



		</resources>

+3 −3

Original line number	Diff line number	Diff line
		@@ -12,7 +12,7 @@
		* permissions and limitations under the License.
		*/

		package com.android.systemui.statusbar.phone;
		package com.android.settingslib.graph;

		import android.animation.ArgbEvaluator;
		import android.annotation.IntRange;
		@@ -36,7 +36,6 @@ import android.util.LayoutDirection;

		import com.android.settingslib.R;
		import com.android.settingslib.Utils;
		import com.android.systemui.qs.SlashDrawable;

		public class SignalDrawable extends Drawable {

		@@ -458,6 +457,7 @@ public class SignalDrawable extends Drawable {
		}

		private final class SlashArtist {
		private static final float CORNER_RADIUS = 1f;
		// These values are derived in un-rotated (vertical) orientation
		private static final float SLASH_WIDTH = 1.8384776f;
		private static final float SLASH_HEIGHT = 22f;
		@@ -478,7 +478,7 @@ public class SignalDrawable extends Drawable {

		void draw(int height, int width, @NonNull Canvas canvas, Paint paint) {
		Matrix m = new Matrix();
		final float radius = scale(SlashDrawable.CORNER_RADIUS, width);
		final float radius = scale(CORNER_RADIUS, width);
		updateRect(
		scale(LEFT, width),
		scale(TOP, height),

+0 −7

Original line number	Diff line number	Diff line
		@@ -855,8 +855,6 @@
		<dimen name="default_gear_space">18dp</dimen>
		<dimen name="cell_overlay_padding">18dp</dimen>

		<dimen name="signal_icon_size">17dp</dimen>

		<dimen name="hwui_edge_margin">16dp</dimen>

		<dimen name="global_actions_panel_width">120dp</dimen>
		@@ -885,11 +883,6 @@
		<dimen name="nav_quick_scrub_track_edge_padding">42dp</dimen>
		<dimen name="nav_quick_scrub_track_thickness">2dp</dimen>

		<!-- Intended corner radius when drawing the mobile signal -->
		<dimen name="stat_sys_mobile_signal_corner_radius">0.75dp</dimen>
		<!-- How far to inset the rounded edges -->
		<dimen name="stat_sys_mobile_signal_circle_inset">0.9dp</dimen>

		<!-- Home button padding for sizing -->
		<dimen name="home_padding">15dp</dimen>

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,12 +19,12 @@ import android.graphics.drawable.Drawable;
		import android.service.quicksettings.Tile;
		import android.widget.ImageView;

		import com.android.settingslib.graph.SignalDrawable;
		import com.android.settingslib.Utils;
		import com.android.systemui.R;
		import com.android.systemui.plugins.qs.QSTile.Icon;
		import com.android.systemui.plugins.qs.QSTile.State;
		import com.android.systemui.qs.tileimpl.QSTileImpl;
		import com.android.systemui.statusbar.phone.SignalDrawable;

		import java.util.Objects;

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,9 +38,9 @@ import android.view.accessibility.AccessibilityEvent;
		import android.widget.ImageView;
		import android.widget.LinearLayout;

		import com.android.settingslib.graph.SignalDrawable;
		import com.android.systemui.Dependency;
		import com.android.systemui.R;
		import com.android.systemui.statusbar.phone.SignalDrawable;
		import com.android.systemui.statusbar.phone.StatusBarIconController;
		import com.android.systemui.statusbar.policy.DarkIconDispatcher;
		import com.android.systemui.statusbar.policy.DarkIconDispatcher.DarkReceiver;