From 1fcde3985e9d62eb22eff0b8eacf1d4832234867 Mon Sep 17 00:00:00 2001 From: cretin45 Date: Fri, 23 Jan 2015 14:04:04 -0800 Subject: [PATCH] SetupWizard: Add loading fragment if launching into another activity Also always show the Wi-Fi page Change-Id: I3be39f793403131ea07d071c3d107b1800771e65 --- res/drawable-hdpi/timer.png | Bin 0 -> 1588 bytes res/drawable-mdpi/timer.png | Bin 0 -> 967 bytes res/drawable-xhdpi/timer.png | Bin 0 -> 2143 bytes res/drawable-xxhdpi/timer.png | Bin 0 -> 3282 bytes res/drawable-xxxhdpi/timer.png | Bin 0 -> 4498 bytes res/layout/setup_loading_page.xml | 47 ++++++++++++++++++ res/values/strings.xml | 3 +- .../setupwizard/setup/GmsAccountPage.java | 18 ++++++- .../setupwizard/setup/LoadingFragment.java | 30 +++++++++++ .../setupwizard/setup/WifiSetupPage.java | 31 +++++++++--- .../setupwizard/util/SetupWizardUtils.java | 2 +- 11 files changed, 121 insertions(+), 10 deletions(-) create mode 100755 res/drawable-hdpi/timer.png create mode 100755 res/drawable-mdpi/timer.png create mode 100755 res/drawable-xhdpi/timer.png create mode 100755 res/drawable-xxhdpi/timer.png create mode 100755 res/drawable-xxxhdpi/timer.png create mode 100644 res/layout/setup_loading_page.xml create mode 100644 src/com/cyanogenmod/setupwizard/setup/LoadingFragment.java diff --git a/res/drawable-hdpi/timer.png b/res/drawable-hdpi/timer.png new file mode 100755 index 0000000000000000000000000000000000000000..359045c075ad3be8c9059a65ff4eedf7d98b4d6b GIT binary patch literal 1588 zcmV-42Fv-0P)Px)?ny*JRA>donA>X|RTRcsO?vSzwV`0EsUcA-f)yJT2}Wp(m)E`&N((-yPd@mk z_@s|TFd_=cAa1T`VA|}5xq6qpx8e7&)|=xRD1*V+ZvqI`7rz%E|^;} z08{D}n9E6X@pIS|Z_wZg_zZjs+P62rT{(xd7=MRuk||sS49q2V9x;GHYM!32y>{W9 zZ$-R4nA;^3aW8xv_QPM`Z!qFV47n$9Cw7CgzCap4HDX#Wp+>b9C1rQz4yJHyHAD2#ZHRM zYq+*SF5=);6gw&24i9ApQHz>VsCmW!MDC!p6MI=-IAwl1E&dC}I2*=MgIXdA&80w3 zpO=G&XOY2RON*Tr?{WE)bbz^QHK-+pS|>D=0k{{8X$VkcTzhr#YsP(EbO?%n2gWx* z$5unc7=~j1NKA>B%=wv4 z2Vj}cIUfgdYd5{7pm`co%oMSYUTB&Oz^WTVRnf;m{uiZ7@mN&=2nvcN>x7gAvg@H)_bZN!3}f_ zj>ATCsg(d2qk!L&%w;E{`Md@;fvcGF#s$E+Q=D!1Z-jONNC)z$VGw=L6~&Fr0L#30 mJ}A(Q%#~{rD&C#DE&LB+ybYV5Px&fk{L`R9FeMm(5F*Q51*A1Su+WXVHh+fKiK}78OAWR=XCpZXraApzx1z)k^R$ zs9lS~aATWDXdz*k*%!Kru%a@>p67MWaQv8Y#_R`=_rCYN_nh;d`!Uy+QsZi+YZ*>K zC$v|fC@oZ&r<{aoScWatvSp7_X&-&A!5P@yK!3aZf(dv6-=U`J1>hI=Lm#x&v{3)W zBCp3_6gJIBtpNP$0qBA(jm*Fld<9dloQ@9Yg&r{YtXUpLU_&-G3*aCfZ-WLyrgRL( z;b%0~DEH8Q5zJhkG6NolIjCxV0Dk!(WaqDVeh5FH8SSO>O*owf8N?7&Gm%qe{SKG` zwE`}pNAL$~={heQWB-^E`#Q$pZ9fivtQqNsmtgyvxpJkSwXq_dKaGbvr9nIQ=iodn z!DlEOP`(9KUM-63`mSi-RcSQ!mn(G(BX7ic8d6kUj5pvO94J~=|7c5_p*|}5EJXl* zeVYx)1?Qaqi;gh(KI9;@scoe%eHH;Y_Z~7KS9`MyF2?3k=K~PyOq<#c>9f@gI5)9f z+~?!4Q!*2-i;%YCK+hos6J6x!TiofTz z)U0#uJcE^rL2Y+e>K2m*Fb#1=du)1{*i74T{s}|RlQC__(X7vD1Mp~^fKVS5FB4gp zcrbuwWa>vCj$UnQJEYHL15p0anv0FKMjxziWE?DqhQsfk9O3wcW!guGWxzhBhs9iiztPtaq_%2Wa+`HCF#x7H%e2kF6ll=YE2qM&d64yh z)0t)3N1%EgkC*GGAlfZ8(hq)38*E1|?lExD#dcg{r(OWj(QLSgyu-z`#JgIhhm8B& pMZDpw^Poloi2i1z3_JSo`CsD_v52H&vXKA)002ovPDHLkV1fyV&y4^8 literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/timer.png b/res/drawable-xhdpi/timer.png new file mode 100755 index 0000000000000000000000000000000000000000..fcaa753b454cc4898ea854f4241254a71a6c6b55 GIT binary patch literal 2143 zcmV-l2%z_gP)Px-8A(JzRCoc^n%i#`RTRdlid;%XY`F4u>!K&djW} zFKeyYd+j|lr)fg*XjT^`agI1sY!i`9DpQ9Ecgh^raZnr(`^9b%Sz%}@sO5QTce&Uh z;&|46MpTzT{4V|?_KCS7t6?r99+hylxJsPuDv*QhirP3Pc8UMw&|c;{6YYDlF4mMe zHL57^{Fd52Qs(Vi`l)pUtWf70#A&q{QA6FEs(Vm8p0$mv0hq21H;bjL9p_w+WVuJY zk+$6|0a&O`wuvn%JG-ayWOsN?WayIp0V@Jisa0g9fRBi2Fr>n}#NITO(guJbze!AL z+@C6YQamg6hy)=CXun-#6`)SFN$=Wm*ep+2?RIdskp*%eM++3qBjT+J1WLSZ%VK- zE{t6>)c1*BiPvMgJTGaReE^%I1>zLZ!YnDsEo`DpR0{xeo{0Ov{N5?%zDx6TdR02+ z`Fyd}Q*NPj+?>l+8D9XXyj6V2sx0|Yaj$sSQ>L1VXM=ystX4LvC*iR@W)%3Q#1iSx ziOwa`$^oqNABrua3mAMrWH{D}kIN0PwZ+Ku;u#U6lLnUU_eRmWp+nN`5XS|o) z`}XsnOP`1HYG%TEegtf378%ydMOGZ<@g?zZ(Fdjo<=EQxl{Et5H6}{H)L{F}e!~UUeDVjo zN7oX`BRlqA5CcR<07~D`XN|8m7e`wy?iYLC65sW7fsNQ|0Uz--Kr{d^NWvU)fry`S zDejZ(CH4D?r*CY;>1uXa7C)SppgS&X zfNN~uBC0vNWtT^Cv2e&zG=Q8$_nOBJpY4Iq;RvvX5}Cgd?|#&0rfzFg z5IM(od~hM~nEk%IW@CwbE#y!&EiwkoIz)Y7$vH{VmXjHkcVrvJB5BTE3Oajp6(nw}i zGK$}K@nVk!mM?7tpxLN+&5$>$*xCj4OpEng-v0;~Y= z)b*gD#W2|NB?y2~r!M04b?L>^2_wLaj;CH8DxA+d07Hgh<|y|CV9c8nqv5RLBAjQr z<6VFYmM?b*z_6=^WY+%LD4tkcg!6R%m&XFjmtg`hXjHT|NJjBQ;-Z|V^K%{xEMEo* zfVD}W5?jo?P^9zN_^V+kK3D-5AOQWIitUCjt+;6Cng7-|Kzy)nWIqAmnR!HXp~EFi zDJ$A}%;6oN_07QY0iU}Gz_4hI0$wlIf_garpA7uYW2EH+J_kvVy4Eu@|IFZhK^D}* zdFrVJwhoESYgf7dyseqp_wXOHi@`##(GvRrv7+Nbj?2pr&pW13M= zFXtKhd&L_Ln-O6%w!46@_*@A9=g0Ulu)&bW#r1NYe!msZ#0`jC`)scG8cqS~b&0nk z4Mb1*;`(e<;5c6*83CvVaNtKzN4z7%W*6`gUjsxxj`F7m*2_hss&T)3Uq3Fg=DNU+ zlD&9`*yJjZgN$MSwfK#vttrxN6*;=_gM^i&9}NJ7FNrI~%Ev>5WzgV!(U&kUO5ZCk z6(@>$g5d5Jxd|2s{B{vLUAQSBd82X@;{iZHA#1qvP%%~fO|-y=2$m)S@T3@>X1Yub zMrN1zsmKlT;TTsXkoBJ=h+bfJh{8GG}eMMe%UUR`}j zY~rpoELFQjMxFKELaG3(^!rBn+;!-daNM6ethxHQ3V$HBxLT5oyFxT8+0-Z(ipebm zl|;EnoGwllqhL)ZuopzK`#G^PRCVqH&Tka0AoHSRhe-QlU~q2w04k6VCW(v&3na#6BEh<970Ox8P1z>SuhQ;e=@0qJR0{xg zSu^K~v$!z8-5>~0i#(VRj3Q7{qg%waB7OS6Bl1390d!5(3Y7JfV{1vrNpM<)h&-7$ z58(JZu`^*~-1&oI)!dXc0Aar?bh1hGCC0EUNA?6KMMhDNm^4q&e!JKqGP0~kTB*i> z_VYAQfA~4fUt9(AXkfQOJ|3|oR3%39^3COk>`z?k!Jv+#>~^ja*-@P zN6gv}%UHk2Dsn>X6LUpY!_pYhtimOcK#<*eGDJq^hk(@p4vT{#D+P{|+>jN9{{fA; VWr;66V7CAO002ovPDHLkV1jy@1RVeX literal 0 HcmV?d00001 diff --git a/res/drawable-xxhdpi/timer.png b/res/drawable-xxhdpi/timer.png new file mode 100755 index 0000000000000000000000000000000000000000..c10cf8f7e733a766fb0f864ce99c4780208c8796 GIT binary patch literal 3282 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 literal 0 HcmV?d00001 diff --git a/res/layout/setup_loading_page.xml b/res/layout/setup_loading_page.xml new file mode 100644 index 0000000..9959095 --- /dev/null +++ b/res/layout/setup_loading_page.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + diff --git a/res/values/strings.xml b/res/values/strings.xml index 70767bf..5e1b6c6 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -33,10 +33,11 @@ New Skip anyway Don\'t skip + Loading... Setup is complete Welcome - Connect to Wi-Fi + Select Wi-Fi SIM Card Missing GMS account Choose a SIM for Data diff --git a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java index 3e45ed4..8b808dc 100644 --- a/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/GmsAccountPage.java @@ -22,6 +22,8 @@ import android.accounts.AccountManagerFuture; import android.accounts.AuthenticatorException; import android.accounts.OperationCanceledException; import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -40,6 +42,19 @@ public class GmsAccountPage extends SetupPage { super(context, callbacks); } + @Override + public Fragment getFragment(FragmentManager fragmentManager, int action) { + Fragment fragment = fragmentManager.findFragmentByTag(getKey()); + if (fragment == null) { + Bundle args = new Bundle(); + args.putString(Page.KEY_PAGE_ARGUMENT, getKey()); + args.putInt(Page.KEY_PAGE_ACTION, action); + fragment = new LoadingFragment(); + fragment.setArguments(args); + } + return fragment; + } + @Override public String getKey() { return TAG; @@ -47,7 +62,7 @@ public class GmsAccountPage extends SetupPage { @Override public int getTitleResId() { - return R.string.setup_gms_account; + return R.string.loading; } @Override @@ -60,6 +75,7 @@ public class GmsAccountPage extends SetupPage { if (action == Page.ACTION_PREVIOUS) { getCallbacks().onPreviousPage(); } else { + super.doLoadAction(context, action); launchGmsAccountSetup(context); } } diff --git a/src/com/cyanogenmod/setupwizard/setup/LoadingFragment.java b/src/com/cyanogenmod/setupwizard/setup/LoadingFragment.java new file mode 100644 index 0000000..1983806 --- /dev/null +++ b/src/com/cyanogenmod/setupwizard/setup/LoadingFragment.java @@ -0,0 +1,30 @@ +/* + * Copyright (C) 2015 The CyanogenMod Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.cyanogenmod.setupwizard.setup; + +import com.cyanogenmod.setupwizard.R; +import com.cyanogenmod.setupwizard.ui.SetupPageFragment; + +public class LoadingFragment extends SetupPageFragment { + @Override + protected void initializePage() {} + + @Override + protected int getLayoutResource() { + return R.layout.setup_loading_page; + } +} diff --git a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java index 705b932..2d764d6 100644 --- a/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java +++ b/src/com/cyanogenmod/setupwizard/setup/WifiSetupPage.java @@ -17,8 +17,11 @@ package com.cyanogenmod.setupwizard.setup; import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentManager; import android.content.Context; import android.content.Intent; +import android.os.Bundle; import com.cyanogenmod.setupwizard.R; import com.cyanogenmod.setupwizard.SetupWizardApp; @@ -32,6 +35,19 @@ public class WifiSetupPage extends SetupPage { super(context, callbacks); } + @Override + public Fragment getFragment(FragmentManager fragmentManager, int action) { + Fragment fragment = fragmentManager.findFragmentByTag(getKey()); + if (fragment == null) { + Bundle args = new Bundle(); + args.putString(Page.KEY_PAGE_ARGUMENT, getKey()); + args.putInt(Page.KEY_PAGE_ACTION, action); + fragment = new LoadingFragment(); + fragment.setArguments(args); + } + return fragment; + } + @Override public int getNextButtonTitleResId() { return R.string.skip; @@ -44,22 +60,23 @@ public class WifiSetupPage extends SetupPage { @Override public int getTitleResId() { - return R.string.existing; + return R.string.setup_wifi; } @Override public void doLoadAction(Activity context, int action) { - if (action == Page.ACTION_PREVIOUS) { - getCallbacks().onPreviousPage(); - } else { - SetupWizardUtils.launchWifiSetup(context); - } + super.doLoadAction(context, action); + SetupWizardUtils.launchWifiSetup(context); } @Override public boolean onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode != SetupWizardApp.REQUEST_CODE_SETUP_WIFI) return false; - getCallbacks().onNextPage(); + if (resultCode == Activity.RESULT_OK || resultCode == Activity.RESULT_FIRST_USER) { + getCallbacks().onNextPage(); + } else if (resultCode == Activity.RESULT_CANCELED) { + getCallbacks().onPreviousPage(); + } return true; } } diff --git a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java index e37c996..d0f2006 100644 --- a/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java +++ b/src/com/cyanogenmod/setupwizard/util/SetupWizardUtils.java @@ -57,7 +57,7 @@ public class SetupWizardUtils { intent.putExtra(SetupWizardApp.EXTRA_FIRST_RUN, true); intent.putExtra(SetupWizardApp.EXTRA_ALLOW_SKIP, true); intent.putExtra("theme", "material_light"); - intent.putExtra(SetupWizardApp.EXTRA_AUTO_FINISH, true); + intent.putExtra(SetupWizardApp.EXTRA_AUTO_FINISH, false); context.startActivityForResult(intent, SetupWizardApp.REQUEST_CODE_SETUP_WIFI); }