summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Expand)AuthorAgeFilesLines
* Merge "Fixed the crash on screen rotation" into klp-devLifu Tang2013-09-031-4/+25
|\
| * Fixed the crash on screen rotationLifu Tang2013-09-031-4/+25
* | Merge changes Ie232b2d4,I81b6bf3f into klp-devRussell Brenner2013-09-036-31/+54
|\ \
| * | Add resources for light themeRussell Brenner2013-08-304-28/+33
| * | Support Holo Light theme for wifi during setupRussell Brenner2013-08-282-3/+21
* | | Merge "Adapt to renaming of SettingInjectorService API constants" into klp-devTom O'Neill2013-09-031-49/+48
|\ \ \ | |_|/ |/| |
| * | Adapt to renaming of SettingInjectorService API constantsTom O'Neill2013-08-301-49/+48
* | | Merge "Ignores AppOps entries belonging to other users" into klp-devLifu Tang2013-09-031-5/+16
|\ \ \
| * | | Ignores AppOps entries belonging to other usersLifu Tang2013-09-031-5/+16
* | | | Merge "NFC Tap&Pay: deal with changes from API review." into klp-devMartijn Coenen2013-09-033-23/+8
|\ \ \ \ | |/ / / |/| | |
| * | | NFC Tap&Pay: deal with changes from API review.Martijn Coenen2013-08-303-23/+8
* | | | Merge "Creates Sipper even the consumption is very little" into klp-devLifu Tang2013-09-033-6/+11
|\ \ \ \
| * | | | Creates Sipper even the consumption is very littleLifu Tang2013-09-033-6/+11
* | | | | Merge "Shows correct state when location sharing disabled" into klp-devLifu Tang2013-09-031-2/+5
|\ \ \ \ \
| * | | | | Shows correct state when location sharing disabledLifu Tang2013-08-301-2/+5
| |/ / / /
* | | | | Merge "Add a missing fragment to list of valid ones for top-level settings" i...Amith Yamasani2013-09-031-1/+3
|\ \ \ \ \
| * | | | | Add a missing fragment to list of valid ones for top-level settingsAmith Yamasani2013-08-301-1/+3
| |/ / / /
* | | | | am d5c71fc4: am e38165ca: am 7bee4c29: Use correct action string for provisio...Wink Saville2013-08-301-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | am e38165ca: am 7bee4c29: Use correct action string for provisioning.Wink Saville2013-08-291-3/+3
| |\ \ \ \
| | * | | | Use correct action string for provisioning.Wink Saville2013-08-291-3/+3
| * | | | | am 0e042a44: am 289c2f0d: Merge "Use MOBILE_PROVISIONING_ACTION for manage mo...Wink Saville2013-08-291-7/+7
| |\| | | |
| | * | | | Use MOBILE_PROVISIONING_ACTION for manage mobile plan.Wink Saville2013-08-281-7/+7
* | | | | | Merge "Update captioning settings to match revised API" into klp-devAlan Viverette2013-08-304-21/+51
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Update captioning settings to match revised APIAlan Viverette2013-08-274-21/+51
* | | | | | Merge "Fixes for pin-restricted settings." into klp-devMaggie Benthall2013-08-303-28/+76
|\ \ \ \ \ \
| * | | | | | Fixes for pin-restricted settings.Maggie Benthall2013-08-293-28/+76
* | | | | | | Merge "Replaced ContentQueryMap with CursorLoader" into klp-devLifu Tang2013-08-292-40/+34
|\ \ \ \ \ \ \
| * | | | | | | Replaced ContentQueryMap with CursorLoaderLifu Tang2013-08-292-40/+34
* | | | | | | | Merge "Use MOBILE_PROVISIONING_ACTION for manage mobile plan." into klp-devWink Saville2013-08-291-7/+7
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use MOBILE_PROVISIONING_ACTION for manage mobile plan.Wink Saville2013-08-291-7/+7
| |/ / / / / /
* | | | | | | Merge "Make sure we've finished loading settings before processing any reload...Tom O'Neill2013-08-292-40/+90
|\ \ \ \ \ \ \
| * | | | | | | Make sure we've finished loading settings before processing any reloadsTom O'Neill2013-08-292-40/+90
| |/ / / / / /
* | | | | | | Merge "Update NFC payments to match new framework APIs." into klp-devMartijn Coenen2013-08-293-22/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Update NFC payments to match new framework APIs.Martijn Coenen2013-08-283-22/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Fixed the widget location toggle button" into klp-devLifu Tang2013-08-291-3/+17
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixed the widget location toggle buttonLifu Tang2013-08-281-3/+17
* | | | | | Merge "Fix RTL layout of text in Battery history screen" into klp-devAmith Yamasani2013-08-291-12/+19
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix RTL layout of text in Battery history screenAmith Yamasani2013-08-281-12/+19
| |/ / / /
* | | | | Merge "Disallows setting when user restriction applies" into klp-devLifu Tang2013-08-283-9/+19
|\ \ \ \ \
| * | | | | Disallows setting when user restriction appliesLifu Tang2013-08-283-9/+19
| |/ / / /
* / / / / Add more fragments to valid list for Wifi activityAmith Yamasani2013-08-281-1/+4
|/ / / /
* | | | Merge "Fix NPE in SecuritySettings.onResume()" into klp-devMaggie Benthall2013-08-281-6/+3
|\ \ \ \
| * | | | Fix NPE in SecuritySettings.onResume()Maggie Benthall2013-08-201-6/+3
* | | | | Merge "Don't list apps that are disabled by the system" into klp-devAmith Yamasani2013-08-271-2/+26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't list apps that are disabled by the systemAmith Yamasani2013-08-161-2/+26
* | | | | Merge "Switch to new location mode API recommended by API council" into klp-devTom O'Neill2013-08-272-6/+6
|\ \ \ \ \
| * | | | | Switch to new location mode API recommended by API councilTom O'Neill2013-08-262-6/+6
* | | | | | Merge "Adapt to SettingsInjectorService API changes" into klp-devTom O'Neill2013-08-272-9/+6
|\ \ \ \ \ \
| * | | | | | Adapt to SettingsInjectorService API changesTom O'Neill2013-08-262-9/+6
| |/ / / / /
* / / / / / Fix APN preference styleAlan Viverette2013-08-261-1/+1
|/ / / / /