Mercurial > 510Connectbot

comparison src/com/five_ten_sg/connectbot/WizardActivity.java @ 342:175c7d68f3c4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge ganymed into mainline
author Carl Byington <carl@five-ten-sg.com>
date Thu, 31 Jul 2014 16:33:38 -0700
parents 071eccdff8ea
children
comparison
equal deleted inserted replaced
272:ce2f4e397703 342:175c7d68f3c4
46 setContentView(R.layout.act_wizard); 46 setContentView(R.layout.act_wizard);
47 this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper); 47 this.flipper = (ViewFlipper) findViewById(R.id.wizard_flipper);
48 // inflate the layout for EULA step 48 // inflate the layout for EULA step
49 LayoutInflater inflater = LayoutInflater.from(this); 49 LayoutInflater inflater = LayoutInflater.from(this);
50 View helpView = inflater.inflate(R.layout.wiz_eula, this.flipper, false); 50 View helpView = inflater.inflate(R.layout.wiz_eula, this.flipper, false);
51
52 this.flipper.addView(helpView); 51 this.flipper.addView(helpView);
53 // Add a view for each help topic we want the user to see. 52 // Add a view for each help topic we want the user to see.
54 String[] topics = getResources().getStringArray(R.array.list_wizard_topics); 53 String[] topics = getResources().getStringArray(R.array.list_wizard_topics);
55 54
56 for (String topic : topics) { 55 for (String topic : topics) {