summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove obsolete code from SecuritySettings." into honeycombChia-chi Yeh2011-01-181-124/+31
|\
| * Remove obsolete code from SecuritySettings.Chia-chi Yeh2011-01-181-124/+31
| | | | | | | | Change-Id: Ie1d7167ec8e748b86144e12bed72a3ca0dc99da1
* | Merge "Fix the re-entrance of VpnSetting issue." into honeycombChung-yih Wang2011-01-171-4/+12
|\ \
| * | Fix the re-entrance of VpnSetting issue.Chung-yih Wang2011-01-141-4/+12
| | | | | | | | | | | | | | | bug:3292801 Change-Id: I77c57d789754f175ce9e43ad77ff2edb711c2316
* | | Show correct title.Daisuke Miyakawa2011-01-171-3/+25
| | | | | | | | | | | | | | | Bug: 3347865 Change-Id: Ide13ab46f480107c6be1ff22edf44c2ac465fbf9
* | | Merge "Fix 3296883: Hide PIN characters in ChooseLockPassword" into honeycombJim Miller2011-01-171-1/+1
|\ \ \
| * | | Fix 3296883: Hide PIN characters in ChooseLockPasswordJim Miller2011-01-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This configures the password entry EditText to numeric password mode to hide PIN entry characters. Change-Id: I0e97210f6499c6557c1f0e9e861559a5f8ac1f07
* | | | Merge "Revise layout for Wifi Setup in XLarge screen" into honeycombDaisuke Miyakawa2011-01-174-97/+118
|\ \ \ \
| * | | | Revise layout for Wifi Setup in XLarge screenDaisuke Miyakawa2011-01-174-97/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | | Merge "Add WifiPickerActivity for PICK_WIFI_NETWORK" into honeycombDaisuke Miyakawa2011-01-174-3/+74
|\ \ \ \ \
| * | | | | Add WifiPickerActivity for PICK_WIFI_NETWORKDaisuke Miyakawa2011-01-174-3/+74
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We disable left pane when PICK_WIFI_NETWORK intent is used. - Add ButtonBarHandler interface and let SettingsPreferenceFragment use it instead of Settings. Note that PreferenceActivity#hasNextButton() and PreferenceActivity#getNextButton() are currently protected methods, while Settings' relevants are public. Bug: 3355247 Change-Id: Ie0fae8a1dbce9c7ce37375dff8395dc09b1cc74e
* | | | | Merge "Fix bug #3333939 (Add secondary Account UI needs some love)" into ↵Fabrice Di Meglio2011-01-171-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | honeycomb
| * | | | Fix bug #3333939 (Add secondary Account UI needs some love)Fabrice Di Meglio2011-01-171-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sort the feed list in lexicographic order Change-Id: Iab998624d9cb4154b32fe8e726b462c55e726687
* | | | | Merge "Measure external storage application usage" into honeycombKenny Root2011-01-172-4/+22
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Measure external storage application usageKenny Root2011-01-172-4/+22
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Application data usage on the SD card (or USB storage) was not being reported by the Manage Applications screen. This is important for upcoming OBB space accounting. Bug: 3308791 Change-Id: Ibc9ad013cb2f6d0ee28caadca8899c1ff6e78f44
* | | | Clear current input method when a current ime was disabled.satok2011-01-172-14/+1
| |/ / |/| | | | | | | | Change-Id: Iade2c025e686bce47a94daa96bc0787431fafa01
* | | Merge "bug:3343038 reset mAppsSize everytime ALL package sizes are computed" ↵Vasu Nori2011-01-161-18/+28
|\ \ \ | |/ / |/| | | | | into honeycomb
| * | bug:3343038 reset mAppsSize everytime ALL package sizes are computedVasu Nori2011-01-161-18/+28
| | | | | | | | | | | | Change-Id: I981d84a165777246dd9744b0f8f7bc6fc0cb3e33
* | | Add UI to report WPS overlap errorIrfan Sheriff2011-01-161-2/+11
| | | | | | | | | | | | | | | Bug: 3354319 Change-Id: I4584bc3a820ace1232026920c4dc29e6b273461c
* | | Merge "Add feedback dialogs for WPS" into honeycombIrfan Sheriff2011-01-161-9/+25
|\ \ \ | |/ / |/| |
| * | Add feedback dialogs for WPSIrfan Sheriff2011-01-141-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | Upon failure or an existing WPS session, a dialog message is conveyed to the user Bug: 3316078 Change-Id: Ibcf27e21058970f8f1667061c7654948c690d48e
* | | Merge "Revise layout for DateTime setup" into honeycombDaisuke Miyakawa2011-01-161-2/+5
|\ \ \
| * | | Revise layout for DateTime setupDaisuke Miyakawa2011-01-161-2/+5
| |/ / | | | | | | | | | | | | Bug: 3347865 Change-Id: Ie80f2eb784ce70edc81fbab9541fe1601f7f0ee3
* | | Disable long-press behavior in setupwizard.Daisuke Miyakawa2011-01-152-1/+10
|/ / | | | | | | | | Bug: 3355243 Change-Id: Ibe15da5ced91f975ca9c9c3c4d42cbd1c753f9d4
* | Merge "Fix PhysicalKeyboardSettings by merging it into InputMethodConfig." ↵Chia-chi Yeh2011-01-142-101/+38
|\ \ | |/ |/| | | into honeycomb
| * Fix PhysicalKeyboardSettings by merging it into InputMethodConfig.Chia-chi Yeh2011-01-142-101/+38
| | | | | | | | Change-Id: I00deeda813f438f9eb2b7932e3b4d273be2e1ab8
* | Add a setting to enable encryption.Jason parks2011-01-131-0/+96
| | | | | | | | | | This isn't final and it will wipe your device. Change-Id: I7fecded92a745844435878d0409d620bfa571472
* | Merge "Close scan screen when pairing and remove device when unpairing." ↵Jake Hamby2011-01-136-389/+494
|\ \ | | | | | | | | | into honeycomb
| * | Close scan screen when pairing and remove device when unpairing.Jake Hamby2011-01-126-389/+494
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Close the scan screen after successful pairing, and remove a device from the list of paired devices after unpairing. As part of the fix, BluetoothSettings was refactored into a parent class, DeviceListPreferenceFragment, and three subclasses for each variant type: BluetoothSettings, BluetoothFindNearby, and DevicePickerFragment, replacing the checks against mScreenType with custom logic in the child classes. Bug: 3325848 Change-Id: If64fddc3ba5b4f1136451491c7d5a1139b696e47
* | | Merge "Fix bug #2987804 (Provide a better UI for selecting the Backup ↵Fabrice Di Meglio2011-01-131-10/+29
|\ \ \ | | | | | | | | | | | | account)" into honeycomb
| * | | Fix bug #2987804 (Provide a better UI for selecting the Backup account)Fabrice Di Meglio2011-01-121-10/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - make the "Backup account" toggle follow the state of "Back up my data" - reset Backup account in preferences if needed Change-Id: Ifdffb9d268a062f6f5ec617bca82699cc46e2b3a
* | | | Merge "Move the CryptKeeper to Settings." into honeycombJason parks2011-01-131-0/+116
|\ \ \ \ | |_|/ / |/| | |
| * | | Move the CryptKeeper to Settings.Jason parks2011-01-121-0/+116
| | | | | | | | | | | | | | | | Change-Id: I59e46366e1911ae7fd37f07719f1e7ba0825733c
* | | | Merge "Get rid of the silent mode pref on xlarge." into honeycombJoe Onorato2011-01-121-0/+5
|\ \ \ \
| * | | | Get rid of the silent mode pref on xlarge.Joe Onorato2011-01-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3344695 Change-Id: I55ccfd2b22ca4aa407646de54a8dd1dfe637c9bd
* | | | | Merge "Show password field when authentication failed." into honeycombDaisuke Miyakawa2011-01-123-28/+134
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Show password field when authentication failed.Daisuke Miyakawa2011-01-123-28/+134
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | | Merge "Remove extra button bar." into honeycombAmith Yamasani2011-01-123-104/+18
|\ \ \ \ | |/ / / |/| | |
| * | | Remove extra button bar.Amith Yamasani2011-01-123-104/+18
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3058024 Change-Id: Ib3c2620869729f8916178ea0c0e899635b470a8f
* | | | Merge "Automatically turn on "Use system language" when no subtypes become ↵satok2011-01-121-1/+4
|\ \ \ \ | |_|_|/ |/| | | | | | | selected Bug: 3327257" into honeycomb
| * | | Automatically turn on "Use system language" when no subtypes become selectedsatok2011-01-111-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 3327257 Change-Id: I99a8c2769957963db99fa72be6cc76cc9cd97abf
* | | | Only show "Allow incoming file transfer" option if device supports OPPJake Hamby2011-01-111-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Bluetooth profiles settings screen for a device, the "Allow incoming file transfer" item should only be shown if the device supports the Object Push Profile. Bug: 3297633 Change-Id: I4bbe66ef901feef9dd8a3916fb9827120c1fdfc0
* | | | Merge "Allow multiple simultaneous connections for BT input devices." into ↵Jake Hamby2011-01-112-19/+13
|\ \ \ \ | | | | | | | | | | | | | | | honeycomb
| * | | | Allow multiple simultaneous connections for BT input devices.Jake Hamby2011-01-102-19/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move responsibility for disconnecting devices before connecting a new profile from CachedBluetoothDevice to LocalBluetoothProfileManager. The ProfileManager subclasses of LocalBluetoothProfileManager will handle disconnecting the previously connected device, if necessary, as part of connect(). The HID profile allows multiple simultaneous connected devices, while the other supported profiles do not. Bug: 3333975 Change-Id: Id51b26e64f7c3ee7d54af3a03ca82a669f305b52
* | | | | Merge "Change wifi sleep policy" into honeycombIrfan Sheriff2011-01-111-1/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Change wifi sleep policyIrfan Sheriff2011-01-111-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Keep wifi sleep policy as never when charged as long as user has not changed the settings Bug: 3038345 Change-Id: I37548984698dd3dd407785544d7b418439ed95d0
* | | | Merge "Fix 3298889: Show continue button on PIN and password screens" into ↵Jim Miller2011-01-111-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | honeycomb
| * | | | Fix 3298889: Show continue button on PIN and password screensJim Miller2011-01-101-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the above bug by allowing the PIN and password screens to shrink to reveal the continue/cancel buttons when the IME is shown. This also fixes a minor resource bug where the title was showing "confirm your password/pin" instead of "choose your password/pin". Change-Id: I610c6018085e0c4ef1b6dc384566d06d1211f8ea
* | | | Merge "Don't throw exception on unexpected BT device addition." into honeycombJake Hamby2011-01-111-1/+2
|\ \ \ \
| * | | | Don't throw exception on unexpected BT device addition.Jake Hamby2011-01-111-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix for reported bug where settings app crashes while trying to share a picture. Bug report showed IllegalStateException thrown with message "Got onDeviceAdded, but cachedDevice already exists." Changed code to print an error message to the log and ignore the unexpected event, rather than throwing an uncaught exception that crashes the app. Bug: 2192884 Change-Id: I016be6a1616b317b2289768d18ae9f069a49445e