Commit Graph

194 Commits

Author SHA1 Message Date
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
Amith Yamasani
967da9517f Bring back Wi-Fi sleep policy setting for wifi-only devices.
Have a different set of strings, since we cannot mention mobile data for
a wifi-only device.

Bug: 3487952
Change-Id: I486315da40f15807f75d85d2a077a6b234a1e3d7
2011-03-02 10:36:31 -08:00
Irfan Sheriff
590e6c23b7 Use AsyncChannel in settings
Change-Id: I440f08dec986e4dad4b578ee4065d6063b8ef989
2011-02-27 22:08:33 -08:00
Amith Yamasani
0f85c48d6c Remove / re-word some settings for WiFi-only devices.
Bug: 3468248

1. Remove Wireless->Mobile networks
2. Remove Wireless->Tethering and WiFi hotspot
3. Remove Wireless->Wi-Fi Settings->Wi-Fi disconnect policy
4. Re-word Network location summary text to not include "mobile network"

Change-Id: I84a551a1b63591974731029b0d4b90a85e43a716
2011-02-24 10:53:29 -08:00
Daisuke Miyakawa
a93196f165 Take care of null in Wifi setup.
The preference isn't available in Wifi setup launched from
SetupWizard, causing NPE.

Bug: 3404998
Change-Id: Ia0dabea95e5e7424698a269c0851d610fd305309
2011-01-29 11:55:24 -08:00
Irfan Sheriff
7bdf0e73d0 Move sleep policy to main settings page
Bug: 3404049
Change-Id: I091abd737894a4adb9ebfc08b8e63bc3224b971c
2011-01-28 17:00:37 -08:00
Amith Yamasani
9eb18f0015 Fix missing title for WiFi Advanced settings.
Bug: 3360783
Change-Id: I8c22ce5a995eab26d300402471770c082f90a34a
2011-01-25 12:56:53 -08:00
Daisuke Miyakawa
14cbcb7fe8 Revise layout for Wifi Setup in XLarge screen
- revise xml for new layout
- introduce padding View objects for resizing screen when
  software keyboard is shown.
- We now don't show the detailed status of Wi-Fi module anymore
  in SetupWizard flow (like "disconnected", "connecting", etc.)
- remove Forget button and relevant code.

Bug: 3347865
Change-Id: Ieab3246f06ee73af59e247b3f9f31c7570efc71f
2011-01-17 13:34:21 -08:00
Irfan Sheriff
6377e47f8b Add UI to report WPS overlap error
Bug: 3354319
Change-Id: I4584bc3a820ace1232026920c4dc29e6b273461c
2011-01-16 13:10:32 -08:00
Irfan Sheriff
4de7499d7c Merge "Add feedback dialogs for WPS" into honeycomb 2011-01-16 13:03:10 -08:00
Daisuke Miyakawa
267d51a68a Disable long-press behavior in setupwizard.
Bug: 3355243
Change-Id: Ibe15da5ced91f975ca9c9c3c4d42cbd1c753f9d4
2011-01-15 15:21:13 -08:00
Irfan Sheriff
dee5b26892 Add feedback dialogs for WPS
Upon failure or an existing WPS session,
a dialog message is conveyed to the user

Bug: 3316078
Change-Id: Ibcf27e21058970f8f1667061c7654948c690d48e
2011-01-14 09:43:13 -08:00
Daisuke Miyakawa
4f0cd58e86 Merge "Show password field when authentication failed." into honeycomb 2011-01-12 11:02:04 -08:00
Daisuke Miyakawa
cde3083fb5 Show password field when authentication failed.
- add onAuthenticationFailure() method to prepare
  appropriate UIs.
- set "edit" boolean to true so that users can modify
  password when re-seleting a network.
- keep mStatusText shown for simplicity. It has been hidden
  during "editing" phase, but we don't need to do that any more
- modify Connect button handling so that the button
  hides/appears at appropriate time
- manage visibility state of some fields so that
  we can "reset" the status when authentication failed
- show keyboard again when password field re-appears

Bug: 3330109
Change-Id: I1cdf0573280ab46882117e21501a43a447e50b40
2011-01-12 09:59:43 -08:00
Amith Yamasani
9e3a4700b6 Remove extra button bar.
Bug: 3058024

Change-Id: Ib3c2620869729f8916178ea0c0e899635b470a8f
2011-01-12 09:12:20 -08:00
Amith Yamasani
935d6e9309 Don't add wifi entries twice, when returning from another activity.
Bug: 3209730
Change-Id: I7408a56fc10359e508be5a1d27492da2227335ce
2011-01-07 13:13:24 -08:00
Daisuke Miyakawa
8630cde72b Remove unnecessary codes around WifiSettings.
Bug: 3321110
Change-Id: Iaac35a507b8e46e2d4702f0e5cda7b515a57db67
2011-01-06 13:27:36 -08:00
Daisuke Miyakawa
0688f251af Refresh layouts for SetupWizard.
- DateTimeSettingsSetupWizardXL
- WifiSettingsForSetupWizardXL

Bug: 3308677, 3137755
Change-Id: Ifdf67aa7521de7ef0286fea2b15ce693fbf5d5ce
2010-12-28 12:06:08 -08:00
Irfan Sheriff
cdbc80afb2 Use WpsConfiguration for new API
Change-Id: I4c1544178bcb29e751db56edb781faf9145cdf86
2010-12-13 16:00:41 -08:00
Irfan Sheriff
c1bad6bc68 scan immediately when user indicates so
Bug: 3242989
Change-Id: Ia15d7a61a40b64830a7840b7d31e6b5f96b2ad78
2010-12-03 16:22:16 -08:00
Irfan Sheriff
afc2aacf00 Use new config change broadcasts
Bug: 3237735
Change-Id: I29e2807f76d54354bf501b2e7655f49386e6bf95
2010-12-03 14:15:05 -08:00
Irfan Sheriff
582ab4d414 Act on supplicant changes only when disconnected
When wifi network state is disconnected, supplicant
state changes provide more fine grained information to display.
When network is connected, the UI should ignore supplicant
state changes.

Change-Id: I46aa8c2ba80303aae5c74415825102a13cc41380
2010-11-24 09:13:14 -08:00
Irfan Sheriff
52727dd1fb Restore compareTo behavior of access point list
The Comparator with TreeList that was added during
wifi set up changes does not work well since
access point can change later.

Restore the old compareTo behavior.

Change-Id: I75681fea616792e9fd134c0d71762b4e0d46ffd6
2010-11-23 16:55:03 -08:00
Daisuke Miyakawa
58b0291fe6 Refactor WiFi code around XL setup
Major:
- move SetupWizard-related codes to WifiSettingsForSetupWizardXL as
  much as possible
- stop using Preference for configurinig wifi network. We use
  WifiConfigUiForSetupWizardXL instead, which is base on a bare View.

Minor:
- change button handling code expecting better readability.
- hide Detail button.
- modify strings a bit.
- add logs

Bug: 3175016
Change-Id: I5b29917af73aac6a82e13ba846a9d5085f9bd523
2010-11-10 15:31:10 -08:00
Daisuke Miyakawa
3dd06301fa Use custom preference.xml in XL.
A spacer are added on the left side of each preference, which isn't
needed in XL setup screen.

Change-Id: Ie3b8e04b492b4a4840ba1bbda4a413673734fbaa
2010-11-08 12:20:33 -08:00
Daisuke Miyakawa
8b3b876c09 Fix UI for WifiSettings for XL screen
Change-Id: I874e1e8d86e8b219414f6bf2ff945ea4f9ab7a6c
2010-11-04 12:44:27 -07:00
Daisuke Miyakawa
1dc3715e3a Reduce default settings in WifiSetup XL.
We don't want to show every configurations in default, while
we also don't want to complicate basic wifi logics. In order to
achive both goals, we first introduce tweaked xml file
(wifi_config_preference2.xml). It does contain all the
config components but almost all of them are in "gone" visibility.
Those components are still able to act as data storage, but never
be seen as actual UI components.

Change-Id: I4ad3c1b4cbbe77ca2b628b0be25e2b3eb9d645aa
2010-10-29 18:00:36 -07:00
Irfan Sheriff
e45e13f47a UI for wps pin from device
Bug: 3119043
Bug: 3112178
Change-Id: I573146ed0c834cb88d5f42c25fe0be3ed501a321
2010-10-26 09:58:58 -07:00
Daisuke Miyakawa
55de702961 Disable Wifi when a user press cancel in XL setup
Bug: 3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
2010-10-21 19:40:16 -07:00
Daisuke Miyakawa
c05efc1df7 UI refresh
Bug: 3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
2010-10-19 10:12:50 -07:00
Irfan Sheriff
9cf1b00657 Fix issue with limiting access points
There should not be a limit on the general
settings screen to display access points

Change-Id: I81fd438c7464a229f00dcddca359476d8684a349
2010-10-08 16:08:51 -07:00
Daisuke Miyakawa
fef4125d4e Disable buttons during first scan.
Also remove status manager code, as they should not be here.

Bug: 3069020
Change-Id: I6fcf8470066f96b7f608ceb519b0783e44307846
2010-10-06 13:34:18 -07:00
Daisuke Miyakawa
3b6aa41cce Improve UI of WifiSettingsForXL
Change-Id: Idd25251581577246ff3fb6820b9c569454292593
2010-09-29 16:09:42 -07:00
Daisuke Miyakawa
5d3c5cb9d0 Fix misc problems happening in SetupWizard XL
Change-Id: I6ba0813f36625de3d86543953972869657be50be
2010-09-28 16:04:08 -07:00
Daisuke Miyakawa
86eaa09aa4 Modify implementation around SetupWizard XL
Bug: 3005211
Change-Id: Ia01957725956d570370aceeab01750d77069001a
2010-09-24 11:06:30 -07:00
Irfan Sheriff
b3024fa6a0 Add UI for WPS
The WPS available option is shown
for networks in scan results. Upon
selecting a network, the user has
the option of manually entering passwords
or choosing WPS for connection

Bug: 2277571
Change-Id: Ia12eb1742f1bf17128d51fa09e56dc4c3f067fa5
2010-09-23 07:18:07 -07:00