diff options
author | Dake Gu <dake@google.com> | 2018-05-07 12:32:33 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-05-07 12:32:33 -0700 |
commit | d195718c2e752876c207fe6d3d7a9a7e5f3692d4 (patch) | |
tree | 78779c80a8dd9949f0e68319c482c5743c35dc29 /common/src/com/android/tv/common/ui/setup | |
parent | 0ff776a045d66bad07eac29720413b4e0c0a9a9d (diff) | |
parent | 17850fe0bfcfed514c3e7a346a93f09c648abc83 (diff) | |
download | TV-d195718c2e752876c207fe6d3d7a9a7e5f3692d4.tar.gz |
convert LiveTv to aapt2
am: 17850fe0bf
Change-Id: I9f5d1d04a51ec13b0b00ff04deeb4df3408500cd
Diffstat (limited to 'common/src/com/android/tv/common/ui/setup')
3 files changed, 15 insertions, 9 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 88159da9..7bce9c27 100644 --- a/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java +++ b/common/src/com/android/tv/common/ui/setup/SetupGuidedStepFragment.java @@ -45,9 +45,11 @@ public abstract class SetupGuidedStepFragment extends GuidedStepFragment { Bundle savedInstanceState) { View view = super.onCreateView(inflater, container, savedInstanceState); Bundle arguments = getArguments(); - view.findViewById(R.id.action_fragment_root).setPadding(0, 0, 0, 0); + view.findViewById(android.support.v17.leanback.R.id.action_fragment_root) + .setPadding(0, 0, 0, 0); LinearLayout.LayoutParams guidanceLayoutParams = (LinearLayout.LayoutParams) - view.findViewById(R.id.content_fragment).getLayoutParams(); + view.findViewById(android.support.v17.leanback.R.id.content_fragment) + .getLayoutParams(); guidanceLayoutParams.weight = 0; if (arguments != null && arguments.getBoolean(KEY_THREE_PANE, false)) { // Content fragment. @@ -56,7 +58,7 @@ public abstract class SetupGuidedStepFragment extends GuidedStepFragment { int doneButtonWidth = getResources().getDimensionPixelOffset( R.dimen.setup_done_button_container_width); // Guided actions list - View list = view.findViewById(R.id.guidedactions_list); + View list = view.findViewById(android.support.v17.leanback.R.id.guidedactions_list); MarginLayoutParams marginLayoutParams = (MarginLayoutParams) list.getLayoutParams(); // Use content view to check layout direction while view is being created. if (getResources().getConfiguration().getLayoutDirection() @@ -77,10 +79,12 @@ public abstract class SetupGuidedStepFragment extends GuidedStepFragment { gridView.setWindowAlignmentOffset(offset); gridView.setWindowAlignmentOffsetPercent(0); gridView.setItemAlignmentOffsetPercent(0); - ((ViewGroup) view.findViewById(R.id.guidedactions_list)).setTransitionGroup(false); + ((ViewGroup) view.findViewById(android.support.v17.leanback.R.id.guidedactions_list)) + .setTransitionGroup(false); // Needed for the shared element transition. // content_frame is defined in leanback. - ViewGroup group = (ViewGroup) view.findViewById(R.id.content_frame); + ViewGroup group = (ViewGroup) view.findViewById( + android.support.v17.leanback.R.id.content_frame); group.setClipChildren(false); group.setClipToPadding(false); return view; diff --git a/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java b/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java index b9ad4657..f5c2bf26 100644 --- a/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java +++ b/common/src/com/android/tv/common/ui/setup/SetupMultiPaneFragment.java @@ -102,11 +102,13 @@ public abstract class SetupMultiPaneFragment extends SetupFragment { @Override protected int[] getParentIdsForDelay() { - return new int[] {R.id.content_fragment, R.id.guidedactions_list}; + return new int[] {android.support.v17.leanback.R.id.content_fragment, + android.support.v17.leanback.R.id.guidedactions_list}; } @Override public int[] getSharedElementIds() { - return new int[] {R.id.action_fragment_background, R.id.done_button_container}; + return new int[] {android.support.v17.leanback.R.id.action_fragment_background, + R.id.done_button_container}; } -}
\ No newline at end of file +} diff --git a/common/src/com/android/tv/common/ui/setup/animation/TranslationAnimationCreator.java b/common/src/com/android/tv/common/ui/setup/animation/TranslationAnimationCreator.java index 99b8811a..7705f7a7 100644 --- a/common/src/com/android/tv/common/ui/setup/animation/TranslationAnimationCreator.java +++ b/common/src/com/android/tv/common/ui/setup/animation/TranslationAnimationCreator.java @@ -9,7 +9,7 @@ import android.transition.Transition; import android.transition.TransitionValues; import android.view.View; -import com.android.tv.common.R; +import android.support.v17.leanback.R; /** * This class is used by Slide and Explode to create an animator that goes from the start position |