OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 package org.chromium.chrome.browser.omnibox; | 5 package org.chromium.chrome.browser.omnibox; |
6 | 6 |
7 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ ANIMATION_DURATION_MS; | 7 import static org.chromium.chrome.browser.toolbar.ToolbarPhone.URL_FOCUS_CHANGE_ ANIMATION_DURATION_MS; |
8 | 8 |
9 import android.Manifest; | 9 import android.Manifest; |
10 import android.animation.Animator; | 10 import android.animation.Animator; |
11 import android.animation.AnimatorListenerAdapter; | 11 import android.animation.AnimatorListenerAdapter; |
12 import android.animation.AnimatorSet; | 12 import android.animation.AnimatorSet; |
13 import android.animation.ObjectAnimator; | 13 import android.animation.ObjectAnimator; |
14 import android.app.Activity; | 14 import android.app.Activity; |
15 import android.content.Context; | 15 import android.content.Context; |
16 import android.content.Intent; | 16 import android.content.Intent; |
17 import android.content.pm.PackageManager; | 17 import android.content.pm.PackageManager; |
18 import android.content.res.ColorStateList; | 18 import android.content.res.ColorStateList; |
19 import android.content.res.Configuration; | 19 import android.content.res.Configuration; |
20 import android.content.res.Resources; | 20 import android.content.res.Resources; |
21 import android.graphics.Color; | 21 import android.graphics.Color; |
22 import android.graphics.PorterDuff; | 22 import android.graphics.PorterDuff; |
23 import android.graphics.Rect; | 23 import android.graphics.Rect; |
24 import android.graphics.drawable.ColorDrawable; | 24 import android.graphics.drawable.ColorDrawable; |
25 import android.graphics.drawable.Drawable; | 25 import android.graphics.drawable.Drawable; |
26 import android.net.Uri; | 26 import android.net.Uri; |
27 import android.os.Build; | |
27 import android.os.Parcelable; | 28 import android.os.Parcelable; |
28 import android.os.SystemClock; | 29 import android.os.SystemClock; |
29 import android.provider.Settings; | 30 import android.provider.Settings; |
30 import android.speech.RecognizerIntent; | 31 import android.speech.RecognizerIntent; |
31 import android.support.annotation.IntDef; | 32 import android.support.annotation.IntDef; |
32 import android.text.InputType; | 33 import android.text.InputType; |
33 import android.text.TextUtils; | 34 import android.text.TextUtils; |
34 import android.util.AttributeSet; | 35 import android.util.AttributeSet; |
35 import android.util.Pair; | 36 import android.util.Pair; |
36 import android.util.SparseArray; | 37 import android.util.SparseArray; |
37 import android.view.KeyEvent; | 38 import android.view.KeyEvent; |
38 import android.view.LayoutInflater; | 39 import android.view.LayoutInflater; |
40 import android.view.PointerIcon; | |
39 import android.view.View; | 41 import android.view.View; |
40 import android.view.View.OnClickListener; | 42 import android.view.View.OnClickListener; |
41 import android.view.ViewGroup; | 43 import android.view.ViewGroup; |
42 import android.view.ViewStub; | 44 import android.view.ViewStub; |
43 import android.view.inputmethod.InputMethodManager; | 45 import android.view.inputmethod.InputMethodManager; |
44 import android.widget.FrameLayout; | 46 import android.widget.FrameLayout; |
45 import android.widget.ImageView; | 47 import android.widget.ImageView; |
46 import android.widget.ListView; | 48 import android.widget.ListView; |
47 import android.widget.TextView; | 49 import android.widget.TextView; |
48 | 50 |
(...skipping 2237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2286 if (mOmniboxResultsContainer != null) return; | 2288 if (mOmniboxResultsContainer != null) return; |
2287 | 2289 |
2288 // Use the omnibox results container in the bottom sheet if it exists. | 2290 // Use the omnibox results container in the bottom sheet if it exists. |
2289 int omniboxResultsContainerId = R.id.omnibox_results_container_stub; | 2291 int omniboxResultsContainerId = R.id.omnibox_results_container_stub; |
2290 if (mBottomSheet != null) { | 2292 if (mBottomSheet != null) { |
2291 omniboxResultsContainerId = R.id.bottom_omnibox_results_container_st ub; | 2293 omniboxResultsContainerId = R.id.bottom_omnibox_results_container_st ub; |
2292 } | 2294 } |
2293 | 2295 |
2294 ViewStub overlayStub = (ViewStub) getRootView().findViewById(omniboxResu ltsContainerId); | 2296 ViewStub overlayStub = (ViewStub) getRootView().findViewById(omniboxResu ltsContainerId); |
2295 mOmniboxResultsContainer = (ViewGroup) overlayStub.inflate(); | 2297 mOmniboxResultsContainer = (ViewGroup) overlayStub.inflate(); |
2298 | |
2299 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { | |
2300 PointerIcon icon = PointerIcon.getSystemIcon( | |
2301 mOmniboxResultsContainer.getContext(), PointerIcon.TYPE_ARRO W); | |
2302 mOmniboxResultsContainer.setPointerIcon(icon); | |
Ted C
2017/07/21 00:15:25
what is the default icon? why do we need to set a
jaebaek
2017/07/21 10:03:05
In my implementation, onResolvePointerIcon method
Ted C
2017/07/21 18:45:31
Is BottomContainer the only issue? Can that be ma
jaebaek
2017/07/24 07:34:11
I changed the layout_height of BottomContainer to
| |
2303 } | |
2296 } | 2304 } |
2297 | 2305 |
2298 private void updateOmniboxResultsContainer() { | 2306 private void updateOmniboxResultsContainer() { |
2299 if (mSuggestionsShown || mUrlHasFocus) { | 2307 if (mSuggestionsShown || mUrlHasFocus) { |
2300 initOmniboxResultsContainer(); | 2308 initOmniboxResultsContainer(); |
2301 updateOmniboxResultsContainerVisibility(true); | 2309 updateOmniboxResultsContainerVisibility(true); |
2302 } else if (mOmniboxResultsContainer != null) { | 2310 } else if (mOmniboxResultsContainer != null) { |
2303 updateFadingBackgroundView(false); | 2311 updateFadingBackgroundView(false); |
2304 } | 2312 } |
2305 } | 2313 } |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
2559 public void setTitleToPageTitle() { } | 2567 public void setTitleToPageTitle() { } |
2560 | 2568 |
2561 @Override | 2569 @Override |
2562 public void setShowTitle(boolean showTitle) { } | 2570 public void setShowTitle(boolean showTitle) { } |
2563 | 2571 |
2564 @Override | 2572 @Override |
2565 public boolean mustQueryUrlBarLocationForSuggestions() { | 2573 public boolean mustQueryUrlBarLocationForSuggestions() { |
2566 return DeviceFormFactor.isTablet(); | 2574 return DeviceFormFactor.isTablet(); |
2567 } | 2575 } |
2568 } | 2576 } |
OLD | NEW |