Commit Graph

14 Commits

Author SHA1 Message Date
Maurice Lam
ab4fb49ab1 [WifiSetup] Swap buttons position in Skip dialog
According to material-spec, buttons that keep users in the same
screen should be on the left (negative button) while button that
intorduce changes should be on the right, even if the action is
destructive.

Bug: 18542108
Change-Id: I335f83c6bb810cd43aeda28566baacea39435c57
2014-12-01 12:09:10 -08:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
2014-11-25 16:52:10 -08:00
Maurice Lam
610fdf3343 [WifiSetup] Update connection state for auto-finish
In Wi-Fi setup, when the connection state changed, query
ConnectivityManager for the latest Wi-Fi connection state instead of
relying the NetworkInfo attached in the intent, because the first
network info upon changing AP still shows the network as connected.

Bug: 17511772
Change-Id: I9c7765086dc8fbc5e1c2a37124ca89db3eab04a3
2014-09-16 11:05:28 -07:00
Maurice Lam
7a77a8b2a4 [WifiSetup] Fix colors during setup
Fixed background color for dark theme, Wi-Fi icon color for light
and dark themes, "Add another network" button color for light and
dark themes. Created wifi_signal_colored which uses wifi_signal_color
to tint the Wi-Fi icon.
Also fixed theme extra propagation.

Bug: 16903606
Change-Id: Iab24828f888d7827184762d0d63d139d0a2c381e
2014-08-11 18:53:21 -07:00
Maurice Lam
569aec7b4d [WifiSetup] Fix auto-finish suppression logic
The flag needs to be saved into the instance state, and the flag is
set as soon as auto-finish occurs to avoid multi-launching the next
activity.

Bug: 16561238
Change-Id: I954b7ff77b2d2fc35684ea59cca7d7cd588a6aab
2014-07-29 00:07:38 +00:00
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
f13c783f6b Merge "[WifiSetup] Removed button bar" 2014-06-23 21:50:10 +00:00
Maurice Lam
3c9ca35ebc [WifiSetup] Fix WifiDialog crash
Static inner class fragments need to be public.

Bug: 15742215
Change-Id: I24410b1ad6756c090fbf15f2a2ba07aa4eae5f41
2014-06-19 11:36:03 -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
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
Russell Brenner
7552ff38b1 Improve support for default theme of WifiSetupActivity
Default theme can be either dark or light, depending on the app theme
in the manifest. When processing extras, the default was always
assumed to be dark.

Change-Id: I4598ad25ffa69b63fa91cab8b07931ba37ba7676
2014-03-18 15:48:58 -07:00
Russell Brenner
e8a80b5db3 Support Holo Light theme for wifi during setup
Adds programmatic support for holo light theme, activated by setting
EXTRA_THEME to "holo_light". Light-themed graphics are still pending.

Bug: 10407819
Change-Id: I81b6bf3fdf7ca3ee72b0f921b8adf6d858415887
2013-08-28 09:44:36 -07:00
Michael Kolb
b5f006bf97 Add seperate activity for setup wizard wifi picker to adjust theme
Bug: 6517721

Change-Id: I639122435161cd4816b82ab73f91ebbcd2df027e
2012-05-18 11:23:48 -07:00