summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings
Commit message (Expand)AuthorAgeFilesLines
* Checkpoint of data usage UI, graphs and lists.Jeff Sharkey2011-06-098-0/+994
* am 4a1b8898: am f448c32d: Merge "Fix UI settings display issues" into honeyco...Irfan Sheriff2011-06-082-4/+6
|\
| * am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTEIrfan Sheriff2011-06-072-4/+6
| |\
| | * Merge "Fix UI settings display issues" into honeycomb-LTEIrfan Sheriff2011-06-072-4/+6
| | |\
| | | * Fix UI settings display issuesIrfan Sheriff2011-06-072-4/+6
* | | | Merge "fix breakage caused by recent automerge"Freeman Ng2011-06-081-3/+0
|\ \ \ \
| * | | | fix breakage caused by recent automergeFreeman Ng2011-06-081-39/+85
* | | | | resolved conflicts for merge of ab48c22e to masterFreeman Ng2011-06-082-40/+99
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | am c47e9a1d: am 0fd7736b: Merge "use prefs-style layout for setup wizard date...Freeman Ng2011-06-072-40/+99
| |\ \ \ | | |/ /
| | * | am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time setting...Freeman Ng2011-06-072-40/+99
| | |\ \
| | | * \ Merge "use prefs-style layout for setup wizard date/time settings on non-xlar...Freeman Ng2011-06-072-40/+99
| | | |\ \
| | | | * | use prefs-style layout for setup wizard date/time settings on non-xlarge screensFreeman Ng2011-06-062-40/+99
* | | | | | Merge "Use getDisplayName for the name of InputMethodSubtype"satok2011-06-082-20/+12
|\ \ \ \ \ \
| * | | | | | Use getDisplayName for the name of InputMethodSubtypesatok2011-06-082-20/+12
* | | | | | | am 6beb924e: am 351367bb: am f368d4dc: Merge "add options to lock suw wifi se...Freeman Ng2011-06-071-1/+14
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientati...Freeman Ng2011-06-071-1/+14
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | am f368d4dc: Merge "add options to lock suw wifi setup orientation into portr...Freeman Ng2011-06-071-1/+14
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge "add options to lock suw wifi setup orientation into portrait or landsc...Freeman Ng2011-06-071-1/+14
| | | |\ \ \ \
| | | | * | | | add options to lock suw wifi setup orientation into portrait or landscapeFreeman Ng2011-06-061-1/+14
| | | | | |/ / | | | | |/| |
* | | | | | | am 62634b30: am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog alway...Gilles Debunne2011-06-071-30/+10
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog always shownGilles Debunne2011-06-061-30/+10
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | am 8f1bd8a7: Bug 4539424: confirmation dialog always shownGilles Debunne2011-06-061-30/+10
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug 4539424: confirmation dialog always shownGilles Debunne2011-06-061-30/+10
* | | | | | | am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aospMarco Nelissen2011-06-071-0/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | resolved conflicts for merge of 531bed61 to honeycomb-plus-aospMarco Nelissen2011-06-061-0/+3
| |\ \ \ \ \ \
| | * \ \ \ \ \ am 95364e4a: Allow alternate string to be used for min_numbersy310.choi2011-05-261-0/+3
| | |\ \ \ \ \ \
| | | * | | | | | Allow alternate string to be used for min_numbersy310.choi2011-05-261-0/+3
| | * | | | | | | am bc20d67f: Merge "Avoid crash when switching to 2G/3G network."Conley Owens2011-04-271-9/+12
| | |\ \ \ \ \ \ \
| | | * | | | | | | Avoid crash when switching to 2G/3G network.Kenneth Westin2011-04-261-9/+12
| | * | | | | | | | am e5da8565: DO NOT MERGE Add support for additional System Update menu itemPark Sanghyun2011-03-301-0/+9
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | | | |
| | | * | | | | | | DO NOT MERGE Add support for additional System Update menu itemPark Sanghyun2011-03-251-0/+9
* | | | | | | | | | am cfe26919: am 533b7b53: am 90599cdf: Merge "Used space visible in SD Card b...Gilles Debunne2011-06-072-0/+13
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 533b7b53: am 90599cdf: Merge "Used space visible in SD Card bar graph" int...Gilles Debunne2011-06-062-0/+14
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2Gilles Debunne2011-06-062-0/+14
| | |\ \ \ \ \ \ \ \ | | | | |_|_|/ / / / | | | |/| | | | | |
| | | * | | | | | | Merge "Used space visible in SD Card bar graph" into honeycomb-mr2Gilles Debunne2011-06-062-0/+14
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | Used space visible in SD Card bar graphGilles Debunne2011-06-032-0/+14
* | | | | | | | | | | am b7e7a8cb: am 2a9dfc5c: am 99da1a22: Always show unmount confirmation dialogGilles Debunne2011-06-071-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | / / | |_|_|_|_|_|_|_|/ / |/| | | | | | | | |
| * | | | | | | | | am 2a9dfc5c: am 99da1a22: Always show unmount confirmation dialogGilles Debunne2011-06-061-1/+2
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | am 99da1a22: Always show unmount confirmation dialogGilles Debunne2011-06-061-1/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | |
| | | * | | | | | Always show unmount confirmation dialogGilles Debunne2011-06-031-1/+2
| | | |/ / / / /
* | | | | | | | am 51a1bb15: am ad466222: am 51a9d157: Merge "Fix account type dialog re-crea...Amith Yamasani2011-06-031-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orien...Amith Yamasani2011-06-021-0/+1
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 51a9d157: Merge "Fix account type dialog re-creation on orientation change...Amith Yamasani2011-06-021-0/+1
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Fix account type dialog re-creation on orientation change." into honey...Amith Yamasani2011-06-021-0/+1
| | | |\ \ \ \ \
| | | | * | | | | Fix account type dialog re-creation on orientation change.Amith Yamasani2011-06-021-0/+1
| | | | | |_|_|/ | | | | |/| | |
* | | | | | | | am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mous...Jeff Brown2011-06-031-0/+209
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." int...Jeff Brown2011-06-021-0/+209
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-021-0/+209
| | |\ \ \ \ \ \ | | | |/ / / / /
| | | * | | | | Merge "Add a preference panel for mouse speed." into honeycomb-mr2Jeff Brown2011-06-021-0/+209
| | | |\ \ \ \ \
| | | | * | | | | Add a preference panel for mouse speed.Jeff Brown2011-06-021-0/+209
| | | | |/ / / /