diff options
| author | Nick Chalko <nchalko@google.com> | 2017-10-03 10:16:37 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2017-10-04 13:48:13 +0000 |
| commit | 6ebde20b03db4c0d57f67acaac11832b610b966b (patch) | |
| tree | d31e2adc1f9cce4f27ca07d30bee921032e33a3c /common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java | |
| parent | ee027a576ddebaf1ae739219be01b0240b15f80c (diff) | |
| download | TV-6ebde20b03db4c0d57f67acaac11832b610b966b.tar.gz | |
Sync to match Live Channels 1.15(ncis)oreo-mr1-dev
aka ub-tv-dev at a73a150bb7d0d1ce867ef980c6ac8411899d40ad
Bug: 64021596
Change-Id: I7c544fd15e2c58784f8babc31877ad0dfeebb4c0
(cherry picked from commit 633eb826b8c97731dfc5ef12c7bf78a63734275d)
Diffstat (limited to 'common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java')
| -rw-r--r-- | common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java b/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java index bcaefec9..88159da9 100644 --- a/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java +++ b/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java @@ -72,9 +72,6 @@ public abstract class SetupGuidedStepFragment extends GuidedStepFragment { } // gridView Alignment VerticalGridView gridView = getGuidedActionsStylist().getActionsGridView(); - // Workaround of b/28274171 - // TODO: Remove the following line once b/28274171 is resolved. - gridView.setFocusable(true); int offset = getResources().getDimensionPixelOffset( R.dimen.setup_guidedactions_selector_margin_top); gridView.setWindowAlignmentOffset(offset); @@ -86,8 +83,6 @@ public abstract class SetupGuidedStepFragment extends GuidedStepFragment { ViewGroup group = (ViewGroup) view.findViewById(R.id.content_frame); group.setClipChildren(false); group.setClipToPadding(false); - // Workaround b/26205201 - view.findViewById(R.id.guidedactions_list2).setFocusable(false); return view; } |