summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* am 80c2b9b0: Hide "Play TTS sample" when locale is not settable as defaultPrzemyslaw Szczepaniak2013-09-051-1/+1
|\
| * Hide "Play TTS sample" when locale is not settable as defaultPrzemyslaw Szczepaniak2013-09-051-1/+1
* | am dd600b60: Merge "Add details screen to proc stats." into klp-devDianne Hackborn2013-09-044-116/+484
|\|
| * Merge "Add details screen to proc stats." into klp-devDianne Hackborn2013-09-054-116/+484
| |\
| | * Add details screen to proc stats.Dianne Hackborn2013-09-044-116/+484
* | | am f7092bc6: Merge "Implementing print settings as per UX spec." into klp-devSvetoslav2013-09-045-595/+886
|\| |
| * | Merge "Implementing print settings as per UX spec." into klp-devSvetoslav2013-09-055-595/+886
| |\ \ | | |/ | |/|
| | * Implementing print settings as per UX spec.Svetoslav2013-09-045-595/+886
* | | am 35ec3b7f: Merge "wifi-display: add drop down list for Wps config method" i...Chong Zhang2013-09-041-1/+36
|\| |
| * | Merge "wifi-display: add drop down list for Wps config method" into klp-devChong Zhang2013-09-041-1/+36
| |\ \
| | * | wifi-display: add drop down list for Wps config methodChong Zhang2013-08-291-1/+36
* | | | am 97df9822: Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" ...Tom O'Neill2013-09-041-1/+1
|\| | |
| * | | Merge "Switch to receiving LocationManager.MODE_CHANGED_ACTION" into klp-devTom O'Neill2013-09-041-1/+1
| |\ \ \
| | * | | Switch to receiving LocationManager.MODE_CHANGED_ACTIONTom O'Neill2013-09-031-1/+1
| | | |/ | | |/|
* | | | am 9b444f78: Merge "Pass correct user id for the extra" into klp-devAmith Yamasani2013-09-031-1/+2
|\| | |
| * | | Merge "Pass correct user id for the extra" into klp-devAmith Yamasani2013-09-041-1/+2
| |\ \ \
| | * | | Pass correct user id for the extraAmith Yamasani2013-09-031-1/+2
* | | | | am af6cdb2b: Merge "Pin protect going into developer mode." into klp-devGeoffrey Borggaard2013-09-031-1/+14
|\| | | |
| * | | | Merge "Pin protect going into developer mode." into klp-devGeoffrey Borggaard2013-09-041-1/+14
| |\ \ \ \
| | * | | | Pin protect going into developer mode.Geoffrey Borggaard2013-08-301-1/+14
* | | | | | am f4c4294c: Merge "Renamed "Location services" to "App settings"" into klp-devLifu Tang2013-09-031-7/+7
|\| | | | |
| * | | | | Merge "Renamed "Location services" to "App settings"" into klp-devLifu Tang2013-09-041-7/+7
| |\ \ \ \ \
| | * | | | | Renamed "Location services" to "App settings"Lifu Tang2013-09-031-7/+7
* | | | | | | am 58db3418: Merge "Show regulatory info based on hardware sku in Settings ap...Vineeta Srivastava2013-09-031-12/+43
|\| | | | | |
| * | | | | | Merge "Show regulatory info based on hardware sku in Settings app." into klp-devVineeta Srivastava2013-09-031-12/+43
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Show regulatory info based on hardware sku in Settings app.Vineeta Srivastava2013-09-031-12/+43
* | | | | | | am b3cd38ea: Merge "Fixed the crash on screen rotation" into klp-devLifu Tang2013-09-031-4/+25
|\| | | | | |
| * | | | | | 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
* | | | | | | | am 69a50431: Merge changes Ie232b2d4,I81b6bf3f into klp-devRussell Brenner2013-09-036-31/+54
|\| | | | | | |
| * | | | | | | 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
| | | |_|_|_|_|/ | | |/| | | | |
* | | | | | | | am 81eae57f: Merge "Adapt to renaming of SettingInjectorService API constants...Tom O'Neill2013-09-031-49/+48
|\| | | | | | |
| * | | | | | | 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
| | | |_|/ / / | | |/| | | |
* | | | | | | am 7e2227fc: Merge "Ignores AppOps entries belonging to other users" into klp...Lifu Tang2013-09-031-5/+16
|\| | | | | |
| * | | | | | 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
* | | | | | | | am ec8f11da: Merge "NFC Tap&Pay: deal with changes from API review." into klp...Martijn Coenen2013-09-033-23/+8
|\| | | | | | |
| * | | | | | | 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
* | | | | | | | am 06659c5a: Merge "Creates Sipper even the consumption is very little" into ...Lifu Tang2013-09-033-6/+11
|\| | | | | | |
| * | | | | | | 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
| | | |_|_|_|/ / | | |/| | | | |
* | | | | | | | am 47aab2ee: Merge "Shows correct state when location sharing disabled" into ...Lifu Tang2013-09-031-2/+5
|\| | | | | | |
| * | | | | | | 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
| | |/ / / / / /
* | | | | | | | am a2aaf0e6: Merge "Add a missing fragment to list of valid ones for top-leve...Amith Yamasani2013-09-031-1/+3
|\| | | | | | |
| * | | | | | | Merge "Add a missing fragment to list of valid ones for top-level settings" i...Amith Yamasani2013-09-031-1/+3
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-25 09:45:28 +0000