diff --git a/res/anim/fab_elevation.xml b/res/anim/fab_elevation.xml new file mode 100644 index 00000000000..af75db0cf14 --- /dev/null +++ b/res/anim/fab_elevation.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/menu/zen_mode_automation.xml b/res/drawable/fab_background.xml similarity index 68% rename from res/menu/zen_mode_automation.xml rename to res/drawable/fab_background.xml index 02ec41fb359..a692a2a2b03 100644 --- a/res/menu/zen_mode_automation.xml +++ b/res/drawable/fab_background.xml @@ -13,12 +13,11 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - + + + + + + + \ No newline at end of file diff --git a/res/layout/preference_list_fragment.xml b/res/layout/preference_list_fragment.xml index 195f6eb8744..1412381a6c6 100644 --- a/res/layout/preference_list_fragment.xml +++ b/res/layout/preference_list_fragment.xml @@ -49,6 +49,18 @@ + + 24dp 72dp + 24dp diff --git a/res/values/colors.xml b/res/values/colors.xml index 0d0637c2e20..6f0352ce2cb 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -81,4 +81,6 @@ #ff5621 #263238 + #1fffffff + #ff009688 diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 07e6957ce6e..8a58c5c06c4 100755 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -239,4 +239,8 @@ 4dip 48dp + 56dp + 16dp + 12dp + 9dp diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index 9e645ab08ce..17ff4b28c6d 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -42,6 +42,8 @@ import android.widget.Button; import android.widget.ListAdapter; import android.widget.ListView; +import com.android.settings.widget.FloatingActionButton; + /** * Base class for Settings fragments, with some helper functions and dialog management. */ @@ -80,6 +82,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF }; private ViewGroup mPinnedHeaderFrameLayout; + private FloatingActionButton mFloatingActionButton; @Override public void onCreate(Bundle icicle) { @@ -101,9 +104,14 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF Bundle savedInstanceState) { final View root = super.onCreateView(inflater, container, savedInstanceState); mPinnedHeaderFrameLayout = (ViewGroup) root.findViewById(R.id.pinned_header); + mFloatingActionButton = (FloatingActionButton) root.findViewById(R.id.fab); return root; } + public FloatingActionButton getFloatingActionButton() { + return mFloatingActionButton; + } + public void setPinnedHeaderView(View pinnedHeader) { mPinnedHeaderFrameLayout.addView(pinnedHeader); mPinnedHeaderFrameLayout.setVisibility(View.VISIBLE); diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index f2ee71df6ff..6636b33fb05 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -33,14 +33,14 @@ import android.service.notification.ZenModeConfig.ScheduleInfo; import android.service.notification.ZenModeConfig.ZenRule; import android.text.format.DateFormat; import android.util.Log; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; +import android.view.View; +import android.view.View.OnClickListener; import com.android.internal.logging.MetricsLogger; import com.android.settings.R; import com.android.settings.notification.ManagedServiceSettings.Config; import com.android.settings.notification.ZenRuleNameDialog.RuleInfo; +import com.android.settings.widget.FloatingActionButton; import java.text.SimpleDateFormat; import java.util.Calendar; @@ -59,7 +59,6 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { @Override public void onCreate(Bundle icicle) { super.onCreate(icicle); - setHasOptionsMenu(true); addPreferencesFromResource(R.xml.zen_mode_automation_settings); mServiceListing = new ServiceListing(mContext, CONFIG); mServiceListing.addCallback(mServiceListingCallback); @@ -67,6 +66,21 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { mServiceListing.setListening(true); } + @Override + public void onActivityCreated(Bundle savedInstanceState) { + super.onActivityCreated(savedInstanceState); + final FloatingActionButton fab = getFloatingActionButton(); + fab.setVisibility(View.VISIBLE); + fab.setImageResource(R.drawable.ic_menu_add_white); + fab.setContentDescription(getString(R.string.zen_mode_time_add_rule)); + fab.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + showAddRuleDialog(); + } + }); + } + @Override public void onDestroy() { super.onDestroy(); @@ -74,20 +88,6 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { mServiceListing.removeCallback(mServiceListingCallback); } - @Override - public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { - inflater.inflate(R.menu.zen_mode_automation, menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (item.getItemId() == R.id.add) { - showAddRuleDialog(); - return true; - } - return super.onOptionsItemSelected(item); - } - @Override protected void onZenModeChanged() { // don't care diff --git a/src/com/android/settings/widget/FloatingActionButton.java b/src/com/android/settings/widget/FloatingActionButton.java new file mode 100644 index 00000000000..181c6c077cf --- /dev/null +++ b/src/com/android/settings/widget/FloatingActionButton.java @@ -0,0 +1,49 @@ +/* + * 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. + */ + +package com.android.settings.widget; + +import android.animation.AnimatorInflater; +import android.content.Context; +import android.graphics.Outline; +import android.util.AttributeSet; +import android.view.View; +import android.view.ViewOutlineProvider; +import android.widget.ImageView; + +import com.android.settings.R; + +public class FloatingActionButton extends ImageView { + + public FloatingActionButton(Context context, AttributeSet attrs) { + super(context, attrs); + setScaleType(ScaleType.CENTER); + setStateListAnimator(AnimatorInflater.loadStateListAnimator(context, R.anim.fab_elevation)); + setOutlineProvider(new ViewOutlineProvider() { + @Override + public void getOutline(View view, Outline outline) { + outline.setOval(0, 0, getWidth(), getHeight()); + } + }); + setClipToOutline(true); + } + + @Override + protected void onSizeChanged(int w, int h, int oldw, int oldh) { + super.onSizeChanged(w, h, oldw, oldh); + invalidateOutline(); + } +}