Commit Graph

526 Commits

Author SHA1 Message Date
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
22559fcac9 Merge "Split ActionBar in Settings" 2011-06-28 11:39:46 -07:00
Isaac Levy
a2f301cc66 Add WifiWatchdogService toggle to Wifi Settings
Toggle is located in Settings->Wifi Settings->Advanced Wifi Settings

Change-Id: I0f8f2b6353842dae0b47dca1dd48994e42505169
2011-06-27 18:17:42 -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
Freeman Ng
0a24ca3b18 am 6beb924e: am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit '6beb924ec2b147d259cd3438f56cd88691fc57e5':
  add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 18:20:19 -07:00
Irfan Sheriff
f448c32d9b Merge "Fix UI settings display issues" into honeycomb-LTE 2011-06-07 13:54:53 -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
Freeman Ng
351367bbd8 am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2
* commit 'f368d4dc525f79b09bd1e36b96d0ec5b179a1e8c':
  add options to lock suw wifi setup orientation into portrait or landscape
2011-06-07 11:48:33 -07:00
Freeman Ng
f54fec5939 add options to lock suw wifi setup orientation into portrait or landscape
bug: 4522454
Change-Id: I30ba3d4b5d0e4949ed6744cc9f0f68306fec9ce8
2011-06-06 16:27:55 -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
Irfan Sheriff
af7686819b am b7c2d5b4: am 7c210ba5: Fix invalid linkspeed display
* commit 'b7c2d5b4e1bafe543d3887d350b3e77d71a0cf34':
  Fix invalid linkspeed display
2011-05-24 12:56:26 -07:00
Irfan Sheriff
c82ba4a385 am 87661736: am 5ee2fb92: Merge "Fix submit button display for WPS" into honeycomb-LTE
* commit '8766173651668a18b3cf8ea2ce545d5178eddb6c':
  Fix submit button display for WPS
2011-05-24 12:56:23 -07:00
Irfan Sheriff
7c210ba5c1 Fix invalid linkspeed display
Bug: 4391449
Change-Id: I8c8efcaa73d09c1e8b523f7798b6c626edc96c1e
2011-05-23 16:47:02 -07:00
Irfan Sheriff
21e644a9a8 Fix submit button display for WPS
Change Icd3fde90 exposed an existing issue where password validity was
being checked for WPS as well. Fix it.

Bug: 4391449
Change-Id: I60ca8869eee680f5ec71284a1ac6ba956a992312
2011-05-20 16:50:23 -07:00
Irfan Sheriff
3493c20433 am ba46f269: am a6f178a8: Merge "Fix enabling of submit button" into honeycomb-LTE
* commit 'ba46f269abf8cbafaf68902a23935a1779aa316d':
  Fix enabling of submit button
2011-05-19 17:18:12 -07:00
Irfan Sheriff
990c3ad530 Fix enabling of submit button
Change I478c915b introduced a regression where the submit
button is enabled even if no password is entered for a secure
network.

This happened because our checks would override a password
check when IP and proxy settings are valid (which is the default
setting)

Bug: 4462439
Change-Id: Icd3fde90759f33fa391ec79ae8075b6d8388d2e9
2011-05-19 16:06:31 -07:00
Robert Greenwalt
0edf6a79a4 am d65d1adb: am 3c3490c8: Use new RouteInfo class.
* commit 'd65d1adb5613107583f0cf208d7650c822f581e2':
  Use new RouteInfo class.
2011-05-02 13:32:15 -07:00
Robert Greenwalt
3c3490c819 Use new RouteInfo class.
Change-Id: I144ebb87e6d1809f59ebd32e64e186d836a365f8
2011-04-29 17:13:44 -07:00
Amith Yamasani
cb6a9bc307 am cb84ad52: am 1ad4824d: am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data".
* commit 'cb84ad529d802e60931d94b68912ee85c9758952':
  Wifi disconnect policy summary text should not contain "mobile data".
2011-03-08 18:39:59 -08: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
Daisuke Miyakawa
6a7b3d9949 Handle "scanning" status correctly
Bug: 4026282
Change-Id: I7dc113122a8611095642e1a70334d7cdc165173f
2011-03-07 16:29:50 -08:00
Daisuke Miyakawa
ffce5dabbb Show "disconnected" progress bar on add network flow
Change-Id: I4dc2df9016f21f655a13c244b744020de4a12d0b
2011-03-07 16:07:02 -08:00
Daisuke Miyakawa
f26b2b5110 Fix padding problem around progress bar
Change-Id: I3f76b4f01ed433e68a839f02c2c1840c60749ef1
2011-03-04 13:08:44 -08:00
Irfan Sheriff
5640ccff74 Avoid dialog dismiss until IP and proxy is valid
Accepting an invalid configuration can lead to
unexpected behavior.

Validate all fields before dismissing dialog. A further
improvement to this can be highlighting the faulty field
to the user by a color change.

Bug: 3462049
Change-Id: I0d0a6eae1d62b16fbb822261c4536c4108a5866d
2011-03-03 15:04:23 -08:00
Irfan Sheriff
00615cf5dc DO NOT MERGE Proxy and IP fixes
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields

Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
2011-03-03 15:01:07 -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
Daisuke Miyakawa
027d610205 Merge "Notify "skip to caller." 2011-03-02 18:25:53 -08:00
Amith Yamasani
80c1e9ff0e Merge "Move up wifi tethering settings one level." 2011-03-02 16:52:41 -08:00
Amith Yamasani
84a042c6e9 Move up wifi tethering settings one level.
Bug: 3249998

Remove an extra level of menu by moving the Configure Wi-Fi hotspot preference to the Tethering settings page.

Change-Id: I20b67ae1ddd7e9967c99ff6a8039799be792382f
2011-03-02 16:31:38 -08:00
Daisuke Miyakawa
83183f4698 Notify "skip to caller.
Bug: 3504698
Change-Id: Ifb39830ff15943a3ef1a0130a8620049fe481ff9
2011-03-02 15:56:45 -08:00
Daisuke Miyakawa
6291d50b5d Shrink screen correctly on authentication failure
Bug: 3505089
Change-Id: Ibbd54c6afb0d349fb446775af93412e7557df3c5
2011-03-02 13:48:45 -08:00
Daisuke Miyakawa
d1c22a1b56 Show more graceful screens for "add network" flow
- use TableLayout instead of RelativeLayout for
  wifi configuration to align each columns appropriately.
- split @id/type field into two fields in SetupWizard

Bug: 3403168
Change-Id: I37f2c60ce1b0473af7d20dee1775e9893d2abade
2011-03-02 13:05:14 -08:00
Amith Yamasani
0c62c6449b am 38d3353e: am 03e90322: Merge "Remove more entries not relevant to wifi-only devices." into honeycomb
* commit '38d3353e37be450b1b95d2525acbd53e9b67130e':
  Remove more entries not relevant to wifi-only devices.
2011-03-02 12:53:31 -08:00
Daisuke Miyakawa
302b057207 Remove unnecessary visibility change hack
Bug: 3502198
Change-Id: I173323eabe7bc5f8ff89b01e71bf00b1b5a83bff
2011-03-02 12:41:54 -08:00
Daisuke Miyakawa
dfd492df3f Remove bottom padding below wifi preference.
- show bottom padding only when top bar is using static View
- hide wifi preference when ProgressBar is used
- show bottom padding when top bar is using static View and
  wifi preference is hidden.
- rename wifi_config_padding to content_padding, as it is not
  just for wifi config but for acquiring default hight of
  @id/content
- update screen state correctly

Bug: 3502220
Change-Id: I86c89435f43d6bd016a78f7afeb5f477f63d0696
2011-03-02 12:37:30 -08:00
Daisuke Miyakawa
851e68a97c Merge "Not show connecting screen when editing a network" 2011-03-02 12:25:51 -08:00
Daisuke Miyakawa
c4a495fb5b Not show connecting screen when editing a network
Bug: 3505089
Change-Id: I4793cca80b70e9a7f8ac8d3703e22424d181ac67
2011-03-02 12:24:56 -08:00
Robert Greenwalt
923a41bf8b Merge "Use new NetworkUtils.numericToInetAddress." 2011-03-02 12:24:25 -08:00
Amith Yamasani
b7e393bf9b Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb 2011-03-02 10:51:36 -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
Daisuke Miyakawa
2adae4e274 Clean up for Wifi setup XL
Change-Id: I5f5c6764be244252cb91331b59d920a54cc03e86
2011-03-01 14:27:45 -08:00
Amith Yamasani
c06d4c48a9 Remove more entries not relevant to wifi-only devices.
Bug: 3488384
Bug: 3487976
Bug: 3488381

Removed Cell standby entry from Battery use screen.
Removed Mobile signal strength from BatteryHistory screen.
Added wifi IP address to About->Status
Remove auto-timezone checkbox in Settings->Date & time

Change-Id: I228721a3613b1aeb600026e42274337886552698
2011-03-01 12:03:24 -08:00
Irfan Sheriff
2a450a010a Merge "Use AsyncChannel in settings" 2011-03-01 11:32:28 -08:00
Irfan Sheriff
02ec121900 Merge "Handle airplane mode change for hotspot settings" 2011-02-28 10:37:51 -08:00
Irfan Sheriff
590e6c23b7 Use AsyncChannel in settings
Change-Id: I440f08dec986e4dad4b578ee4065d6063b8ef989
2011-02-27 22:08:33 -08:00
Daisuke Miyakawa
7e3ff8eca6 Tiny fix for Wifi setup XL.
Change-Id: I918f4bc8dfbb84a3bdaf6aa74f326f2f5e22bfe2
2011-02-25 17:12:56 -08:00