Commit Graph

9 Commits

Author SHA1 Message Date
Maurice Lam
6a627652cb [WifiSetup] Mechanism for suspending auto finish
We have been using forget() to prevent auto-reconnection when the
user hits back to Wifi setup. This has the side effect of forgetting
networks, which is undesirable especially for password protected APs.

The new mechanism keeps a flag on whether the user has selected a
connection. Only auto-advance if the user has picked a network and
there is a valid WiFi connection.

The new EXTRA_REQUIRE_USER_SELECTION can specify whether a user
selection is required initially. That is, whether to auto finish if
the system connected to a network without user input. The default is
false so WiFi can be skipped if the user started setup wizard with
a valid WiFi connection (e.g. after System Update). Note that a user
selection is always required when the user goes back from the next
screen.

Since the new AP dialog does not have a connect button, the SKIP
button in the navigation bar also changes to NEXT when there is a
valid WiFi connection, so the user can hit NEXT if they decided not
to change the network.

Bug: 15333554
Bug: 15999487
Change-Id: I98e935b8e09e470a0c49c44bc299bb2eced98634
2014-07-17 20:47:04 -07:00
Maurice Lam
5aee7d5c68 [WifiSetup] Make illustration header not clickable
No more "pop" sound when the illustration is tapped on.

Bug: 16331851
Change-Id: Ib528e1d6f669f71e0c2f24164726cee47b06700b
2014-07-15 18:24:18 -07:00
Maurice Lam
588e61aa05 [WifiSetup] L layout update
Changed the layout based on the new design mocks. Copied over
StickyHeaderListView and SetupWizardHeader. Currently using the
generic illustration but will update to Wifi setup specific version
once we get them.

Change-Id: I22bdef8c9860d419be55938e1e4a6a682db5b7e8
2014-07-09 19:33:28 -07:00
Maurice Lam
f13c783f6b Merge "[WifiSetup] Removed button bar" 2014-06-23 21:50:10 +00:00
Maurice Lam
9f59de930a [WifiSetup] Restore enableNext behavior
Partial revert of ag/475394 which moved enable-next-on-connect
behavior to setup wizard specific code. But account creation was
using it outside of setup wizard context.

Change-Id: I575976207a3ba2b5dac7e5467036e6ec7f519d9d
2014-06-20 15:27:25 -07:00
Maurice Lam
432bd3aab1 [WifiSetup] Removed button bar
Removed button bar from setup_preference because the same feature
is provided in SettingsActivity already.
Also removed setup custom button because that functionality is
superceded by the navigation bar.

Change-Id: I7f853d57bb63ad3c410e2731d1485d152f806d9f
2014-06-17 16:59:28 -07:00
Maurice Lam
6776c67ac1 [WifiSetup] Use setup navigation bar
Use the setup navigation bar in wifi setup activity.

1. Include frameworks/opt/setupwizard/navigationbar/common.mk in the
make file.
2. Make WifiSetupActivity implement NavigationBarListener
3. Added the fragment in setup_preference.xml, wrapping the whole
screen in a LinearLayout
4. Moved skip and next screen logic to WifiSetupActivity, refactored
the skip dialogs into a fragment

Change-Id: Ia973c0a61faa3ead201bd10d5aa8de4bc6e091c1
2014-06-16 17:19:14 -07:00
Russell Brenner
c56c8c99e9 Don't advance when recreating from bundle
The fragment is recreated from a bundle when returning from finished
activities, like the OTA and walled garden checks. Telling
WizardManager to advance to the next screen causes a duplicate
activity because WizardManager has already responded to the other
finished activity.

Bug: 15393012
Change-Id: I9817e106a0b243b3943bff6edafc228e9e002232
2014-06-04 17:32:22 -07:00
Russell Brenner
d3446c5708 Refactor setup wizard-related code
Extracted setup-related code from WifiSettings, putting it into a new
derived class, WifiSettingsForSetupWizard.

Set taskAffinity to com.android.wizard, for alignment with other
setup wizard-related tasks.

Change-Id: If371f219dac5d3eff8f7899c16cc6f9475be47cf
2014-05-30 16:16:30 -07:00