summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 3d83f5ca: am caeb7a6e: Merge "Get time zone names from CLDR."Elliott Hughes2013-09-1342-3583/+156
|\ | | | | | | | | * commit '3d83f5ca9cb39a8f000da4c7f163a25108e1f478': Get time zone names from CLDR.
| * am caeb7a6e: Merge "Get time zone names from CLDR."Elliott Hughes2013-09-1342-3583/+156
| |\ | | | | | | | | | | | | * commit 'caeb7a6e627a8326b3268a8ca588b7ea0d3d700c': Get time zone names from CLDR.
| | * Merge "Get time zone names from CLDR."Elliott Hughes2013-09-1342-3583/+156
| | |\
| | | * Get time zone names from CLDR.Elliott Hughes2013-09-1042-3583/+156
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge "Fix manifest entry for CAPTIONING_SETTINGS action" into klp-devAlan Viverette2013-09-121-0/+3
| |\ \ \ \
| | * | | | 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 1ab0933a: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-120-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * commit '1ab0933a6dbc4cb3df16b90bc730509ed4162721': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1270-1690/+423
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1170-1690/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1cb0e4fdcb057eccc90535d148a38f4149e88419 Auto-generated-cl: translation import
* | | | | | am 6cd9a67a: Merge "Increase string lengths for localization." into klp-devAmith Yamasani2013-09-111-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit '6cd9a67a5463ef97044fa1919b6317276eb8af5f': Increase string lengths for localization.
| * | | | | Merge "Increase string lengths for localization." into klp-devAmith Yamasani2013-09-111-2/+2
| |\ \ \ \ \
| | * | | | | Increase string lengths for localization.Amith Yamasani2013-09-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10287242 Bug: 10282460 Change-Id: Idf867cde3d22446f1a1ce3d4aacbf1d1607a5eb7
* | | | | | | am 52df3343: Merge "HCE: Latest UX and strings." into klp-devMartijn Coenen2013-09-1111-58/+94
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '52df3343ab471b9fcc8773ea7bcb88edb2523896': HCE: Latest UX and strings.
| * | | | | | Merge "HCE: Latest UX and strings." into klp-devMartijn Coenen2013-09-1111-58/+94
| |\ \ \ \ \ \
| | * | | | | | HCE: Latest UX and strings.Martijn Coenen2013-09-1111-58/+94
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10262585 Change-Id: I5473c4d387fed884faf77c7448fab1332f710557
* | | | | | | am 37922a16: Merge "Fix profile picture picking for restricted profiles" ↵Amith Yamasani2013-09-113-32/+128
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-dev * commit '37922a16d35526b0a118484c91ce6f8f58c45ce1': Fix profile picture picking for restricted profiles
| * | | | | | Merge "Fix profile picture picking for restricted profiles" into klp-devAmith Yamasani2013-09-113-32/+128
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Fix profile picture picking for restricted profilesAmith Yamasani2013-09-103-32/+128
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 e9aa0a94: Merge "Factor out read/write SMS settings seperate from ↵David Braun2013-09-101-4/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | send/receive." into klp-dev * commit 'e9aa0a94d0572101dd580bcc48e23b96e6c6cb71': Factor out read/write SMS settings seperate from send/receive.
| * | | | | Merge "Factor out read/write SMS settings seperate from send/receive." into ↵David Braun2013-09-101-4/+4
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | klp-dev
| | * | | | Factor out read/write SMS settings seperate from send/receive.David Braun2013-09-101-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I88177c23d165df6c00a8d32203f3a5b18aca1dcf
* | | | | | 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 c184ed76: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-090-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'c184ed7683f3d56ca545ac91c15c747f5460addc': Import translations. DO NOT MERGE
| * | | | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-1060-769/+445
| |\ \ \ \ \
| | * | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-0960-769/+445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I69705cf113c1288bad878c5b06b5519df8df92d6 Auto-generated-cl: translation import
* | | | | | | am 75c4204e: Merge "Remove sdcard developer option, avoid data crash." into ↵Jeff Sharkey2013-09-093-77/+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-103-77/+13
| |\ \ \ \ \ \
| | * | | | | | Remove sdcard developer option, avoid data crash.Jeff Sharkey2013-09-093-77/+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 ac72a3df: Merge "Limit wifi password to ascii chars" into klp-devRussell Brenner2013-09-091-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'ac72a3dfd3069c39e3605a9f5f114efb19059ded': Limit wifi password to ascii chars
| * | | | | | Merge "Limit wifi password to ascii chars" into klp-devRussell Brenner2013-09-101-1/+2
| |\ \ \ \ \ \
| | * | | | | | Limit wifi password to ascii charsRussell Brenner2013-09-091-1/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 10441448 Change-Id: I7a77a8f594dbe0ef4df60db9b26167b8f17bf8b2
* | | | | | | 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
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
generated by cgit v1.1 at 2024-09-17 02:51:56 +0000