Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1268647 - Add Switch to layout. r=sebastian

Browse Source 
MozReview-Commit-ID: 1CCXAzqVVvO

--HG--
rename : mobile/android/base/resources/layout/firstrun_basepanel_fragment.xml => mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml
extra : rebase_source : 1fb8026eff4eff6264b618e3cd81662f4e87b5c4
This commit is contained in:
Chenxia Liu 2016-05-10 17:24:08 -07:00
parent 6ade2aca8e
commit 77cbb4a5ec
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/java/org/mozilla/gecko/firstrun/FirstrunPanel.java
View File

@ -29,7 +29,7 @@ public class FirstrunPanel extends Fragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance) {
final ViewGroup root = (ViewGroup) inflater.inflate(R.layout.firstrun_basepanel_fragment, container, false);
final ViewGroup root = (ViewGroup) inflater.inflate(R.layout.firstrun_basepanel_checkable_fragment, container, false);
Bundle args = getArguments();
if (args != null) {
final int imageRes = args.getInt(FirstrunPagerConfig.KEY_IMAGE);

9
mobile/android/base/resources/layout/firstrun_basepanel_fragment.xml → mobile/android/base/resources/layout/firstrun_basepanel_checkable_fragment.xml
View File

@ -40,9 +40,12 @@
android:gravity="center"
android:textAppearance="@style/TextAppearance.FirstrunRegular.Body"/>
<View android:layout_weight="1"
android:layout_height="0dp"
android:layout_width="match_parent"/>
<android.support.v7.widget.SwitchCompat
android:id="@+id/firstrun_switch"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:visibility="invisible"/>
<TextView android:id="@+id/firstrun_link"
android:layout_width="wrap_content"