summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/gallery3d/app/AlbumPage.java22
-rwxr-xr-xsrc/com/android/gallery3d/app/AlbumSetPage.java6
-rwxr-xr-xsrc/com/android/gallery3d/app/GalleryActivity.java173
-rwxr-xr-xsrc/com/android/gallery3d/app/PhotoPage.java11
-rw-r--r--src/com/android/gallery3d/app/SlideshowPage.java4
-rwxr-xr-xsrc/com/android/gallery3d/app/TimeLinePage.java4
6 files changed, 58 insertions, 162 deletions
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index bdd051fe7..7f947d8f3 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -285,13 +285,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
if (mInCameraApp) {
GalleryUtils.startGalleryActivity(mActivity);
} else if (mActivity.getStateManager().getStateCount() > 1) {
- Toolbar toolbar = mActivity.getToolbar();
- if (toolbar != null) {
- toolbar.setNavigationContentDescription(
- mActivity.getResources().getString(R.string.drawer_desc));
- toolbar.setNavigationIcon(R.drawable.drawer);
- ((GalleryActivity) mActivity).toggleNavDrawer(true);
- }
+ ((GalleryActivity) mActivity).toggleNavBar(true);
super.onBackPressed();
} else if (mParentMediaSetString != null) {
Bundle data = new Bundle(getData());
@@ -498,20 +492,6 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
setContentPane(mRootPane);
- boolean enableHomeButton = (mActivity.getStateManager().getStateCount() > 1) |
- mParentMediaSetString != null;
- //GalleryActionBar actionBar = mActivity.getGalleryActionBar();
- if (mIsVideoScreen) {
- //if from video screen, show display navigation icon as home and title
- mActionBar.setDisplayHome(true, true);
- } else {
- mActionBar.setDisplayOptions(enableHomeButton, true);
- }
- Toolbar toolBar = mActivity.getToolbar();
- if (enableHomeButton && toolBar != null) {
- toolBar.setNavigationContentDescription("back");
- toolBar.setNavigationIcon(R.drawable.back);
- }
// Set the reload bit here to prevent it exit this page in clearLoadingBit().
setLoadingBit(BIT_LOADING_RELOAD);
mLoadingFailed = false;
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index 185b17288..ec658961f 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -694,12 +694,12 @@ public class AlbumSetPage extends ActivityState implements
//mActionBar.disableClusterMenu(true);
mActionModeHandler.startActionMode();
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
- ((GalleryActivity)mActivity).toggleNavDrawer(false);
+ ((GalleryActivity)mActivity).toggleNavBar(false);
break;
}
case SelectionManager.LEAVE_SELECTION_MODE: {
mActionModeHandler.finishActionMode();
- ((GalleryActivity)mActivity).toggleNavDrawer(true);
+ ((GalleryActivity)mActivity).toggleNavBar(true);
/*if (mShowClusterMenu) {
mActionBar.enableClusterMenu(mSelectedAction, this);
}*/
@@ -725,11 +725,13 @@ public class AlbumSetPage extends ActivityState implements
mDetailsHelper.hide();
mAlbumSetView.setHighlightItemPath(null);
mSlotView.invalidate();
+ ((GalleryActivity)mActivity).toggleNavBar(true);
}
private void showDetails() {
mShowDetails = true;
if (mDetailsHelper == null) {
+ ((GalleryActivity)mActivity).toggleNavBar(false);
mDetailsHelper = new DetailsHelper(mActivity, mRootPane, mDetailsSource);
mDetailsHelper.setCloseListener(new CloseListener() {
@Override
diff --git a/src/com/android/gallery3d/app/GalleryActivity.java b/src/com/android/gallery3d/app/GalleryActivity.java
index 6768967b5..d4b508782 100755
--- a/src/com/android/gallery3d/app/GalleryActivity.java
+++ b/src/com/android/gallery3d/app/GalleryActivity.java
@@ -30,6 +30,7 @@ import android.content.pm.PackageManager;
import android.graphics.Color;
import android.net.Uri;
import android.os.Bundle;
+import android.support.design.widget.BottomNavigationView;
import android.support.v4.widget.DrawerLayout;
import android.support.v4.widget.DrawerLayout.DrawerListener;
import android.text.TextUtils;
@@ -37,6 +38,7 @@ import android.util.Log;
import android.view.Gravity;
import android.view.InputDevice;
import android.view.LayoutInflater;
+import android.view.MenuItem;
import android.view.MotionEvent;
import android.view.View;
import android.view.View.OnClickListener;
@@ -46,6 +48,8 @@ import android.widget.AdapterView;
import android.widget.BaseAdapter;
import android.widget.ImageView;
import android.widget.ListView;
+import android.widget.RelativeLayout;
+import android.widget.RelativeLayout.LayoutParams;
import android.widget.TextView;
import android.widget.Toast;
import android.widget.Toolbar;
@@ -92,8 +96,12 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
private ListView mDrawerListView;
private DrawerLayout mDrawerLayout;
public static boolean mIsparentActivityFInishing;
- NavigationDrawerListAdapter mNavigationAdapter;
public Toolbar mToolbar;
+
+ private BottomNavigationView mBottomNavigation;
+ private RelativeLayout mGLParentLayout;
+ private RelativeLayout.LayoutParams params;
+
/** DrawerLayout is not supported in some entrances.
* such as Intent.ACTION_VIEW, Intent.ACTION_GET_CONTENT, Intent.PICK. */
private boolean mDrawerLayoutSupported = true;
@@ -164,76 +172,47 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
R.string.videos_title, R.drawable.videos) };
public void initView() {
- mDrawerListView = (ListView) findViewById(R.id.navList);
- mNavigationAdapter = new NavigationDrawerListAdapter(this);
- mDrawerListView.setAdapter(mNavigationAdapter);
mToolbar = (Toolbar) findViewById(R.id.toolbar);
setActionBar(mToolbar);
+ setToolbar(mToolbar);
- mDrawerListView
- .setOnItemClickListener(new AdapterView.OnItemClickListener() {
- @Override
- public void onItemClick(AdapterView<?> parent, View view,
- int position, long id) {
- getGLRoot().lockRenderThread();
- showScreen(position);
-
- mNavigationAdapter.setClickPosition(position);
- mDrawerListView.invalidateViews();
- mDrawerLayout.closeDrawer(Gravity.START);
- getGLRoot().unlockRenderThread();
- }
- });
- mDrawerLayout = (DrawerLayout) findViewById(R.id.drawerLayout);
- mDrawerLayout.setDrawerListener(new DrawerListener() {
- @Override
- public void onDrawerStateChanged(int arg0) {
- toggleNavDrawer(getStateManager().getStateCount() == 1);
- }
-
- @Override
- public void onDrawerSlide(View arg0, float arg1) {
-
- }
-
- @Override
- public void onDrawerOpened(View arg0) {
-
- }
-
- @Override
- public void onDrawerClosed(View arg0) {
-
- }
- });
- mToolbar.setNavigationContentDescription("drawer");
- mToolbar.setNavigationOnClickListener(new OnClickListener() {
+ mGLParentLayout = (RelativeLayout) findViewById(R.id.gl_parent_layout);
+ params = (RelativeLayout.LayoutParams) mGLParentLayout.getLayoutParams();
+ mBottomNavigation = (BottomNavigationView) findViewById(R.id.bottom_navigation);
+ mBottomNavigation.setOnNavigationItemSelectedListener(
+ new BottomNavigationView.OnNavigationItemSelectedListener() {
@Override
- public void onClick(View v) {
- if (mToolbar.getNavigationContentDescription().equals("drawer")) {
- mDrawerLayout.openDrawer(Gravity.START);
-
- } else {
- mToolbar.setNavigationContentDescription("drawer");
- mToolbar.setNavigationIcon(R.drawable.drawer);
- onBackPressed();
+ public boolean onNavigationItemSelected(MenuItem item) {
+ getGLRoot().lockRenderThread();
+ switch (item.getItemId()) {
+ case R.id.action_timeline:
+ showScreen(0);
+ break;
+ case R.id.action_album:
+ showScreen(1);
+ break;
+ case R.id.action_videos:
+ showScreen(2);
+ break;
}
+ getGLRoot().unlockRenderThread();
+ return true;
}
});
- setToolbar(mToolbar);
}
- public void toggleNavDrawer(boolean setDrawerVisibility) {
- if (mDrawerLayout != null) {
- if (setDrawerVisibility && mDrawerLayoutSupported) {
- mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED);
- mToolbar.setNavigationIcon(R.drawable.drawer);
- } else {
- mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED);
- mToolbar.setNavigationIcon(null);
- }
+ public void toggleNavBar(boolean show) {
+ if (show) {
+ mBottomNavigation.setVisibility(View.VISIBLE);
+ } else {
+ mBottomNavigation.setVisibility(View.INVISIBLE);
}
+
+ // Convert dp to pixels
+ float dp = getApplicationContext().getResources().getDisplayMetrics().density;
+
+ params.setMargins(0, 0, 0, show ? Math.round(56 * dp) : 0);
}
public void showScreen(int position) {
@@ -259,75 +238,6 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
default:
break;
}
-
- mNavigationAdapter.setClickPosition(position);
-
- mDrawerListView.invalidateViews();
- mToolbar.setTitle(getResources().getStringArray(
- R.array.title_array_nav_items)[position]);
-
- mDrawerListView.setItemChecked(position, true);
- mDrawerListView.setSelection(position);
- mToolbar.setNavigationContentDescription("drawer");
- mToolbar.setNavigationIcon(R.drawable.drawer);
- }
-
- private class NavigationDrawerListAdapter extends BaseAdapter {
-
- private int curTab = 0;
- Context mContext;
-
- public NavigationDrawerListAdapter(Context context) {
- mContext = context;
-
- }
-
- @Override
- public int getCount() {
- return sActionItems.length;
- }
-
- @Override
- public Object getItem(int position) {
- return sActionItems[position];
- }
-
- @Override
- public long getItemId(int position) {
- return 0;
- }
-
- @Override
- public View getView(int position, View convertView, ViewGroup parent) {
- View view;
-
- if (convertView == null) {
- LayoutInflater inflater = (LayoutInflater) mContext
- .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
- view = inflater.inflate(
- org.codeaurora.gallery.R.layout.drawer_list_item, null);
- } else {
- view = convertView;
- }
-
- TextView titleView = (TextView) view.findViewById(R.id.itemTitle);
- ImageView iconView = (ImageView) view.findViewById(R.id.ivItem);
-
- titleView.setText(sActionItems[position].title);
- iconView.setImageResource(sActionItems[position].icon);
-
- if (curTab == position) {
- view.setBackgroundResource(R.drawable.drawer_item_selected_bg);
- } else {
- view.setBackgroundColor(android.R.color.transparent);
- }
-
- return view;
- }
-
- public void setClickPosition(int position) {
- curTab = position;
- }
}
public static int getActionTitle(Context context, int type) {
@@ -346,6 +256,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
if (Intent.ACTION_GET_CONTENT.equalsIgnoreCase(action)) {
mDrawerLayoutSupported = false;
startGetContent(intent);
+ toggleNavBar(false);
} else if (Intent.ACTION_PICK.equalsIgnoreCase(action)) {
mDrawerLayoutSupported = false;
// We do NOT really support the PICK intent. Handle it as
@@ -358,6 +269,7 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
if (type.endsWith("/video")) intent.setType("video/*");
}
startGetContent(intent);
+ toggleNavBar(false);
} else if (Intent.ACTION_VIEW.equalsIgnoreCase(action)
|| ACTION_REVIEW.equalsIgnoreCase(action)){
mDrawerLayoutSupported = false;
@@ -377,12 +289,13 @@ public final class GalleryActivity extends AbstractGalleryActivity implements On
Log.w(TAG, "uri get from intent is null");
}
startViewAction(intent);
+ toggleNavBar(false);
} else {
mDrawerLayoutSupported = true;
startTimelinePage();
mToolbar.setTitle(R.string.albums_title);
}
- toggleNavDrawer(mDrawerLayoutSupported);
+ toggleNavBar(mDrawerLayoutSupported);
}
public void startAlbumPage() {
diff --git a/src/com/android/gallery3d/app/PhotoPage.java b/src/com/android/gallery3d/app/PhotoPage.java
index 6d4a3e9cc..272f93956 100755
--- a/src/com/android/gallery3d/app/PhotoPage.java
+++ b/src/com/android/gallery3d/app/PhotoPage.java
@@ -1030,6 +1030,7 @@ public abstract class PhotoPage extends ActivityState implements
@Override
protected void onBackPressed() {
showBars();
+ ((GalleryActivity)mActivity).toggleNavBar(true);
if (mShowDetails) {
hideDetails();
} else if (mAppBridge == null || !switchWithCaptureAnimation(-1)) {
@@ -1048,10 +1049,7 @@ public abstract class PhotoPage extends ActivityState implements
mActionBar.setBackGroundDefault();
int count = mActivity.getStateManager().getStateCount();
if (mIsFromVideoScreen || count == 1 || mIsFromTimelineScreen) {
- mActivity.getToolbar().setNavigationContentDescription(
- "drawer");
- mActivity.getToolbar().setNavigationIcon(R.drawable.drawer);
- ((GalleryActivity)mActivity).toggleNavDrawer(true);
+ ((GalleryActivity)mActivity).toggleNavBar(true);
if (mModel instanceof PhotoDataAdapter) {
((PhotoDataAdapter) mModel).setDataListener(null);
}
@@ -1690,12 +1688,11 @@ public abstract class PhotoPage extends ActivityState implements
}
mActionBar.setDisplayOptions(
- ((mSecureAlbum == null) && (mSetPathString != null)), true);
+ (false && (mSetPathString != null)), true);
mActionBar.addOnMenuVisibilityListener(mMenuVisibilityListener);
refreshBottomControlsWhenReady();
if (((mSecureAlbum == null) && (mSetPathString != null))) {
- mActivity.getToolbar().setNavigationContentDescription("back");
- mActivity.getToolbar().setNavigationIcon(R.drawable.back);
+ ((GalleryActivity)mActivity).toggleNavBar(false);
}
// if (mShowSpinner && mPhotoView.getFilmMode()) {
// mActionBar.enableAlbumModeMenu(
diff --git a/src/com/android/gallery3d/app/SlideshowPage.java b/src/com/android/gallery3d/app/SlideshowPage.java
index e742321ea..2923ee998 100644
--- a/src/com/android/gallery3d/app/SlideshowPage.java
+++ b/src/com/android/gallery3d/app/SlideshowPage.java
@@ -113,6 +113,8 @@ public class SlideshowPage extends ActivityState {
@Override
public void onCreate(Bundle data, Bundle restoreState) {
super.onCreate(data, restoreState);
+ ((GalleryActivity) mActivity).toggleNavBar(false);
+
mFlags |= (FLAG_HIDE_ACTION_BAR | FLAG_HIDE_STATUS_BAR | FLAG_SCREEN_FULL);
if (data.getBoolean(KEY_DREAM)) {
// Dream screensaver only keeps screen on for plugged devices.
@@ -174,6 +176,7 @@ public class SlideshowPage extends ActivityState {
@Override
public void onPause() {
super.onPause();
+ ((GalleryActivity) mActivity).toggleNavBar(true);
mIsActive = false;
mModel.pause();
mSlideshowView.release();
@@ -185,6 +188,7 @@ public class SlideshowPage extends ActivityState {
@Override
public void onResume() {
super.onResume();
+ ((GalleryActivity) mActivity).toggleNavBar(false);
mIsActive = true;
mModel.resume();
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index d48bf3928..7810a1522 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -697,12 +697,12 @@ public class TimeLinePage extends ActivityState implements
case SelectionManager.ENTER_SELECTION_MODE: {
mActionModeHandler.startActionMode();
performHapticFeedback(HapticFeedbackConstants.LONG_PRESS);
- ((GalleryActivity)mActivity).toggleNavDrawer(false);
+ ((GalleryActivity)mActivity).toggleNavBar(false);
break;
}
case SelectionManager.LEAVE_SELECTION_MODE: {
mActionModeHandler.finishActionMode();
- ((GalleryActivity)mActivity).toggleNavDrawer(true);
+ ((GalleryActivity)mActivity).toggleNavBar(true);
mRootPane.invalidate();
break;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-19 05:09:32 +0000