summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* am 51a1bb15: am ad466222: am 51a9d157: Merge "Fix account type dialog ↵Amith Yamasani2011-06-031-0/+1
|\ | | | | | | | | | | | | re-creation on orientation change." into honeycomb-mr2 * commit '51a1bb15ea2d669d783e1938deb7eb061f3112da': Fix account type dialog re-creation on orientation change.
| * am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on ↵Amith Yamasani2011-06-021-0/+1
| |\ | | | | | | | | | | | | | | | | | | orientation change." into honeycomb-mr2 * commit 'ad4662223210827df1e62ba4c7ec24dba80a47df': Fix account type dialog re-creation on orientation change.
| | * am 51a9d157: Merge "Fix account type dialog re-creation on orientation ↵Amith Yamasani2011-06-021-0/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | change." into honeycomb-mr2 * commit '51a9d15722b3c94ac92e05b19048b678247b034e': Fix account type dialog re-creation on orientation change.
| | | * Merge "Fix account type dialog re-creation on orientation change." into ↵Amith Yamasani2011-06-021-0/+1
| | | |\ | | | | | | | | | | | | | | | honeycomb-mr2
| | | | * Fix account type dialog re-creation on orientation change.Amith Yamasani2011-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for ↵Jeff Brown2011-06-031-0/+209
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | mouse speed." into honeycomb-mr2 * commit 'a3a96d180f7b1351e6f2aaa8763dc962844fc83e': Add a preference panel for mouse speed.
| * | | | am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." ↵Jeff Brown2011-06-021-0/+209
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit 'bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682': Add a preference panel for mouse speed.
| | * | | am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-021-0/+209
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '9fc039e7bcea7f1845a51fcb70d608663ceec227': Add a preference panel for mouse speed.
| | | * | Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-021-0/+209
| | | |\ \
| | | | * | Add a preference panel for mouse speed.Jeff Brown2011-06-021-0/+209
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4124987 Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
* | | | | am 1334d7fc: am 300c4f61: am 3a5b3494: Make the BT class icon visible.Amith Yamasani2011-06-031-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '1334d7fc3a3a1fd2f48aed93d9344115d674fcc2': Make the BT class icon visible.
| * | | | am 300c4f61: am 3a5b3494: Make the BT class icon visible.Amith Yamasani2011-06-021-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '300c4f61d823936e4a34fcece25c14c73877c994': Make the BT class icon visible.
| | * | | am 3a5b3494: Make the BT class icon visible.Amith Yamasani2011-06-021-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit '3a5b3494a7543c1ddb66c6f630856c3aace03f0a': Make the BT class icon visible.
| | | * | Make the BT class icon visible.Amith Yamasani2011-06-021-1/+1
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | This change is required due to a change in the framework to accomodate smaller screen sizes. Bug: 4519989 Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
* | | | Merge "Bulletproof CredentialStorage state handling"Brian Carlstrom2011-06-025-46/+207
|\ \ \ \
| * | | | Bulletproof CredentialStorage state handlingBrian Carlstrom2011-06-025-46/+207
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am b667422c: am 41a99004: am 53872769: Merge "Erase SD Card fixed in ↵Gilles Debunne2011-06-024-52/+41
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Settings/Storage." into honeycomb-mr2 * commit 'b667422cfdaf73d693bf79ce6186e082b68862b8': Erase SD Card fixed in Settings/Storage.
| * | | | am 41a99004: am 53872769: Merge "Erase SD Card fixed in Settings/Storage." ↵Gilles Debunne2011-05-264-52/+41
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | into honeycomb-mr2 * commit '41a99004f1cd758205f728dbbf9bc6a735b262e3': Erase SD Card fixed in Settings/Storage.
| | * | | am 53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2Gilles Debunne2011-05-264-52/+41
| | |\ \ \ | | | | |/ | | | |/| | | | | | | | | | | * commit '5387276950a190944eeeb00c0e3c04501f0dc6a5': Erase SD Card fixed in Settings/Storage.
| | | * | Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2Gilles Debunne2011-05-264-52/+41
| | | |\ \
| | | | * | Erase SD Card fixed in Settings/Storage.Gilles Debunne2011-05-264-52/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the StorageVolume to the format intent. Change-Id: If1a50a2d5c5154e9f00116db536c62324c447e7c
* | | | | | Replace INetStatService with TrafficStats.Jeff Sharkey2011-06-011-15/+9
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
* | | | | Merge "Integrating keystore with keyguard (Part 4 of 4)"Brian Carlstrom2011-06-016-214/+217
|\ \ \ \ \
| * | | | | Integrating keystore with keyguard (Part 4 of 4)Brian Carlstrom2011-06-016-214/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am c837756d: am b4799fc9: am aef746c4: Implement new manage apps UI for ↵Dianne Hackborn2011-06-011-2/+41
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | compat mode. * commit 'c837756d732eb1cc2c26c2d111668ac22a5ff4c6': Implement new manage apps UI for compat mode.
| * | | | | am b4799fc9: am aef746c4: Implement new manage apps UI for compat mode.Dianne Hackborn2011-05-261-2/+41
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * commit 'b4799fc9ee29535bb371da9c04a0f750a77115e1': Implement new manage apps UI for compat mode.
| | * | | | am aef746c4: Implement new manage apps UI for compat mode.Dianne Hackborn2011-05-261-2/+41
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'aef746c45f14c8a170dba48c4b55f93cae0e24e4': Implement new manage apps UI for compat mode.
| | | * | | Implement new manage apps UI for compat mode.Dianne Hackborn2011-05-261-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia8db7f534b7294fbbb34e0acdedab3a96cea59e9
* | | | | | am f0fae7f2: am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and ↵Freeman Ng2011-06-011-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | datetime settings look good for 7"" into honeycomb-mr2 * commit 'f0fae7f27295df2dff531a6293840479a64f7984': make setup wizard's wifi and datetime settings look good for 7"
| * | | | | am 6356b17a: am d671182d: Merge "make setup wizard\'s wifi and datetime ↵Freeman Ng2011-05-261-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings look good for 7"" into honeycomb-mr2 * commit '6356b17a53fc939c145de26dbc258ef7797ba05c': make setup wizard's wifi and datetime settings look good for 7"
| | * | | | am d671182d: Merge "make setup wizard\'s wifi and datetime settings look ↵Freeman Ng2011-05-261-1/+1
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | good for 7"" into honeycomb-mr2 * commit 'd671182d88a193bee25d82a1941a57a84ed0fdc4': make setup wizard's wifi and datetime settings look good for 7"
| | | * | | Merge "make setup wizard's wifi and datetime settings look good for 7"" into ↵Freeman Ng2011-05-251-1/+1
| | | |\ \ \ | | | | |_|/ | | | |/| | | | | | | | honeycomb-mr2
| | | | * | make setup wizard's wifi and datetime settings look good for 7"Freeman Ng2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: this entailed locking datetime settings not into portrait like everything else in the setup process, but landscape, because the existing xlarge layout wasn't rearranging itself into a portrait alignment very well. I can give it another try later if I can have some help from UE. Change-Id: Ia8ce8e8292ed768bd117beedf3d94a287e658f4b
* | | | | | Merge "Bug 4505185: fix NPE when file list is empty"Gilles Debunne2011-06-011-0/+1
|\ \ \ \ \ \
| * | | | | | Bug 4505185: fix NPE when file list is emptyGilles Debunne2011-05-311-0/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: Ia120f92f2d907cdfccde5824179ef2e1f0c0d6a6
* | | | | | Accessibility service specific settings.Svetoslav Ganov2011-05-272-15/+120
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Dream (screensaver) settings."Daniel Sandler2011-05-264-15/+381
|\ \ \ \ \
| * | | | | Dream (screensaver) settings.Daniel Sandler2011-05-264-15/+381
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depends on change Ied691856 for Settings.Secure.DREAM_TIMEOUT and Settings.Secure.DREAM_COMPONENT. Change-Id: Ib6f74b74036e12637efb891b97e459a4e33444e7
* | | | | | resolved conflicts for merge of b593a628 to masterGilles Debunne2011-05-266-975/+1052
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Change-Id: Icf8a913e8780bb7d998cc9f4d0ed91ed66348dc6
| * | | | am ecb43e5e: am 5d48be98: Merge "Storage stats on external SD card in ↵Gilles Debunne2011-05-257-987/+1054
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Settings." into honeycomb-mr2 * commit 'ecb43e5e67e2cdf7617100b08a3f9dae42c4b5cf': Storage stats on external SD card in Settings.
| | * | | am 5d48be98: Merge "Storage stats on external SD card in Settings." into ↵Gilles Debunne2011-05-257-987/+1054
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '5d48be9845eea3c4539f78f06ed24c592803e10c': Storage stats on external SD card in Settings.
| | | * | Merge "Storage stats on external SD card in Settings." into honeycomb-mr2Gilles Debunne2011-05-257-987/+1054
| | | |\ \
| | | | * | Storage stats on external SD card in Settings.Gilles Debunne2011-05-257-987/+1054
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Storage categories are dynamically created from list of StorageVolumes instead of a static XML. Unknown files' sizes are part of Misc rather than Apps. Categories with a size of 0 are removed. TODO : remove the notion of a "nosdcard" product. Change strings accordingly. See all TODO in code Change-Id: I017ac20f5fa50ad9bdeba8e666754ec84acf3858
* | | | | am 0fbaacaa: am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.Amith Yamasani2011-05-252-3/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0fbaacaa9b29401a4191ca85dccfe68660928a11': Visual adjustments for smaller tablets.
| * | | | am 138a695f: am cfd524f0: Visual adjustments for smaller tablets.Amith Yamasani2011-05-252-3/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '138a695f179aa16bff033b873f502161b1be66e0': Visual adjustments for smaller tablets.
| | * | | am cfd524f0: Visual adjustments for smaller tablets.Amith Yamasani2011-05-252-3/+2
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | * commit 'cfd524f07af0820e2e41fd74e7e3c5b7433854f8': Visual adjustments for smaller tablets.
| | | * | Visual adjustments for smaller tablets.Amith Yamasani2011-05-242-3/+2
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the Manage Apps tab indicators horizontally scrollable. Use medium font size for user dictionary. Bug: 4462313 Change-Id: Iba44e758715c0187ea17ed072794b8596dee0e54
* | | | am b7c2d5b4: am 7c210ba5: Fix invalid linkspeed displayIrfan Sheriff2011-05-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'b7c2d5b4e1bafe543d3887d350b3e77d71a0cf34': Fix invalid linkspeed display
| * | | am 7c210ba5: Fix invalid linkspeed displayIrfan Sheriff2011-05-231-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7c210ba5c18c2720023dd8fc4215cde95a6fe71c': Fix invalid linkspeed display
| | * | Fix invalid linkspeed displayIrfan Sheriff2011-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | Bug: 4391449 Change-Id: I8c8efcaa73d09c1e8b523f7798b6c626edc96c1e
generated by cgit v1.1 at 2025-01-14 17:36:47 +0000