summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* am 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."Elliott Hughes2013-09-131-62/+72
|\ | | | | | | | | * commit '3d83f5ca9cb39a8f000da4c7f163a25108e1f478': Get time zone names from CLDR.
| * am caeb7a6e: Merge "Get time zone names from CLDR."Elliott Hughes2013-09-131-62/+72
| |\ | | | | | | | | | | | | * commit 'caeb7a6e627a8326b3268a8ca588b7ea0d3d700c': Get time zone names from CLDR.
| | * Merge "Get time zone names from CLDR."Elliott Hughes2013-09-131-62/+72
| | |\
| | | * Get time zone names from CLDR.Elliott Hughes2013-09-101-62/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the intent appears to have been "use the zone's local names if they're in the same country, and use exemplar locations otherwise", this patch gets the localized CLDR time zone name or the localized CLDR exemplar location as appropriate. Bug: 8145760 Bug: 10179879 Change-Id: Ib3968a493de9f0d3040f3afa6ca07d9f44566a32
* | | | am 8b4cdbeb: Fix recent apps in appops. Prior to this fix all apps would ↵David Christie2013-09-121-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list * commit '8b4cdbebcfb53b57ac2afec1b1e3377d6a02bb21': Fix recent apps in appops. Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list, and apps stay in the list exactly the threshold time after the location request ENDS.
| * | | | Fix recent apps in appops.David Christie2013-09-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this fix all apps would disappear from settings->location 15 minutes after the request was first made (even if request was ongoing). Tested this out - apps requesting location longer than the threshold stay in the list, and apps stay in the list exactly the threshold time after the location request ENDS. Change-Id: I7d4db25c615df2ec41e93b1b3191ba606d26719d
* | | | | am 54fa990f: Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into ↵Alan Viverette2013-09-121-0/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '54fa990f6174542e1e7fbe77a75954fcd2f39983': Fix manifest entry for CAPTIONING_SETTINGS action
| * | | | Fix manifest entry for CAPTIONING_SETTINGS actionAlan Viverette2013-09-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | BUG: 10708261 Change-Id: I54cfd8eaae97ed3da165521b9b4e73924bd3f0e1
* | | | | am ad541608: am ad0f0edb: Merge "Call to equals() comparing different types"Amith Yamasani2013-09-121-2/+2
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'ad54160844177515dfe9024521669e4b47311d0f': Call to equals() comparing different types
| * | | | am ad0f0edb: Merge "Call to equals() comparing different types"Amith Yamasani2013-09-121-2/+2
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'ad0f0edb54fd61048b64053d7eb8fafa6c84b119': Call to equals() comparing different types
| | * | | Merge "Call to equals() comparing different types"Amith Yamasani2013-09-121-2/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Call to equals() comparing different typesLászló Dávid2012-10-241-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have found this bug with the FindBugs tool Change-Id: I7f157063b0a549cb4344c048ddb612a14a915a25 Signed-off-by: László Dávid <laszlo.david@gmail.com>
* | | | | am 52df3343: Merge "HCE: Latest UX and strings." into klp-devMartijn Coenen2013-09-113-9/+46
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | * commit '52df3343ab471b9fcc8773ea7bcb88edb2523896': HCE: Latest UX and strings.
| * | | | Merge "HCE: Latest UX and strings." into klp-devMartijn Coenen2013-09-113-9/+46
| |\ \ \ \
| | * | | | HCE: Latest UX and strings.Martijn Coenen2013-09-113-9/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10262585 Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
* | | | | | am 37922a16: Merge "Fix profile picture picking for restricted profiles" ↵Amith Yamasani2013-09-111-32/+99
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '37922a16d35526b0a118484c91ce6f8f58c45ce1': Fix profile picture picking for restricted profiles
| * | | | | Fix profile picture picking for restricted profilesAmith Yamasani2013-09-101-32/+99
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to the new file picker UI and incorrect assumptions of access to sd card, have to use content provider Uris instead of file paths. Also makes the cropping robust in the event of not having a cropping intent on the platform. This should make the code play well with third party image and camera apps as well. Bug: 10666584 Change-Id: Ie8d834fe7aac96bc14829a7be084512a15ef4001
* | | | | am eb306b4c: Fix for empty "Listen to an example" string.Przemyslaw Szczepaniak2013-09-101-10/+28
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'eb306b4c15d721c69255f02497d2bcebff0c265f': Fix for empty "Listen to an example" string.
| * | | | Fix for empty "Listen to an example" string.Przemyslaw Szczepaniak2013-09-101-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because of bug in previous TTS related change (bugfix for hiding "Play TTS sample" if default language is not supported), settings stopped to call getSampleText() when it was established that current default language is supported. This change makes sure that getSampleText() is always called if language is supported. Bug: 10672535 Change-Id: I83bf7056e12ddbe2322b6a3f04552802037626aa
* | | | | am 75c4204e: Merge "Remove sdcard developer option, avoid data crash." into ↵Jeff Sharkey2013-09-092-72/+13
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '75c4204e8ab154d860824abfec965a8c62f10d77': Remove sdcard developer option, avoid data crash.
| * | | | Merge "Remove sdcard developer option, avoid data crash." into klp-devJeff Sharkey2013-09-102-72/+13
| |\ \ \ \
| | * | | | Remove sdcard developer option, avoid data crash.Jeff Sharkey2013-09-092-72/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove READ_EXTERNAL_STORAGE enforcement UI, since the permission is now always enforced. Check to see if bandwidth module is enabled when launching data usage, and finish gracefully if disabled. Bug: 10116515, 10392597 Change-Id: Id0295c405b780a53867934b3bcd0a5f56db7d87a
* | | | | | am 329e5b15: Merge "Fix NPE for stability tests" into klp-devAmith Yamasani2013-09-091-1/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '329e5b159a559791c41fbf401cf1af5063caf1cf': Fix NPE for stability tests
| * | | | | Merge "Fix NPE for stability tests" into klp-devAmith Yamasani2013-09-091-1/+4
| |\ \ \ \ \
| | * | | | | Fix NPE for stability testsAmith Yamasani2013-09-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 9882651 Change-Id: I4164764a058d68d448ef4a4aba2a18f072079b9c
* | | | | | | am d90ff677: Merge "Follow-on for #10671878: Proc stats needs to remove old ↵Dianne Hackborn2013-09-092-28/+29
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | data structures" into klp-dev * commit 'd90ff6772b9b21e6c2e6a0bfa616bd612c6bc849': Follow-on for #10671878: Proc stats needs to remove old data structures
| * | | | | | Merge "Follow-on for #10671878: Proc stats needs to remove old data ↵Dianne Hackborn2013-09-092-28/+29
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | structures" into klp-dev
| | * | | | | | Follow-on for #10671878: Proc stats needs to remove old data structuresDianne Hackborn2013-09-092-28/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UI can now show better information about services, now that we have the name of the process each service runs in and its total run time. Change-Id: I0777d8295a50c8f69c57bad24ccafe3bf0fbe5b8
* | | | | | | | am b23c86dd: Merge "Specify user when starting service" into klp-devTom O'Neill2013-09-091-4/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b23c86dd2ec48387f099749673df75cc332761e5': Specify user when starting service
| * | | | | | | Merge "Specify user when starting service" into klp-devTom O'Neill2013-09-091-4/+13
| |\ \ \ \ \ \ \
| | * | | | | | | Specify user when starting serviceTom O'Neill2013-09-091-4/+13
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Improve logging - Fix b/10621831 Change-Id: Icbb265ce53640dcf63f1c81d682f5811f196efcc
* | | | | | | | am d1253a2b: Merge "Revert "Dim icons when recent apps category is ↵Lifu Tang2013-09-092-53/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled"" into klp-dev * commit 'd1253a2b435c17513a397eee3350f737df7a1d8f': Revert "Dim icons when recent apps category is disabled"
| * | | | | | | Merge "Revert "Dim icons when recent apps category is disabled"" into klp-devLifu Tang2013-09-092-53/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Revert "Dim icons when recent apps category is disabled"Lifu Tang2013-09-092-53/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all the icons in the system dimmed, not only on Location Settings page. I haven't managed to find a simple fix to that problem. I think we should abandon this feature, and revert this CL. This reverts commit ebcd196a0ba404736288d8e6a35dd533f4ee806b. Change-Id: If39f2892c82643b936d2d9ff7b1d1c027018f3f6
* | | | | | | | am 5999658e: Merge "Dim icons when recent apps category is disabled" into ↵Lifu Tang2013-09-072-1/+53
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '5999658ef8e5ae0e1e148cca8ab8ab90813902ba': Dim icons when recent apps category is disabled
| * | | | | | | Merge "Dim icons when recent apps category is disabled" into klp-devLifu Tang2013-09-082-1/+53
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Dim icons when recent apps category is disabledLifu Tang2013-09-062-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix b/10654646 Change-Id: I7581054b0838c801cf9a6c889e8aeb9db8c7ba56
* | | | | | | | am 1e1d5324: Merge "Print service settings polish" into klp-devSvetoslav Ganov2013-09-071-23/+81
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '1e1d532491ecf10e7fd5791559b5d97be5553ae4': Print service settings polish
| * | | | | | | Merge "Print service settings polish" into klp-devSvetoslav Ganov2013-09-071-23/+81
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Print service settings polishSvetoslav Ganov2013-09-061-23/+81
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Moved the settings and add printers to the overflow menu. 2. Collapsing the search action view to get proper behavior when selected. 3. Showing the search option only if there are printers. 4. Stop observing for printers if the service is disabled. bug:10652301 Change-Id: I589a3b177c5a58a8b1382d7020fd4b128afd9038
* | | | | | | am 066d04de: Merge "Gray recent apps section when location disabled" into ↵Lifu Tang2013-09-061-3/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '066d04def1325b97e90f1aaff77e532bf299d938': Gray recent apps section when location disabled
| * | | | | | Merge "Gray recent apps section when location disabled" into klp-devLifu Tang2013-09-071-3/+5
| |\ \ \ \ \ \
| | * | | | | | Gray recent apps section when location disabledLifu Tang2013-09-061-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix b/10638903 Change-Id: I1c09661b0e5ac8d089a515b64301ddfe9bcedaa9
* | | | | | | | am fbf2d276: Merge "Made "No Recent Apps" banner brighter" into klp-devLifu Tang2013-09-061-1/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fbf2d276353e76958484b0489df84f5b6ef8feef': Made "No Recent Apps" banner brighter
| * | | | | | | Merge "Made "No Recent Apps" banner brighter" into klp-devLifu Tang2013-09-071-1/+0
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Made "No Recent Apps" banner brighterLifu Tang2013-09-061-1/+0
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix b/10638903 Change-Id: I83d3dc30315c05844ed57ee3065b099ce1ec1f96
* | | | | | | am 8ad8bfd9: Merge "Use the application name instead of package." into klp-devRobert Greenwalt2013-09-061-0/+8
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '8ad8bfd9aa871473a3cd1546bed34a366bfaa74f': Use the application name instead of package.
| * | | | | | Merge "Use the application name instead of package." into klp-devRobert Greenwalt2013-09-061-0/+8
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Use the application name instead of package.Robert Greenwalt2013-08-081-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:10094017 Change-Id: I92341a819d13169c710f0d383f362796ee3ccf61
* | | | | | | am 4c7de613: Merge "Fix bug #10624988 Incorrect mirroring of RAM and ↵Fabrice Di Meglio2013-09-062-7/+13
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Internal Storage for Apps screens in Settings" into klp-dev * commit '4c7de61320f3ea1df8d5cdd3d0645830b67722ea': Fix bug #10624988 Incorrect mirroring of RAM and Internal Storage for Apps screens in Settings
generated by cgit v1.1 at 2024-09-17 02:52:30 +0000