Commit Graph

179 Commits

Author SHA1 Message Date
Christopher Tate
df5a62e30b Don't crash during setup of secondary users
Make sure to call super.onActivityCreated() even in the short-circuit
case where there's an early 'return'.  This has probably been broken
for a long time but was never exercised while bringing up a new-from-
scratch device, but is the usual code path now for secondary users.

Change-Id: I0c1a5116440908d65750133689507917307e1dcd
2012-09-12 14:27:43 -07:00
Irfan Sheriff
0cd75608c0 Merge "Use updated WifiManager API" 2012-07-25 12:25:42 -07:00
Irfan Sheriff
5cd1bbda7d Use updated WifiManager API
Change-Id: Ia02fc8a7eafa84fa4eddeeefafa7fecaac82903e
2012-07-25 09:58:46 -07:00
Fabrice Di Meglio
79d8e80a30 Make Settings app aware of layout direction
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: I696c0f66a16640af767da3c05b5d300fd2284ecb
2012-07-24 15:02:12 -07:00
Russell Brenner
58d6ffc5f5 Disable notification alerts in Settings for SUW
When activated by Setup Wizard, disable notification alerts and other
status bar flags as also done by Setup Wizard and GSF.

Bug: 6645469
Change-Id: I43ef5c2a5fa3f53434a1aaa968de50d91b0d78ce
2012-06-11 17:50:44 -07:00
Michael Kolb
9d5a6eb4d7 Match setup wizard wifi settings with new wireframes
Bug: 6521472

Change-Id: I159d8a98327ad775b2c5ccfc7380d60d62b54dad
2012-05-23 11:19:47 -07:00
Russell Brenner
1c0a8f953b Merge "Wifi select screen redlines" into jb-dev 2012-05-17 12:49:15 -07:00
Irfan Sheriff
4837a691ce Use icons in wifi settings
Bug: 6469022
Change-Id: I1bbd7681f3800db9387eb998da78cf0a42109600
2012-05-16 14:12:35 -07:00
Russell Brenner
fc86669031 Wifi select screen redlines
Bug: 6458336

Use proportional layout when wifi settings is used
by setup wizard

Change-Id: I91f50df29b23b1bece9cbd65a1426f8bc8d7c7f7
2012-05-16 11:11:15 -07:00
Russell Brenner
e99006f75b Merge "Add wps icon to wifi panel" into jb-dev 2012-05-15 20:28:38 -07:00
Russell Brenner
fc1281e6a8 Add wps icon to wifi panel
Bug: 6449333
Change-Id: Iba74e895105253594bcfe8f0d98353714a816065
2012-05-15 16:16:43 -07:00
Irfan Sheriff
53fa78fcb2 Merge "Push wifi direct to overflow menu" into jb-dev 2012-05-15 11:39:02 -07:00
Irfan Sheriff
0c925dc715 Push wifi direct to overflow menu
Bug: 6469022
Change-Id: I62e4b4372416a5fbaf43a52be71f7291b761997b
2012-05-15 11:32:21 -07:00
Russell Brenner
44a49ed67e Include Add Network button for Setup Wizard
To allow first-time users to set up on networks with hidden SSID,
include this button on the action bar. Temporarily using
placeholder text until artwork is available.

Bug: 6446220
Change-Id: I437ad3f37b42b93f7a0c6838cbb0c5090073e32d
2012-05-09 22:34:39 -07:00
Andrew Flynn
0575736cdc Allow WiFi picker to exit after a valid connection is made
Choice is passed in via boolean extra and has two effects:
* A valid network connection exits the picker.
* The next button (if there is one) is hidden.

This functionality will be used for SetupWizard initially.

Bug: 6428046
Change-Id: Ieeed3a9f1013cccd76bd4762131747a57a38ce9c
2012-05-08 15:50:45 -07:00
Andrew Flynn
bfff317559 Hide Back button when requesting intent says to
Change-Id: I79ed35843500f20367568510ea8df3afe543ede8
2012-05-08 13:50:53 -07:00
Russell Brenner
cfadc35af8 Add WPS Push Button back into Setup Wizard Wi-Fi
This isn't yet the image button shown in the UX flows, but pending
artwork and some potential tricky Preference layout changes, this
will give access to the WPS functionality.

Bug: 6449333
Change-Id: Ibda0e48cf972dad10c7e92a7482fca9b3c104559
2012-05-06 16:04:08 -07:00
Irfan Sheriff
a90015c2c9 Merge "Add wifi direct menu only for supported devices" into jb-dev 2012-04-30 17:12:33 -07:00
Irfan Sheriff
e8d79cf188 Add wifi direct menu only for supported devices
Bug: 6421096
Change-Id: Iaf0ad85e97be8d750dd74808f840c6731d8130fd
2012-04-30 16:30:35 -07:00
Irfan Sheriff
3ab5c6838f Ignore invalid network forget
Bug: 6397063
Change-Id: I066bd45e95b7e8671bc7dfcb83e46246f110b3a9
2012-04-27 15:36:30 -07:00
Russell Brenner
fc5dd2cbf0 Restore look of Wi-Fi panel for Setup Wizard
As part of the Wi-Fi refresh, this CL hides the action bar, menu, and
Settings icon in the context of the Setup Wizard. Dead code related
to WifiSettingsForSetupWizardXL has also been removed.

Bug: 5364589
Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b
2012-04-25 16:31:23 -07:00
Amith Yamasani
9da80a90be Fix NPE due to delayed event handling.
a.k.a., annoying monkeys.

Bug: 6336430
Change-Id: Ie038a71d0ae66b3f30ccd704529f767fa2058542
2012-04-24 11:35:38 -07:00
Amith Yamasani
b0b37ae21c Help menus for several screens.
Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38
2012-04-23 15:35:36 -07:00
Vishal Mahaveer
6243e8e466 Wifi: Update message when scan result is empty
Handle case when Wi-Fi scan result is empty

Change-Id: I03ccbf2603367efa3c6dfe20514e8c7c5a68b5d9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-04-13 21:45:38 -07:00
Irfan Sheriff
6ac5554d30 P2p UI fixes
- Move Wi-Fi direct as a setting in Wi-Fi
- Handle some UI refresh issues

Change-Id: Idc43a2ca98acc4b904ca1f5fe0b1447ee612f218
2012-03-07 10:54:06 -08:00
Irfan Sheriff
90380120e7 Enhance and fix WPS UI
- Fixes WPS usage for open network
- Exposes WPS on UI for easy access to push button and pin based techniques
- Adds support for cancelling WPS
- Adds a dialog that reports a progress since WPS can take quite a bit of time
to complete

The WpsDialog code is enhanced from contribution by yoshihiko.ikenaga@jp.sony.com
on partner source.

Change-Id: Ib0103507e0192e8195e7bfeb1c8e8855c20e23ca
2012-03-02 14:25:00 -08:00
Irfan Sheriff
8f2f08e0ee Use new WifiManager API
Change-Id: I9cc092e98412146a07c1829cacab47b8cea0bc9a
2012-03-01 13:53:37 -08:00
Irfan Sheriff
09a9b38fbc Add support for wifi verification before connect
Change-Id: Ie1fb9c2fad4f75985077236eab61c296314f4fe4
2012-02-29 19:32:40 -08:00
Isaac Levy
cc38b49392 WifiSettings cleanup; emptyListi() instead of null
Change-Id: I0fced1f00ff259aed98988f0913383c50a3c6427
2011-08-26 14:29:22 -07:00
Isaac Levy
fdac5bae25 Speeding up WifiSettings AP list printout
Change-Id: Idc82ba7320469e05984ba6ac9f7d2cf927dfaa00
2011-08-25 19:31:20 -07:00
Irfan Sheriff
9284d48a8a Merge "Autojoin new unsecured networks without dialog" 2011-08-23 13:02:35 -07:00
Isaac Levy
22d441acdb Autojoin new unsecured networks without dialog
Unsaved, open wifi networks will connect on single click
without opening the connect dialog box

Change-Id: I71da155aa8b711309f0ed7eca4bd22a254db28c5
2011-08-23 12:28:44 -07:00
Gilles Debunne
348b62e6e9 Bug 5078738: some options moved to overflow menu
Change-Id: I4ea41dfcd2b0d05de870fb8af5a7614970538491
2011-08-19 16:20:57 -07:00
Jeff Sharkey
e1246c5263 Merge "Follow preferences padding changes in framework." 2011-08-18 10:52:06 -07:00
Isaac Levy
8b2bf2e538 Changed wifi status lines per UX consult
Change-Id: I656fa2c5c52338b320796a919edb5018e7b68851
2011-08-16 17:15:27 -07:00
Jeff Sharkey
dcf8ba9eb2 Follow preferences padding changes in framework.
Change-Id: Ia83237290da035e5ee7a2e92ef56fc02838aac56
2011-08-16 16:37:49 -07:00
Gilles Debunne
c1eab91f07 Wifi state reset when disconnected
https://review.source.android.com/19086

Change-Id: Ie7367f2240b94569fed3120244f1cb268bb09206
2011-08-08 11:54:30 -07:00
Amith Yamasani
3d13110d40 Save and restore wifi dialogs on screen rotation.
Bug: 4981732

Change-Id: If065f9af93af405d954fde044351e473d62ea91b
2011-08-04 13:15:30 -07:00
Gilles Debunne
cd8e5246f1 Text instead of icons in account settings options
Also changed the default style to remove the opaque title background.

Change-Id: I948d9a15961223c3703bb607e2e5a6bf41e0ff5e
2011-07-25 14:01:12 -07:00
repo sync
b98463f8b0 Updated: Wi-Fi p2p initial UI implementation
Change-Id: If60f42f76fa07a868d2e11b012b4697252c69f5f
2011-07-24 11:16:50 -07:00
Gilles Debunne
18e9992a5e Changed text and appearance when Wifi/Bluetooth is off
A TextView is used as an empty view, centered on screen with the message.

Change-Id: I33825775d6b2ed212e5839cfac84d055b9336667
2011-07-07 16:04:00 -07:00
Gilles Debunne
dcff7338ad AdvancedSettings replaced by AdvancedWifiSettings
Change-Id: Ie51d14c9961e8780c8774bbe56e113cf85357817
2011-06-30 17:21:09 -07:00
Gilles Debunne
dc7101ff88 Split ActionBar in Settings
Made menu item visible to force action bar, changed style.

Also change parent_fragment for items that have been moved to top level (wifi,
bluetooth, development, battery).

Change-Id: I62932ba55356abdfbf94942f5b4efaa0f15dbd6a
2011-06-27 17:00:23 -07:00
Gilles Debunne
e78c187905 Settings refactoring
Wifi and bluetooth pane refactored, main toggles moved to left pane.

Change-Id: I42ea4cf3bdf24158f3c67e0dea311258206cd78a
2011-06-21 11:05:29 -07:00
Irfan Sheriff
32232fd9f2 am 4a1b8898: am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE
* commit '4a1b8898c76a98f14bbc1690f172ec0e6171fab2':
  Fix UI settings display issues
2011-06-08 17:32:04 -07:00
Irfan Sheriff
317e0aa530 Fix UI settings display issues
- Update access points to reflect the latest IP configuration
- Show IP list for static IP networks

Bug: 4391449
Change-Id: If8fb6fe8bdca9d6e635b1b12927c17e1661f200c
2011-06-07 12:28:26 -07:00
Brian Carlstrom
d4023b7cca Integrating keystore with keyguard (Part 4 of 4)
Summary:

frameworks/base
  keystore rewrite
  keyguard integration with keystore on keyguard entry or keyguard change
  KeyStore API simplification

packages/apps/Settings
  Removed com.android.credentials.SET_PASSWORD intent support
  Added keyguard requirement for keystore use

packages/apps/CertInstaller
  Tracking KeyStore API changes
  Fix for NPE in CertInstaller when certificate lacks basic constraints

packages/apps/KeyChain
  Tracking KeyStore API changes

Details:

frameworks/base

   Move keystore from C to C++ while rewriting password
   implementation. Removed global variables. Added many comments.

	cmds/keystore/Android.mk
	cmds/keystore/keystore.h
	cmds/keystore/keystore.c => cmds/keystore/keystore.cpp
	cmds/keystore/keystore_cli.c => cmds/keystore/keystore_cli.cpp

   Changed saveLockPattern and saveLockPassword to notify the keystore
   on changes so that the keystore master key can be reencrypted when
   the keyguard changes.

	core/java/com/android/internal/widget/LockPatternUtils.java

   Changed unlock screens to pass values for keystore unlock or initialization

	policy/src/com/android/internal/policy/impl/PasswordUnlockScreen.java
	policy/src/com/android/internal/policy/impl/PatternUnlockScreen.java

   KeyStore API changes
   - renamed test() to state(), which now return a State enum
   - made APIs with byte[] key arguments private
   - added new KeyStore.isEmpty used to determine if a keyguard is required

	keystore/java/android/security/KeyStore.java

   In addition to tracking KeyStore API changes, added new testIsEmpty
   and improved some existing tests to validate expect values.

	keystore/tests/src/android/security/KeyStoreTest.java

packages/apps/Settings

    Removing com.android.credentials.SET_PASSWORD intent with the
    removal of the ability to set an explicit keystore password now
    that the keyguard value is used. Changed to ensure keyguard is
    enabled for keystore install or unlock. Cleaned up interwoven
    dialog handing into discrete dialog helper classes.

	AndroidManifest.xml
	src/com/android/settings/CredentialStorage.java

    Remove layout for entering new password

	res/layout/credentials_dialog.xml

    Remove enable credentials checkbox

	res/xml/security_settings_misc.xml
	src/com/android/settings/SecuritySettings.java

    Added ability to specify minimum quality key to ChooseLockGeneric
    Activity. Used by CredentialStorage, but could also be used by
    CryptKeeperSettings. Changed ChooseLockGeneric to understand
    minimum quality for keystore in addition to DPM and device
    encryption.

	src/com/android/settings/ChooseLockGeneric.java

    Changed to use getActivePasswordQuality from
    getKeyguardStoredPasswordQuality based on experience in
    CredentialStorage. Removed bogus class javadoc.

	src/com/android/settings/CryptKeeperSettings.java

    Tracking KeyStore API changes

	src/com/android/settings/vpn/VpnSettings.java
	src/com/android/settings/wifi/WifiSettings.java

   Removing now unused string resources

	res/values-af/strings.xml
	res/values-am/strings.xml
	res/values-ar/strings.xml
	res/values-bg/strings.xml
	res/values-ca/strings.xml
	res/values-cs/strings.xml
	res/values-da/strings.xml
	res/values-de/strings.xml
	res/values-el/strings.xml
	res/values-en-rGB/strings.xml
	res/values-es-rUS/strings.xml
	res/values-es/strings.xml
	res/values-fa/strings.xml
	res/values-fi/strings.xml
	res/values-fr/strings.xml
	res/values-hr/strings.xml
	res/values-hu/strings.xml
	res/values-in/strings.xml
	res/values-it/strings.xml
	res/values-iw/strings.xml
	res/values-ja/strings.xml
	res/values-ko/strings.xml
	res/values-lt/strings.xml
	res/values-lv/strings.xml
	res/values-ms/strings.xml
	res/values-nb/strings.xml
	res/values-nl/strings.xml
	res/values-pl/strings.xml
	res/values-pt-rPT/strings.xml
	res/values-pt/strings.xml
	res/values-rm/strings.xml
	res/values-ro/strings.xml
	res/values-ru/strings.xml
	res/values-sk/strings.xml
	res/values-sl/strings.xml
	res/values-sr/strings.xml
	res/values-sv/strings.xml
	res/values-sw/strings.xml
	res/values-th/strings.xml
	res/values-tl/strings.xml
	res/values-tr/strings.xml
	res/values-uk/strings.xml
	res/values-vi/strings.xml
	res/values-zh-rCN/strings.xml
	res/values-zh-rTW/strings.xml
	res/values-zu/strings.xml
	res/values/strings.xml

packages/apps/CertInstaller

  Tracking KeyStore API changes
	src/com/android/certinstaller/CertInstaller.java

  Fix for NPE in CertInstaller when certificate lacks basic constraints
	src/com/android/certinstaller/CredentialHelper.java

packages/apps/KeyChain

  Tracking KeyStore API changes
	src/com/android/keychain/KeyChainActivity.java
	src/com/android/keychain/KeyChainService.java
	support/src/com/android/keychain/tests/support/IKeyChainServiceTestSupport.aidl
	support/src/com/android/keychain/tests/support/KeyChainServiceTestSupport.java
	tests/src/com/android/keychain/tests/KeyChainServiceTest.java

Change-Id: I80533bf8986a92b0b99cd5fb1c4943e0f23fc1c8
2011-06-01 10:47:42 -07:00
Amith Yamasani
1ad4824d84 am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
* commit '35bc6b5f151ea073522f14067eb92aab3a99bc7d':
  Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 13:48:26 -08:00
Amith Yamasani
35bc6b5f15 Wifi disconnect policy summary text should not contain "mobile data".
Bug: 4026299

Change the summary if it is a wifi-only device.

Change-Id: I433113d9fc430ab06efec81b6934a03dbb17ca1b
2011-03-08 12:03:13 -08:00
Amith Yamasani
fb6f306a2b am 665fc6aa: am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb
* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.
2011-03-02 22:16:41 -08:00