Commit Graph

4168 Commits

Author SHA1 Message Date
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
2a18319a1a am 1334d7fc: am 300c4f61: am 3a5b3494: Make the BT class icon visible.
* commit '1334d7fc3a3a1fd2f48aed93d9344115d674fcc2':
  Make the BT class icon visible.
2011-06-03 15:29:25 -07:00
Gilles Debunne
99da1a22a3 Always show unmount confirmation dialog
Somehow related to bug 4534261

Change-Id: I2a64406ced4a2c231114d7bb949b84c59199fd82
2011-06-03 14:47:13 -07:00
Amith Yamasani
2c6d0d1512 resolved conflicts for merge of 6c82fe07 to master
Change-Id: I90943867003999f890c66b3f72ec1ccf19b2d6a6
2011-06-03 14:34:30 -07:00
Gilles Debunne
4f734d9d59 Used space visible in SD Card bar graph
Bug 4544470

Change-Id: Iccae9bb568f1f7baf81c702f29f7a9e238d39d2b
2011-06-03 14:30:39 -07:00
Eric Fischer
fffb0b356e Merge "Import revised translations." 2011-06-03 10:20:35 -07:00
Brian Carlstrom
5a137f7f34 Merge "Bulletproof CredentialStorage state handling" 2011-06-02 21:06:56 -07:00
Brian Carlstrom
0e88f4dd19 Bulletproof CredentialStorage state handling
As noted by the class javadoc, CredentialStorage has seen the number
of cases to cope with grow. This change tries to address those cases.

	src/com/android/settings/CredentialStorage.java

Added ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD to coordinate
additional producer and consumer.

    constant declaration here, since its used by callers of
    ChooseLockSettingsHelper.launchConfirmationActivity
	src/com/android/settings/ChooseLockSettingsHelper.java

    old producer
	src/com/android/settings/ConfirmLockPassword.java
    new producer (CredentialStorage wants passwords and patterns)
	src/com/android/settings/ConfirmLockPattern.java
    new consumer
	src/com/android/settings/CredentialStorage.java
    old consumer
	src/com/android/settings/CryptKeeperSettings.java

Made class final and removed protected from method to make it clear
ChooseLockSettingsHelper is not to be used by subclassing.

	src/com/android/settings/ChooseLockSettingsHelper.java

Change-Id: Ib2d65398fe44573168a6267a0376c3b0388b16c8
2011-06-02 21:06:21 -07:00
Amith Yamasani
51a1bb15ea am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit 'ad4662223210827df1e62ba4c7ec24dba80a47df':
  Fix account type dialog re-creation on orientation change.
2011-06-02 18:29:49 -07:00
Amith Yamasani
ad46622232 am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2
* commit '51a9d15722b3c94ac92e05b19048b678247b034e':
  Fix account type dialog re-creation on orientation change.
2011-06-02 18:27:54 -07:00
Amith Yamasani
51a9d15722 Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2 2011-06-02 18:26:28 -07:00
Amith Yamasani
7bb8f7288e Fix account type dialog re-creation on orientation change.
Bug: 4499512

Dummy activity that launches ChooseAccountActivity was re-launching it on orientation
changes. Make sure that it only launches it one time.

Change-Id: I764a59eaefc3ce4546330ed1b994d88b8703ce80
2011-06-02 18:23:55 -07:00
Jeff Brown
a3a96d180f am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2
* commit 'bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
  Add a preference panel for mouse speed.
2011-06-02 17:31:11 -07:00
Ben Komalo
657a7ad8b2 am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '1e43e694ae0822426d4759aa2d5192cbe5d15d63':
  Fix cryptkeeper UI for 7" tablets.
2011-06-02 17:28:25 -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
Ben Komalo
57b17f5043 Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2 2011-06-02 17:21:39 -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
Gilles Debunne
8d055f3270 am b667422c: am 41a99004: am 53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2
* commit 'b667422cfdaf73d693bf79ce6186e082b68862b8':
  Erase SD Card fixed in Settings/Storage.
2011-06-02 15:07:51 -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
1334d7fc3a am 300c4f61: am 3a5b3494: Make the BT class icon visible.
* commit '300c4f61d823936e4a34fcece25c14c73877c994':
  Make the BT class icon visible.
2011-06-02 13:17:05 -07:00
Amith Yamasani
300c4f61d8 am 3a5b3494: Make the BT class icon visible.
* commit '3a5b3494a7543c1ddb66c6f630856c3aace03f0a':
  Make the BT class icon visible.
2011-06-02 13:13:38 -07:00
Amith Yamasani
3a5b3494a7 Make the BT class icon visible.
This change is required due to a change in the framework to accomodate smaller screen sizes.

Bug: 4519989
Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
2011-06-02 11:48:55 -07:00
Eric Fischer
275ffe60eb am 3518cdf9: (-s ours) am c3786952: am beee8290: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr2
* commit '3518cdf91489264226564898177e7738ff28683c':
  Import revised translations.  DO NOT MERGE
2011-06-02 03:20:48 -07:00
Amith Yamasani
6c82fe07cc am 672ad8d6: am 8ac84564: Merge "Move assets to default location, instead of xlarge only." into honeycomb-mr2
* commit '672ad8d66f61db0804fcf4ba9a0db067272a4b50':
  Move assets to default location, instead of xlarge only.
2011-06-01 19:06:55 -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
Jeff Sharkey
9302986035 Replace INetStatService with TrafficStats.
Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
2011-06-01 17:48:21 -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
Gilles Debunne
ba3761be18 Merge "Bug 4505185: fix NPE when file list is empty" 2011-06-01 10:11:15 -07:00
Gilles Debunne
6789b56c23 Bug 4505185: fix NPE when file list is empty
Change-Id: Ia120f92f2d907cdfccde5824179ef2e1f0c0d6a6
2011-05-31 17:32:44 -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
be6cb943db am 9ef2713f: am 1f7014a2: Merge "Reduce padding to the left of progress category to match framework changes." into honeycomb-mr2
* commit '9ef2713f2862ca13822a35e316555dda3e264352':
  Reduce padding to the left of progress category to match framework changes.
2011-05-27 14:53:12 -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