summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 6795dd59: (-s ours) am 359b2bcc: Check in translations for new Settings st...Eric Fischer2010-01-250-0/+0
|\
| * am 359b2bcc: Check in translations for new Settings strings. DO NOT MERGEEric Fischer2010-01-2021-65/+207
| |\
| | * Check in translations for new Settings strings. DO NOT MERGEEric Fischer2010-01-2021-65/+207
* | | am fcd4e7fe: am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabl...Michael Chan2010-01-221-13/+46
|\ \ \ | |/ /
| * | am 04bdae75: Merge "b/2332395 Fixed a bug where BT is not disabled if the pho...Michael Chan2010-01-201-13/+46
| |\ \ | | |/
| | * Merge "b/2332395 Fixed a bug where BT is not disabled if the phone was insert...Michael Chan2010-01-201-13/+46
| | |\
| | | * b/2332395 Fixed a bug where BT is not disabled if the phone was inserted and ...Michael Chan2010-01-191-13/+46
* | | | am b9f29667: am 63c6a309: Merge "Add dock icon for top-level settings. #23672...Amith Yamasani2010-01-223-0/+1
|\ \ \ \ | |/ / /
| * | | am 63c6a309: Merge "Add dock icon for top-level settings. #2367275" into eclairAmith Yamasani2010-01-203-0/+1
| |\ \ \ | | |/ /
| | * | Merge "Add dock icon for top-level settings. #2367275" into eclairAmith Yamasani2010-01-203-0/+1
| | |\ \ | | | |/ | | |/|
| | | * Add dock icon for top-level settings. #2367275Amith Yamasani2010-01-203-0/+1
* | | | am 97ed3f4b: am 3fe86a34: b/2332395 Disable BT when undocked if BT was off to...Michael Chan2010-01-222-18/+132
|\ \ \ \ | |/ / /
| * | | am 3fe86a34: b/2332395 Disable BT when undocked if BT was off to at docking t...Michael Chan2010-01-202-18/+132
| |\ \ \ | | |/ /
| | * | b/2332395 Disable BT when undocked if BT was off to at docking timeMichael Chan2010-01-192-18/+132
| | |/
* | | am 942feaa2: am 6ff80dcf: Fix #2377870 : NPE in Dock settingsAmith Yamasani2010-01-211-1/+6
|\ \ \ | |/ /
| * | am 6ff80dcf: Fix #2377870 : NPE in Dock settingsAmith Yamasani2010-01-181-1/+6
| |\ \ | | |/
| | * Fix #2377870 : NPE in Dock settingsAmith Yamasani2010-01-151-1/+6
* | | am 39c3d10b: am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings ...Amith Yamasani2010-01-218-60/+198
|\ \ \ | |/ /
| * | am 0e2ab4f8: New top-level Dock in Settings and a Dock Settings screen with A...Amith Yamasani2010-01-188-60/+198
| |\ \ | | |/
| | * New top-level Dock in Settings and a Dock Settings screen with Audio item. #2...Amith Yamasani2010-01-158-60/+198
* | | Start hooking up password device policiesDianne Hackborn2010-01-215-40/+117
* | | Merge "Fix 2385283: Add DevicePolicyManager calls to LockScreen."Jim Miller2010-01-208-39/+48
|\ \ \
| * | | Fix 2385283: Add DevicePolicyManager calls to LockScreen.Jim Miller2010-01-208-39/+48
* | | | am 3b7ffa5e: am 01a868d7: Merge "Strings for new Dock settings screen, to get...Amith Yamasani2010-01-201-2/+19
|\ \ \ \ | | |/ / | |/| |
| * | | am 01a868d7: Merge "Strings for new Dock settings screen, to get started on t...Amith Yamasani2010-01-141-2/+19
| |\ \ \ | | | |/ | | |/|
| | * | Merge "Strings for new Dock settings screen, to get started on the L10N." int...Amith Yamasani2010-01-141-2/+19
| | |\ \
| | | * | Strings for new Dock settings screen, to get started on the L10N.Amith Yamasani2010-01-141-2/+19
* | | | | am 49efbf8b: am c9b9f650: Merge "b/2367861 Auto connect if the user turns on ...Michael Chan2010-01-204-20/+80
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | am c9b9f650: Merge "b/2367861 Auto connect if the user turns on BT while dock...Michael Chan2010-01-144-20/+80
| |\ \ \ | | |/ /
| | * | Merge "b/2367861 Auto connect if the user turns on BT while docked." into eclairMichael Chan2010-01-144-20/+80
| | |\ \ | | | |/ | | |/|
| | | * b/2367861 Auto connect if the user turns on BT while docked.Michael Chan2010-01-144-20/+80
* | | | Initial UI for managing device policies.Dianne Hackborn2010-01-166-0/+392
* | | | WifiEnabler: add support to show supplicant state.Chia-chi Yeh2010-01-163-8/+108
* | | | Settings: revise WifiEnabler and BluetoothEnabler.Chia-chi Yeh2010-01-154-220/+138
* | | | Merge "Change filter options from being menu items to tabbed views. Remove un...Suchi Amalapurapu2010-01-122-47/+44
|\ \ \ \
| * | | | Change filter options from being menu items to tabbed views.Suchi Amalapurapu2010-01-122-47/+44
* | | | | am 213c35c0: (-s ours) am d8d21279: Merge "Don\'t allow monkey to play with S...Amith Yamasani2010-01-120-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | am d8d21279: Merge "Don\'t allow monkey to play with SIM lock settings. Bug #...Amith Yamasani2010-01-121-0/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge "Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO N...Amith Yamasani2010-01-121-0/+5
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Don't allow monkey to play with SIM lock settings. Bug # 2358489. DO NOT MERGEAmith Yamasani2010-01-121-0/+5
* | | | | Merge "Haptic feedback setting doesn't need to be disabled in Silent mode."Amith Yamasani2010-01-121-2/+1
|\ \ \ \ \
| * | | | | Haptic feedback setting doesn't need to be disabled in Silent mode.Amith Yamasani2010-01-121-2/+1
* | | | | | Merge "Settings: Switch to new MountService api names"San Mehat2010-01-123-5/+5
|\ \ \ \ \ \
| * | | | | | Settings: Switch to new MountService api namesSan Mehat2010-01-123-5/+5
| | |_|_|_|/ | |/| | | |
* | | | | | am d69a5ee2: am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
|\ \ \ \ \ \ | |/ / / / / |/| | / / / | | |/ / / | |/| | |
| * | | | am c5aa68f3: b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | b/2367020 Enable bt profiles by default for car dock.Michael Chan2010-01-121-11/+17
* | | | | Fix 2332563: Add password-lock support to lockscreenJim Miller2010-01-1115-207/+1262
* | | | | am 79270566: (-s ours) am d9d8ef26: Merge "b/2335780 Fixed race conditions wh...Michael Chan2010-01-110-0/+0
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | |
| * | | am d9d8ef26: Merge "b/2335780 Fixed race conditions which causes BT to not be...Michael Chan2010-01-112-35/+15
| |\ \ \ | | |/ /