Commit Graph

2352 Commits

Author SHA1 Message Date
Freeman Ng
c47e9a1d65 am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2
* commit '0fd7736b7153c1a304d7c6098ecf1223052f56d5':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
2011-06-07 12:58:06 -07:00
Freeman Ng
0fd7736b71 Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 2011-06-07 12:53:41 -07:00
Marco Nelissen
adcbf72c80 am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
* commit '079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
  Allow alternate string to be used for min_number
2011-06-07 11:15:26 -07:00
Marco Nelissen
079e30cd2a resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
2011-06-06 16:29:34 -07:00
Eric Fischer
087db10687 Import revised translations.
Change-Id: I18b4dda593468e8af5823db665ee1fb1aac6a812
2011-06-06 16:08:40 -07:00
Freeman Ng
7f6f6e18c9 use prefs-style layout for setup wizard date/time settings on non-xlarge screens
Adjusted the screen size test to fall back to phone version of
DateTimeSettingsSetupWizard on large screens.

I made the following changes from how the phone version works:

1. Some layout changes. (Tablet look, bigger margins.)
2. Use zone picker to select time zone.
3. Added isFirstRun boolean extra to hide the pref fields
we don't need to see from setup wizard

Furthermore, I made the following fixes to the existing phone flow
(which had probably never yet been tried on a phone):

1. Added conditionals around access to some variables that only
exist in the xlarge layout.
2. Implemented PreferenceFragment.OnPreferenceStartFragmentCallback
in DateTimeSettingsSetupWizard in order to catch the user tapping
on the timezone preference and show the time zone picker popup.
(Note: for phones in ICS, we might want to launch the zone picker
preferences style, like it would have been had this been a
PreferenceActivity. Or maybe we should just create a separate
DateTimeSettingsSetupWizardPhone activity that subclasses
PreferencesActivity and doesn't need to play this trick.)

Change-Id: Ib5774a005c9f44d730d86c13746d91eb712141cc
2011-06-06 12:40:28 -07:00
Jeff Brown
e79551c53d am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'a3a96d180f7b1351e6f2aaa8763dc962844fc83e':
  Add a preference panel for mouse speed.
2011-06-03 15:30:16 -07:00
Ben Komalo
11fc3c2044 am 657a7ad8: am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '657a7ad8b279c7a5bbda47c92961a6fbc7473b0b':
  Fix cryptkeeper UI for 7" tablets.
2011-06-03 15:30:14 -07:00
Amith Yamasani
2c6d0d1512 resolved conflicts for merge of 6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
2011-06-03 14:34:30 -07:00
Eric Fischer
fffb0b356e Merge "Import revised translations." 2011-06-03 10:20:35 -07:00
Jeff Brown
bb8fc4a4ea am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
  Add a preference panel for mouse speed.
2011-06-02 17:27:39 -07:00
Jeff Brown
9fc039e7bc Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:13 -07:00
Ben Komalo
1e43e694ae am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '57b17f50436e4760ad0466aadaafe2599abce442':
  Fix cryptkeeper UI for 7" tablets.
2011-06-02 17:24:42 -07:00
Eric Fischer
22d6d479fd Import revised translations.
Change-Id: I5a80f7e38686bd3ac3cbaa41e2eec06f31c065cf
2011-06-02 16:58:43 -07:00
Amith Yamasani
4baf23770e am be6cb943: am 9ef2713f: am 1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit 'be6cb943db338e528915ccb6900c1c0afb3af117':
  Reduce padding to the left of progress category to match framework changes.
2011-06-02 16:49:31 -07:00
Jeff Brown
d82487b0ff Add a preference panel for mouse speed.
Bug: 4124987

Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
2011-06-02 15:13:27 -07:00
Ben Komalo
a1d57709c2 Fix cryptkeeper UI for 7" tablets.
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered

Bug: 4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
2011-06-02 13:59:03 -07:00
Amith Yamasani
672ad8d66f am 8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '8ac8456491e1409a071c7cf4e164440aeec7c4dd':
  Move assets to default location, instead of xlarge only.
2011-06-01 18:37:38 -07:00
Amith Yamasani
8ac8456491 Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2 2011-06-01 15:43:42 -07:00
Amith Yamasani
12f55852c0 Move assets to default location, instead of xlarge only.
Bug: 4517184
Change-Id: I3d1e0c87f9c48470166dd5bfb34c02efa5854d68
2011-06-01 15:29:55 -07:00
Brian Carlstrom
79e309a9b8 Merge "Integrating keystore with keyguard (Part 4 of 4)" 2011-06-01 14:33:40 -07:00
Dianne Hackborn
2064149e42 am c837756d: am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.
* commit 'c837756d732eb1cc2c26c2d111668ac22a5ff4c6':
  Implement new manage apps UI for compat mode.
2011-06-01 11:26:25 -07:00
Freeman Ng
f75c6e20ad am f0fae7f2: am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and datetime settings look good for 7"" into honeycomb-mr2
* commit 'f0fae7f27295df2dff531a6293840479a64f7984':
  make setup wizard's wifi and datetime settings look good for 7"
2011-06-01 11:26:20 -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
Adam Powell
f5b25a9eda am 7d4e88b3: am 57218b5a: am 3c110e50: Fix account type selector for adding accounts to match holo layout guidelines.
* commit '7d4e88b3d4f4f5b17a93f3be8fe19b65df45b0d7':
  Fix account type selector for adding accounts to match holo layout guidelines.
2011-05-31 16:02:30 -07:00
Jim Miller
49b20cb5f4 am c78f8769: am fbc72cd6: am fd8f7f12: Merge "Fix 4462497: Make ownerinfo preference layout more dynamic" into honeycomb-mr2
* commit 'c78f87694ddff4badfc1953821250eb68d237330':
  Fix 4462497: Make ownerinfo preference layout more dynamic
2011-05-31 16:01:17 -07:00
Amith Yamasani
9ef2713f28 am 1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '1f7014a25aad4cd3fe5e6f34eb30d936f4da2fd4':
  Reduce padding to the left of progress category to match framework changes.
2011-05-27 14:51:28 -07:00
Amith Yamasani
1f7014a25a Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2 2011-05-27 14:49:21 -07:00
Amith Yamasani
e7da064e4f Reduce padding to the left of progress category to match framework changes.
Otherwise the WIFI/BT device names don't align with the header.

Change-Id: Ibd10cb7bb38c80a90ef895e2bdb1083b833a2824
2011-05-27 14:31:28 -07:00
Jaikumar Ganesh
a6daa21db8 am 015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread
* commit '015788ca9228312dfca30785b1801f33a3a32e9a':
  Import translations for cherry-picked Bluetooth changes.
2011-05-27 13:47:08 -07:00
Jaikumar Ganesh
bd34e568bf am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread
* commit 'eddb21a2ebd39900893da63749a00570f37e5038':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE
2011-05-27 13:47:01 -07:00
Jaikumar Ganesh
aeca185107 am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread
* commit 'c955d8ee1d2b134f8c41989b545b7b3ed830d058':
  Allow users to change the length of BT disoverability. DO NOT MERGE
2011-05-27 13:46:59 -07:00
Jaikumar Ganesh
015788ca92 Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 2011-05-27 13:28:57 -07:00
Jaikumar Ganesh
eddb21a2eb Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:49 -07:00
Jaikumar Ganesh
c955d8ee1d Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 2011-05-27 13:28:41 -07:00
Svetoslav Ganov
6f0b4d8143 Accessibility service specific settings.
This is the settings part of the change for adding
support for accessibility service specific settings.

1. Added the first cut of a SettingsCheckBoxPreference
   that is a CheckBoxPreference that optionally takes
   an intent to be lauched as settings of the item
   represented by the preference.

2. Updated the AccessibilitySettigns to use the
   SettingsCheckBoxPreference.

Change-Id: If44262b8965c65620c6b8c252f8ef356eb0d95cf
2011-05-27 13:24:31 -07:00
Eric Fischer
afe7b0466a Import translations for cherry-picked Bluetooth changes.
Change-Id: I03caaf58d9fd357801c05ae99b6131df992e7bdf
2011-05-27 12:46:07 -07:00
Jaikumar Ganesh
32c7a774f5 Changes for API of Bluetooth Discoverability. DO NOT MERGE
1. Apps can ask for any time between 0 and 3600 secs
2. O implies always discoverable
3. Any invalid values will default to the default - 120 secs.
A dialog is shown by the system to the users to accept the change
in discoverability values.

Change-Id: I34ebd907656a87508b0f0b1a4bce78134edcaebf
2011-05-27 10:32:18 -07:00
Chris Wren
cdd9d033b0 Allow users to change the length of BT disoverability. DO NOT MERGE
It can set to be two minues, five minutes, an hour, or forever discoverable.
The default is 120 secs.
This addresses the internal bug 2413429:
	http://b/issue?id=2413429
and external issue 6348:
	http://code.google.com/p/android/issues/detail?id=6348

Original Author: Chris Wren <crwen@google.com>
Modifications done by: Jaikumar Ganesh<jaikumar@google.com>

Change-Id: Ie12e56ac41aa01a161d263c7525b6e021d4eeb1f
2011-05-27 10:27:14 -07:00
Daniel Sandler
a862f2b14b Merge "Dream (screensaver) settings." 2011-05-26 20:27:55 -07:00
Eric Fischer
3fa3fdc70a Merge "Import revised translations." 2011-05-26 16:03:37 -07:00
Eric Fischer
77f9a9beef Import revised translations.
Change-Id: Ied705b2da99164f4257d2a6b7b4ce95d7bfb0052
2011-05-26 15:47:05 -07:00
sy310.choi
531bed610c am 95364e4a: Allow alternate string to be used for min_number
* commit '95364e4af3cb09bff58baab6fa4a6a2218e7fc94':
  Allow alternate string to be used for min_number
2011-05-26 13:47:20 -07:00
Eric Fischer
c3786952cc am beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit 'beee8290a23794e0c7d89ce8e6e682564e4d5a52':
  Import revised translations.  DO NOT MERGE
2011-05-26 13:46:20 -07:00
Amith Yamasani
61154c1c86 am f7d58032: am 6246d459: am e9f5a297: Merge "Fix blank Battery Use screen due to changes in framework." into honeycomb-mr2
* commit 'f7d58032cd9dc7bc553ae47cd7a8166c6afc23d0':
  Fix blank Battery Use screen due to changes in framework.
2011-05-26 11:41:41 -07:00
Eric Fischer
beee8290a2 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2 2011-05-26 11:37:50 -07:00
Eric Fischer
6514fd7398 Import revised translations. DO NOT MERGE
Change-Id: I4728d6b761331990b1424fb9a676275648a99bf4
2011-05-26 11:25:33 -07:00
sy310.choi
95364e4af3 Allow alternate string to be used for min_number
"MSID" can be shown instead of "MIN" if config_msid_enable
is set to true.

Change-Id: I6d072a5db9a5b46b17a57257221e109ba9a86698
2011-05-26 10:45:07 -07:00
Gilles Debunne
d7928912d4 resolved conflicts for merge of b593a628 to master
Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6
2011-05-26 10:35:38 -07:00
Dianne Hackborn
b4799fc9ee am aef746c4: Implement new manage apps UI for compat mode.
* commit 'aef746c45f14c8a170dba48c4b55f93cae0e24e4':
  Implement new manage apps UI for compat mode.
2011-05-26 10:02:22 -07:00