Merge "Fixed a few bugs in NUI Main Activity." (ae6cfe3c) · Commits · e / os / android_packages_apps_Dialer

java/com/android/dialer/app/DialtactsActivity.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -1515,6 +1515,11 @@ public class DialtactsActivity extends TransactionSafeActivity
		return findViewById(R.id.contact_tile_drag_shadow_overlay);
		}

		@Override
		public void setHasFrequents(boolean hasFrequents) {
		// No-op
		}

		/**
		* Allows the SpeedDialFragment to attach the drag controller to mRemoveViewContainer once it has
		* been attached to the activity.

java/com/android/dialer/app/list/OldSpeedDialFragment.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -394,6 +394,8 @@ public class OldSpeedDialFragment extends Fragment
		public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
		adapter.setContactCursor(data);
		fragment.setEmptyViewVisibility(adapter.getCount() == 0);
		FragmentUtils.getParentUnsafe(fragment, HostInterface.class)
		.setHasFrequents(adapter.getNumFrequents() > 0);
		}

		@Override
		@@ -452,5 +454,7 @@ public class OldSpeedDialFragment extends Fragment
		void showAllContactsTab();

		ImageView getDragShadowOverlay();

		void setHasFrequents(boolean hasFrequents);
		}
		}

java/com/android/dialer/main/impl/MainSearchController.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,7 @@ import com.android.dialer.main.impl.toolbar.MainToolbar;
		import com.android.dialer.main.impl.toolbar.SearchBarListener;
		import com.android.dialer.searchfragment.list.NewSearchFragment;
		import com.android.dialer.searchfragment.list.NewSearchFragment.SearchFragmentListener;
		import com.android.dialer.smartdial.util.SmartDialNameMatcher;
		import com.google.common.base.Optional;
		import java.util.ArrayList;

		@@ -372,10 +373,12 @@ public class MainSearchController implements SearchBarListener {

		/** @see OnDialpadQueryChangedListener#onDialpadQueryChanged(java.lang.String) */
		public void onDialpadQueryChanged(String query) {
		query = SmartDialNameMatcher.normalizeNumber(/* context = */ mainActivity, query);
		NewSearchFragment fragment = getSearchFragment();
		if (fragment != null) {
		fragment.setQuery(query, CallInitiationType.Type.DIALPAD);
		}
		getDialpadFragment().process_quote_emergency_unquote(query);
		}

		@Override

java/com/android/dialer/main/impl/OldMainActivityPeer.java

+12 −2

Original line number	Diff line number	Diff line
		@@ -196,6 +196,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
		});

		MainToolbar toolbar = mainActivity.findViewById(R.id.toolbar);
		toolbar.maybeShowSimulator(mainActivity);
		mainActivity.setSupportActionBar(mainActivity.findViewById(R.id.toolbar));

		bottomNav = mainActivity.findViewById(R.id.bottom_nav_bar);
		@@ -231,7 +232,8 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
		bottomNav,
		mainActivity.findViewById(R.id.contact_tile_drag_shadow_overlay),
		mainActivity.findViewById(R.id.remove_view),
		mainActivity.findViewById(R.id.search_view_container));
		mainActivity.findViewById(R.id.search_view_container),
		toolbar);

		lastTabController = new LastTabController(mainActivity, bottomNav, showVoicemailTab);

		@@ -901,6 +903,7 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
		private final ImageView dragShadowOverlay;
		private final RemoveView removeView;
		private final View searchViewContainer;
		private final MainToolbar toolbar;

		// TODO(calderwoodra): Use this for drag and drop
		@SuppressWarnings("unused")
		@@ -910,11 +913,13 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
		BottomNavBar bottomNavBar,
		ImageView dragShadowOverlay,
		RemoveView removeView,
		View searchViewContainer) {
		View searchViewContainer,
		MainToolbar toolbar) {
		this.bottomNavBar = bottomNavBar;
		this.dragShadowOverlay = dragShadowOverlay;
		this.removeView = removeView;
		this.searchViewContainer = searchViewContainer;
		this.toolbar = toolbar;
		}

		@Override
		@@ -932,6 +937,11 @@ public class OldMainActivityPeer implements MainActivityPeer, FragmentUtilListen
		return dragShadowOverlay;
		}

		@Override
		public void setHasFrequents(boolean hasFrequents) {
		toolbar.showClearFrequents(hasFrequents);
		}

		@Override
		public void onDragStarted(int x, int y, PhoneFavoriteSquareTileView view) {
		showRemoveView(true);

java/com/android/dialer/main/impl/toolbar/MainToolbar.java

+11 −2

Original line number	Diff line number	Diff line
		@@ -20,19 +20,20 @@ import android.animation.ValueAnimator;
		import android.animation.ValueAnimator.AnimatorUpdateListener;
		import android.content.Context;
		import android.support.annotation.StringRes;
		import android.support.v7.widget.PopupMenu.OnMenuItemClickListener;
		import android.support.v7.app.AppCompatActivity;
		import android.support.v7.widget.Toolbar;
		import android.util.AttributeSet;
		import android.view.MenuItem;
		import android.view.animation.AccelerateDecelerateInterpolator;
		import android.widget.ImageButton;
		import android.widget.PopupMenu;
		import android.widget.RelativeLayout;
		import com.android.dialer.common.Assert;
		import com.android.dialer.util.ViewUtil;
		import com.google.common.base.Optional;

		/** Toolbar for {@link com.android.dialer.main.impl.MainActivity}. */
		public final class MainToolbar extends Toolbar implements OnMenuItemClickListener {
		public final class MainToolbar extends Toolbar implements PopupMenu.OnMenuItemClickListener {

		private static final int SLIDE_DURATION = 300;
		private static final AccelerateDecelerateInterpolator SLIDE_INTERPOLATOR =
		@@ -155,4 +156,12 @@ public final class MainToolbar extends Toolbar implements OnMenuItemClickListene
		public void setHint(@StringRes int hint) {
		searchBar.setHint(hint);
		}

		public void showClearFrequents(boolean show) {
		overflowMenu.showClearFrequents(show);
		}

		public void maybeShowSimulator(AppCompatActivity appCompatActivity) {
		overflowMenu.maybeShowSimulator(appCompatActivity);
		}
		}