| Index: chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
|
| index 8c9f8d41d6da638334e528a443526d58c05082f9..90a7626d255b614dee51b041bf402b54a7d5d7bd 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/physicalweb/ListUrlsActivity.java
|
| @@ -4,9 +4,6 @@
|
|
|
| package org.chromium.chrome.browser.physicalweb;
|
|
|
| -import android.animation.Animator;
|
| -import android.animation.AnimatorListenerAdapter;
|
| -import android.animation.ObjectAnimator;
|
| import android.bluetooth.BluetoothAdapter;
|
| import android.bluetooth.BluetoothDevice;
|
| import android.content.Context;
|
| @@ -28,13 +25,9 @@ import android.widget.ImageView;
|
| import android.widget.ListView;
|
| import android.widget.TextView;
|
|
|
| -import org.chromium.base.ApiCompatibilityUtils;
|
| -import org.chromium.base.ContextUtils;
|
| import org.chromium.base.Log;
|
| import org.chromium.base.VisibleForTesting;
|
| import org.chromium.chrome.R;
|
| -import org.chromium.chrome.browser.widget.FadingShadow;
|
| -import org.chromium.chrome.browser.widget.FadingShadowView;
|
| import org.chromium.components.location.LocationUtils;
|
|
|
| import java.util.ArrayList;
|
| @@ -54,14 +47,6 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
|
| public static final int DIAGNOSTICS_REFERER = 4;
|
| public static final int REFERER_BOUNDARY = 5;
|
| private static final String TAG = "PhysicalWeb";
|
| - private static final String PREFS_VERSION_KEY =
|
| - "org.chromium.chrome.browser.physicalweb.VERSION";
|
| - private static final String PREFS_BOTTOM_BAR_KEY =
|
| - "org.chromium.chrome.browser.physicalweb.BOTTOM_BAR_DISPLAY_COUNT";
|
| - private static final int PREFS_VERSION = 1;
|
| - private static final int BOTTOM_BAR_DISPLAY_LIMIT = 1;
|
| - private static final int DURATION_SLIDE_UP_MS = 250;
|
| - private static final int DURATION_SLIDE_DOWN_MS = 250;
|
|
|
| private final List<PwsResult> mPwsResults = new ArrayList<>();
|
|
|
| @@ -72,7 +57,6 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
|
| private TextView mEmptyListText;
|
| private ImageView mScanningImageView;
|
| private SwipeRefreshWidget mSwipeRefreshWidget;
|
| - private View mBottomBar;
|
| private boolean mIsInitialDisplayRecorded;
|
| private boolean mIsRefreshing;
|
| private boolean mIsRefreshUserInitiated;
|
| @@ -84,8 +68,6 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
|
| mContext = this;
|
| setContentView(R.layout.physical_web_list_urls_activity);
|
|
|
| - initSharedPreferences();
|
| -
|
| mAdapter = new NearbyUrlsAdapter(this);
|
|
|
| View emptyView = findViewById(R.id.physical_web_empty);
|
| @@ -102,22 +84,6 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
|
| (SwipeRefreshWidget) findViewById(R.id.physical_web_swipe_refresh_widget);
|
| mSwipeRefreshWidget.setOnRefreshListener(this);
|
|
|
| - mBottomBar = findViewById(R.id.physical_web_bottom_bar);
|
| -
|
| - int shadowColor = ApiCompatibilityUtils.getColor(getResources(),
|
| - R.color.bottom_bar_shadow_color);
|
| - FadingShadowView shadow =
|
| - (FadingShadowView) findViewById(R.id.physical_web_bottom_bar_shadow);
|
| - shadow.init(shadowColor, FadingShadow.POSITION_BOTTOM);
|
| -
|
| - View bottomBarClose = (View) findViewById(R.id.physical_web_bottom_bar_close);
|
| - bottomBarClose.setOnClickListener(new View.OnClickListener() {
|
| - @Override
|
| - public void onClick(View v) {
|
| - hideBottomBar();
|
| - }
|
| - });
|
| -
|
| mPwsClient = new PwsClientImpl(this);
|
| int referer = getIntent().getIntExtra(REFERER_KEY, 0);
|
| if (savedInstanceState == null) { // Ensure this is a newly-created activity.
|
| @@ -178,12 +144,6 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
|
| super.onResume();
|
| mNearbyForegroundSubscription.subscribe();
|
| startRefresh(false, false);
|
| -
|
| - int bottomBarDisplayCount = getBottomBarDisplayCount();
|
| - if (bottomBarDisplayCount < BOTTOM_BAR_DISPLAY_LIMIT) {
|
| - showBottomBar();
|
| - setBottomBarDisplayCount(bottomBarDisplayCount + 1);
|
| - }
|
| }
|
|
|
| @Override
|
| @@ -343,52 +303,6 @@ public class ListUrlsActivity extends AppCompatActivity implements AdapterView.O
|
| });
|
| }
|
|
|
| - private void showBottomBar() {
|
| - mBottomBar.setTranslationY(mBottomBar.getHeight());
|
| - mBottomBar.setVisibility(View.VISIBLE);
|
| - Animator animator = createTranslationYAnimator(mBottomBar, 0f, DURATION_SLIDE_UP_MS);
|
| - animator.start();
|
| - }
|
| -
|
| - private void hideBottomBar() {
|
| - Animator animator = createTranslationYAnimator(mBottomBar, mBottomBar.getHeight(),
|
| - DURATION_SLIDE_DOWN_MS);
|
| - animator.addListener(new AnimatorListenerAdapter() {
|
| - @Override
|
| - public void onAnimationEnd(Animator animation) {
|
| - mBottomBar.setVisibility(View.GONE);
|
| - }
|
| - });
|
| - animator.start();
|
| - }
|
| -
|
| - private static Animator createTranslationYAnimator(View view, float endValue,
|
| - long durationMillis) {
|
| - return ObjectAnimator.ofFloat(view, "translationY", view.getTranslationY(), endValue)
|
| - .setDuration(durationMillis);
|
| - }
|
| -
|
| - private void initSharedPreferences() {
|
| - if (ContextUtils.getAppSharedPreferences().getInt(PREFS_VERSION_KEY, 0) == PREFS_VERSION) {
|
| - return;
|
| - }
|
| -
|
| - // Stored preferences are old, upgrade to the current version.
|
| - ContextUtils.getAppSharedPreferences().edit()
|
| - .putInt(PREFS_VERSION_KEY, PREFS_VERSION)
|
| - .apply();
|
| - }
|
| -
|
| - private int getBottomBarDisplayCount() {
|
| - return ContextUtils.getAppSharedPreferences().getInt(PREFS_BOTTOM_BAR_KEY, 0);
|
| - }
|
| -
|
| - private void setBottomBarDisplayCount(int count) {
|
| - ContextUtils.getAppSharedPreferences().edit()
|
| - .putInt(PREFS_BOTTOM_BAR_KEY, count)
|
| - .apply();
|
| - }
|
| -
|
| private static Intent createNavigateToUrlIntent(PwsResult pwsResult, UrlInfo urlInfo) {
|
| String url = pwsResult.siteUrl;
|
| if (url == null) {
|
|
|