summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Draw vertical data usage sweep labels."Jeff Sharkey2011-07-095-73/+204
|\
| * Draw vertical data usage sweep labels.Jeff Sharkey2011-07-095-73/+204
* | Merge "Changed Settings application theme"Gilles Debunne2011-07-081-1/+0
|\ \
| * | Changed Settings application themeGilles Debunne2011-07-081-1/+0
* | | Bug 5003461 - Removed animation optionGilles Debunne2011-07-081-93/+12
|/ /
* | Refactor Bluetooth settingsGilles Debunne2011-07-081-33/+60
* | Merge "Changed text and appearance when Wifi/Bluetooth is off"Gilles Debunne2011-07-073-20/+41
|\ \
| * | Changed text and appearance when Wifi/Bluetooth is offGilles Debunne2011-07-073-20/+41
* | | Merge "Fixed intents to start Settings activities"Gilles Debunne2011-07-072-10/+21
|\ \ \ | |_|/ |/| |
| * | Fixed intents to start Settings activitiesGilles Debunne2011-07-072-10/+21
* | | Merge "VpnSettings: pass certificates to racoon directly."Chia-chi Yeh2011-07-072-16/+47
|\ \ \
| * | | VpnSettings: pass certificates to racoon directly.Chia-chi Yeh2011-07-072-16/+47
| | |/ | |/|
* | | Merge "Show user dialog for BT connection and phonebook access"Matthew Xie2011-07-072-0/+339
|\ \ \ | |/ / |/| |
| * | Show user dialog for BT connection and phonebook accessMatthew Xie2011-06-292-0/+339
* | | Set progress bar to 0 when done so that will not come back as fullBrian Carlstrom2011-07-061-2/+3
* | | Merge "Convert CA loading from spinning wheel to progress bar"Brian Carlstrom2011-07-061-4/+20
|\ \ \
| * | | Convert CA loading from spinning wheel to progress barBrian Carlstrom2011-07-061-4/+20
* | | | Merge "Improved presentation of CA list"Brian Carlstrom2011-07-061-23/+31
|\| | |
| * | | Improved presentation of CA listBrian Carlstrom2011-07-061-23/+31
* | | | Super rough implementation of new USB settingsMike Lockwood2011-07-062-0/+187
|/ / /
* | | Merge "VpnSettings: add status report."Chia-chi Yeh2011-07-041-28/+56
|\ \ \
| * | | VpnSettings: add status report.Chia-chi Yeh2011-07-041-28/+56
* | | | Update settings for aux imessatok2011-07-042-18/+22
|/ / /
* | | VpnSettings: rename some variables.Chia-chi Yeh2011-07-031-1/+1
* | | VpnSettings: switch to the new user interface.Chia-chi Yeh2011-07-0212-2391/+0
* | | Merge changes I266f8403,Ia4dc4b23Chia-chi Yeh2011-07-022-9/+18
|\ \ \
| * | | VpnSettings: hook up the legacy VPN with IConnectivityManager.Chia-chi Yeh2011-07-021-2/+12
| * | | VpnSettings: IPSec Hybrid RSA does not need user certificate.Chia-chi Yeh2011-07-021-7/+6
* | | | Merge "Move the main interesting DevTools settings into the main settings app."Dianne Hackborn2011-07-011-0/+227
|\ \ \ \ | |_|_|/ |/| | |
| * | | Move the main interesting DevTools settings into the main settings app.Dianne Hackborn2011-07-011-0/+227
* | | | Merge "AdvancedSettings replaced by AdvancedWifiSettings"Gilles Debunne2011-07-013-182/+71
|\ \ \ \ | |_|/ / |/| | |
| * | | AdvancedSettings replaced by AdvancedWifiSettingsGilles Debunne2011-06-303-182/+71
| |/ /
* | | Merge "VpnSettings: rename some fields."Chia-chi Yeh2011-06-302-23/+26
|\ \ \
| * | | VpnSettings: rename some fields.Chia-chi Yeh2011-06-302-23/+26
| |/ /
* | | Merge "Fix TrustedCredentialsSettings for small screens"Brian Carlstrom2011-06-301-5/+7
|\ \ \
| * | | Fix TrustedCredentialsSettings for small screensBrian Carlstrom2011-06-301-5/+7
* | | | Bluetooth messages improved.Gilles Debunne2011-06-302-7/+28
| |/ / |/| |
* | | Fix a crash on certain devices in Storage settings.Amith Yamasani2011-06-301-2/+6
|/ /
* / Implement new UI for IME settingssatok2011-06-304-305/+417
|/
* Merge "Fix up storage UI for old USB storage."Dianne Hackborn2011-06-296-30/+116
|\
| * Fix up storage UI for old USB storage.Dianne Hackborn2011-06-296-30/+116
* | Merge "Double list in Bluetooth Settings"Gilles Debunne2011-06-296-80/+111
|\ \
| * | Double list in Bluetooth SettingsGilles Debunne2011-06-286-80/+111
* | | Merge "VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs."Chia-chi Yeh2011-06-292-28/+88
|\ \ \ | |_|/ |/| |
| * | VpnSettings: generate arguments for PPTP and L2TP IPSec VPNs.Chia-chi Yeh2011-06-292-28/+88
* | | Merge "Follow naming conventions of proguard.flags"Brian Carlstrom2011-06-281-2/+2
|\ \ \
| * | | Follow naming conventions of proguard.flagsBrian Carlstrom2011-06-281-2/+2
* | | | Remove call settings menuDaisuke Miyakawa2011-06-281-3/+0
| |_|/ |/| |
* | | Merge "Split ActionBar in Settings"Gilles Debunne2011-06-283-14/+20
|\ \ \
| * | | Split ActionBar in SettingsGilles Debunne2011-06-273-16/+22