summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2358-906/+310
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0ebdd301a5b6e045641e3671ee8018d74a914185 Auto-generated-cl: translation import
* | | | | | | am c268bf37: am 254975aa: Merge "Use a generic icon for Home" into klp-devChristopher Tate2013-09-244-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | * commit 'c268bf379b3da1f29507f75fe8c9115b63acb3a8': Use a generic icon for Home
| * | | | | | am 254975aa: Merge "Use a generic icon for Home" into klp-devChristopher Tate2013-09-244-0/+0
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | * commit '254975aac1e42997c2e068a623e7221470525ee1': Use a generic icon for Home
| | * | | | | Use a generic icon for HomeJeff Sharkey2013-09-234-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's only a *foolish* consistency that is the hobgoblin of little minds. Bug 10849877 Change-Id: Ice60cbb13a754edc104ae8630cb3d8dfe637d1af
* | | | | | | am 6be9bffa: am 88cf7709: Implement issue #10895990: Better durations for ↵Dianne Hackborn2013-09-242-0/+12
|\ \ \ \ \ \ \ | |/ / / / / / | | | / / / / | |_|/ / / / |/| | | | | | | | | | | | | | | | | proc stats * commit '6be9bffa6fb5ff3def3ed38dae61dc19f88c0185': Implement issue #10895990: Better durations for proc stats
| * | | | | am 88cf7709: Implement issue #10895990: Better durations for proc statsDianne Hackborn2013-09-232-0/+12
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '88cf7709cb7ed829980cb8ddac3d5c7ac945d772': Implement issue #10895990: Better durations for proc stats
| | * | | | Implement issue #10895990: Better durations for proc statsDianne Hackborn2013-09-232-0/+12
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new option to select data duration to show, with the default being 3 hours. Reworked how menus are updated to remove redundant code. Switch to using new proc stats service API for retrieving stats, which is more efficient and won't hit IPC limits. Fixed layout for details items to ellipsize long items. Change-Id: I1a0f8a4adf8fc330c2639077323c6379d23ad987
* | | | | am a771964f: am 995e69d1: Merge "Offer to enable a print service after it is ↵Svetoslav2013-09-204-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | installed (Settings)." into klp-dev * commit 'a771964fe63cfd3d4b8937f320e41f30461c5f57': Offer to enable a print service after it is installed (Settings).
| * | | | am 995e69d1: Merge "Offer to enable a print service after it is installed ↵Svetoslav2013-09-204-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | (Settings)." into klp-dev * commit '995e69d1e130d54b371e4278e90d508e025de9a2': Offer to enable a print service after it is installed (Settings).
| | * | | Merge "Offer to enable a print service after it is installed (Settings)." ↵Svetoslav2013-09-214-1/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | into klp-dev
| | | * | | Offer to enable a print service after it is installed (Settings).Svetoslav2013-09-204-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user has to explicitly enable a print service from the settings UI before using it. Usually, users very rarely if at all interact with print services, therefore all print service management task are performed from the print settings. We also have to get user consent warning that the user's data is about to be given to a third-party app. We now post a notification allowing the user to go directly to the settings screen to turn the service on. bug:10447510 Change-Id: Ibfb5368a09b1e012dd6dd0f3d33a5ad10e5ee00e
* | | | | | am 1950047a: am c9ebf9bb: Merge "Change "Device sensors only" to "Device ↵Lifu Tang2013-09-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sensors"" into klp-dev * commit '1950047a32fcc3ebcec8adad81770cfd3060716b': Change "Device sensors only" to "Device sensors"
| * | | | | am c9ebf9bb: Merge "Change "Device sensors only" to "Device sensors"" into ↵Lifu Tang2013-09-201-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'c9ebf9bbad2eec84a68799a71a229d3198b49c73': Change "Device sensors only" to "Device sensors"
| | * | | | Merge "Change "Device sensors only" to "Device sensors"" into klp-devLifu Tang2013-09-211-1/+1
| | |\ \ \ \
| | | * | | | Change "Device sensors only" to "Device sensors"Lifu Tang2013-09-201-1/+1
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix b/10856635 Change-Id: I52ef1daacc205c50056fcead0e6b07c8674275f0
* | | | | | am 2b130d78: am de105da5: Merge "Change string documentation for widget ↵Jim Miller2013-09-201-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | setting to be more clear." into klp-dev * commit '2b130d786deb961c113b97dae136e0f8e6b47a8c': Change string documentation for widget setting to be more clear.
| * | | | | am de105da5: Merge "Change string documentation for widget setting to be ↵Jim Miller2013-09-201-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | more clear." into klp-dev * commit 'de105da5500477d216d226cc342811e335f8bcb4': Change string documentation for widget setting to be more clear.
| | * | | | Merge "Change string documentation for widget setting to be more clear." ↵Jim Miller2013-09-201-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | into klp-dev
| | | * | | Change string documentation for widget setting to be more clear.Jim Miller2013-09-201-1/+1
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 10505288 Change-Id: I6a375c710b77db845073fffa6ebf15c1cd262900
* | | | | am a9d1d90c: am d8f4eb50: Merge "wifi-display: mark certification strings as ↵Chong Zhang2013-09-201-9/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | not tranlatable" into klp-dev * commit 'a9d1d90c526e36f495de7f77a299863dc5761ccf': wifi-display: mark certification strings as not tranlatable
| * | | | am d8f4eb50: Merge "wifi-display: mark certification strings as not ↵Chong Zhang2013-09-201-9/+9
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | tranlatable" into klp-dev * commit 'd8f4eb50ba8efb4e38c41e00ef1a176b99cdda33': wifi-display: mark certification strings as not tranlatable
| | * | | wifi-display: mark certification strings as not tranlatableChong Zhang2013-09-191-9/+9
| | |/ / | | | | | | | | | | | | | | | | Bug: 10507614 Change-Id: I96557f48cb25bc767a3b4c7620a2312417018119
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-1859-3036/+2001
| | |/ | | | | | | | | | | | | Change-Id: I7c84e43d9c5b44e9927994a8e6349666478d399d Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1959-3035/+1944
| | | | | | | | | | | | | | | Change-Id: Ic72a804da5471d03b12a22e526932195feab9ccf Auto-generated-cl: translation import
* | | am 9773a014: am d810a6a5: Merge "Implement new method for handling SMS/MMS ↵David Braun2013-09-173-28/+74
|\ \ \ | |/ / | | | | | | | | | | | | | | | on the platform" into klp-dev * commit '9773a014003201f9b629ebd69633f7904d909d32': Implement new method for handling SMS/MMS on the platform
| * | am d810a6a5: Merge "Implement new method for handling SMS/MMS on the ↵David Braun2013-09-173-28/+74
| |\ \ | | |/ | | | | | | | | | | | | | | | platform" into klp-dev * commit 'd810a6a59a44f9b5bde021dfa0e5507dc4ec0472': Implement new method for handling SMS/MMS on the platform
| | * Merge "Implement new method for handling SMS/MMS on the platform" into klp-devDavid Braun2013-09-173-28/+74
| | |\
| | | * Implement new method for handling SMS/MMS on the platformDavid Braun2013-09-163-28/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi project change: The changes in this project update the settings app to support the new default SMS app setting. I have also updated the order of the wireless settings in the UX as per request from rachelg. Bug: 10449618 Change-Id: Iba1ac6ea3f29c2a72af83b122ec5ea3a16a28e58
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-1658-1560/+2842
| | |/ | | | | | | | | | | | | Change-Id: Id76027847101f7e17749c6c60863ec213bc6fff9 Auto-generated-cl: translation import
* | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1659-1170/+3104
| | | | | | | | | | | | | | | Change-Id: I2ab06cc0b9600edc5489f799ed218eb50408980f Auto-generated-cl: translation import
* | | am 96d315c7: am 77fbf0c7: Merge "Payments: use latest settings icon." into ↵Martijn Coenen2013-09-164-0/+0
|\ \ \ | |/ / | | | | | | | | | | | | | | | klp-dev * commit '96d315c7b7853fd62d6f1b35d040791ac43d5fe7': Payments: use latest settings icon.
| * | am 77fbf0c7: Merge "Payments: use latest settings icon." into klp-devMartijn Coenen2013-09-164-0/+0
| |\ \ | | |/ | | | | | | | | | * commit '77fbf0c7a43fff4cf427a31186d1ca8777895205': Payments: use latest settings icon.
| | * Merge "Payments: use latest settings icon." into klp-devMartijn Coenen2013-09-164-0/+0
| | |\
| | | * Payments: use latest settings icon.Martijn Coenen2013-09-134-0/+0
| | | | | | | | | | | | | | | | | | | | Bug: 10262585 Change-Id: I40e52c67be73f4c434ced755dbc6d340ff709e2a
* | | | am 882a5b3e: am 256e51d3: Merge "Ignore print service settings activities if ↵Svetoslav2013-09-151-5/+10
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | they are not exported." into klp-dev * commit '882a5b3e60c764b9d5acef54e7eba20826760143': Ignore print service settings activities if they are not exported.
| * | | am 256e51d3: Merge "Ignore print service settings activities if they are not ↵Svetoslav2013-09-151-5/+10
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | exported." into klp-dev * commit '256e51d328ac28594a6057de829190ffe4fa593f': Ignore print service settings activities if they are not exported.
| | * | Merge "Ignore print service settings activities if they are not exported." ↵Svetoslav2013-09-161-5/+10
| | |\ \ | | | | | | | | | | | | | | | into klp-dev
| | | * | Ignore print service settings activities if they are not exported.Svetoslav2013-09-151-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The print spooler cannot start not exported activities and they should not be started from another application anyway. Therefore, we do not start them from settings too even though settings can do that since it is signed with the platform certificate. 2. Adding some string changes to meet the translation deadline. bug:10680224 Change-Id: I69c189e1c502985aceb68d269492f2e86de44ec4
* | | | | am 18d6e016: am 2d29fad1: Merge "Various proc stats UI improvements." into ↵Dianne Hackborn2013-09-151-2/+33
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit '18d6e0164c4f1eccfce5fab064d84dec3bc6c745': Various proc stats UI improvements.
| * | | | am 2d29fad1: Merge "Various proc stats UI improvements." into klp-devDianne Hackborn2013-09-151-2/+33
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '2d29fad197c1fe17e5a61fb30944c5add989e7f1': Various proc stats UI improvements.
| | * | | Merge "Various proc stats UI improvements." into klp-devDianne Hackborn2013-09-161-2/+33
| | |\ \ \
| | | * | | Various proc stats UI improvements.Dianne Hackborn2013-09-151-2/+33
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Option to include system processes. - Option to use uss instead of pss sizes. - Option to select type of stats: background processes, foreground (top) processes, cached processes. - Details now shows max mem usage. Change-Id: Ic994564ce846bc1021bf35576feeb9ef095b0e48
* | | | | am ae6067c4: am 8104ac0c: Merge "Update the action bar in settings." into ↵Mindy Pereira2013-09-151-0/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | klp-dev * commit 'ae6067c4bd9e86ed8f4b48ec8c266c7d0caa822a': Update the action bar in settings.
| * | | | am 8104ac0c: Merge "Update the action bar in settings." into klp-devMindy Pereira2013-09-151-0/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '8104ac0c5135508cad8e203ad1936a0c08d555a9': Update the action bar in settings.
| | * | | Merge "Update the action bar in settings." into klp-devMindy Pereira2013-09-151-0/+1
| | |\ \ \
| | | * | | Update the action bar in settings.Mindy Pereira2013-09-131-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7236636c3b5440c9811cb452a082e6e3dd72bb58
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2013-09-1470-68/+920
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13c51ef2316f477f02ec447afcd63f036e89ab6f Auto-generated-cl: translation import
* | | | | | am ff8af60a: am 189dab3d: Merge "Activity for messaging installed CA certs, ↵Maggie Benthall2013-09-148-0/+108
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and icon in Settings." into klp-dev * commit 'ff8af60a9c3098509939b579bf1c0b2cd09d4666': Activity for messaging installed CA certs, and icon in Settings.
| * | | | | am 189dab3d: Merge "Activity for messaging installed CA certs, and icon in ↵Maggie Benthall2013-09-148-0/+108
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Settings." into klp-dev * commit '189dab3d41312b6404f2121d54580ee2c5b9df8e': Activity for messaging installed CA certs, and icon in Settings.
| | * | | | Merge "Activity for messaging installed CA certs, and icon in Settings." ↵Maggie Benthall2013-09-148-0/+108
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | into klp-dev