diff options
author | jrizzoli <joey@cyanogenmoditalia.it> | 2015-05-06 20:59:59 +0200 |
---|---|---|
committer | Joey Rizzoli <joey@cyanogenmoditalia.it> | 2015-11-07 14:08:54 -0800 |
commit | 4c496c806380653642f17eb8950ba9efd7d43299 (patch) | |
tree | 607a011952213ef22f9308267535cf4b2d5e156b /src/com/android/browser/NavTabView.java | |
parent | a77b9f7993ec874eadde2104f8b0f73f2f6186d2 (diff) | |
download | packages_apps_Browser-4c496c806380653642f17eb8950ba9efd7d43299.zip packages_apps_Browser-4c496c806380653642f17eb8950ba9efd7d43299.tar.gz packages_apps_Browser-4c496c806380653642f17eb8950ba9efd7d43299.tar.bz2 |
Browser: update UI
* Res
- Rename (#themersgottahate)
- Vectors
- Card-Tabs
- CleanUp
* Interface
- Longpress fab to open incognito tab
- New icon
- Better urlbar
- Fix tab animations
- Remap PieControl
* Features
- Immersive mode (replace jb fullscreen)
Change-Id: I2fde4242f477359dc8af18d1b7752750058cd6e9
Signed-off-by: jrizzoli <joey@cyanogenmoditalia.it>
Diffstat (limited to 'src/com/android/browser/NavTabView.java')
-rw-r--r-- | src/com/android/browser/NavTabView.java | 42 |
1 files changed, 17 insertions, 25 deletions
diff --git a/src/com/android/browser/NavTabView.java b/src/com/android/browser/NavTabView.java index de50317..17b0425 100644 --- a/src/com/android/browser/NavTabView.java +++ b/src/com/android/browser/NavTabView.java @@ -31,7 +31,6 @@ public class NavTabView extends LinearLayout { private ViewGroup mContent; private Tab mTab; - private ImageView mClose; private TextView mTitle; private View mTitleBar; ImageView mImage; @@ -56,16 +55,11 @@ public class NavTabView extends LinearLayout { private void init() { LayoutInflater.from(mContext).inflate(R.layout.nav_tab_view, this); mContent = (ViewGroup) findViewById(R.id.main); - mClose = (ImageView) findViewById(R.id.closetab); - mTitle = (TextView) findViewById(R.id.title); mTitleBar = findViewById(R.id.titlebar); + mTitle = (TextView) findViewById(R.id.title); mImage = (ImageView) findViewById(R.id.tab_view); } - protected boolean isClose(View v) { - return v == mClose; - } - protected boolean isTitle(View v) { return v == mTitleBar; } @@ -85,31 +79,30 @@ public class NavTabView extends LinearLayout { } mTitle.setText(txt); } - if (mTab.isSnapshot()) { - setTitleIcon(R.drawable.ic_history_dark); - } else if (mTab.isPrivateBrowsingEnabled()) { - setTitleIcon(R.drawable.ic_incognito_dark); - } else { - setTitleIcon(0); + if (!mTab.isSnapshot()) { + setTitleIcon(); } } - private void setTitleIcon(int id) { - if (id == 0) { - mTitle.setPadding(mTitle.getCompoundDrawablePadding(), 0, 0, 0); - } else { - mTitle.setPadding(0, 0, 0, 0); - } - mTitle.setCompoundDrawablesWithIntrinsicBounds(id, 0, 0, 0); - } + private void setTitleIcon() { + mTitle.setPadding(mTitle.getCompoundDrawablePadding(), 0, 0, 0); + mTitle.setCompoundDrawablesWithIntrinsicBounds(0, 0, 0, 0); + } protected boolean isHighlighted() { return mHighlighted; } - protected Long getWebViewId(){ - if(mTab == null) return null; - return new Long(mTab.getId()); + protected long getWebViewId() { + return mTab != null ? mTab.getId() : -1; + } + + protected int getContentLeft() { + return getLeft() + mTitleBar.getLeft() + mImage.getLeft(); + } + + protected int getContentTop() { + return getTop() + mTitleBar.getTop() + mImage.getTop(); } protected void setWebView(Tab tab) { @@ -128,7 +121,6 @@ public class NavTabView extends LinearLayout { public void setOnClickListener(OnClickListener listener) { mClickListener = listener; mTitleBar.setOnClickListener(mClickListener); - mClose.setOnClickListener(mClickListener); if (mImage != null) { mImage.setOnClickListener(mClickListener); } |