summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Correct strings for Plaform Anti-malwarerich cannings2012-09-141-1/+1
| | | | | | | | | | Set strings to: Verify apps Disallow or warn before installation of apps that may cause harm Bug: 7168682 Change-Id: Ic0102dd82ec26dd7239eaeaa7daa2b2f47fd6365
* Add support for setting lock widgetsMichael Jurka2012-09-146-2/+35
| | | Change-Id: I26165f1bc60e3cf277dbdd4f627ac720b492ffde
* Merge "Multi-user battery settings." into jb-mr1-devDianne Hackborn2012-09-131-0/+3
|\
| * Multi-user battery settings.Dianne Hackborn2012-09-121-0/+3
| | | | | | | | | | | | Aggregates battery use from other users into one line item. Change-Id: I811e681891a9ff098491de1e096232f38bf061a9
* | Merge "Iteration on multi-user Storage UI." into jb-mr1-devJeff Sharkey2012-09-131-1/+2
|\ \ | |/ |/|
| * Iteration on multi-user Storage UI.Jeff Sharkey2012-09-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that DefaultContainerService has visibility of external storage for all users, we can measure internal storage in a single pass. Internal storage measurement now iterates across all known users, counting both apps and emulated storage usage. Create MeasurementDetails object with documentation about what is counted under various device configurations. Generalize to measure each Environment.DIRECTORY separately, so it can be combined as needed. General cleanup of how measurements are passed to UI. Bug: 7003520 Change-Id: Ib89c185296a0c9debdc20beeaa98584d803a84e8
* | Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, ↵Fabrice Di Meglio2012-09-121-1/+2
|\ \ | |/ |/| | | Hebrew, farsi)" into jb-mr1-dev
| * Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)Fabrice Di Meglio2012-09-111-1/+2
| | | | | | | | | | | | - fix Data Usage text direction for list items Change-Id: I938fa77e7cfb2a900daa9f5d081c8e2fd63a42cf
* | Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, ↵Fabrice Di Meglio2012-09-111-1/+2
|\ \ | |/ | | | | Hebrew, farsi)" into jb-mr1-dev
| * Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)Fabrice Di Meglio2012-09-111-1/+2
| | | | | | | | | | | | - fix "Network SSID" string direction Change-Id: I8491f8f9d52f80863ee78b645e2e34f5f5ff3656
* | am 43a5c62c: am a47a3c8d: Merge "Fix color of text in widget picker" into ↵Michael Jurka2012-09-101-1/+1
|\ \ | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit '43a5c62ceb856dbc4ace1f85dfed276216217c8b': Fix color of text in widget picker
| * \ Merge "Fix color of text in widget picker" into jb-mr1-devMichael Jurka2012-09-101-1/+1
| |\ \
| | * | Fix color of text in widget pickerMichael Jurka2012-09-101-1/+1
| | | |
* | | | am 4e201cc6: am f7d76210: Merge "User management UI: take 2" into jb-mr1-devAmith Yamasani2012-09-1011-59/+72
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '4e201cc6eae8a03e7a8133f32eec9ef0ff4dd7d0': User management UI: take 2
| * | | Merge "User management UI: take 2" into jb-mr1-devAmith Yamasani2012-09-1011-59/+72
| |\ \ \
| | * | | User management UI: take 2Amith Yamasani2012-09-1011-59/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Single screen user management, also visible on secondary users. Work in progress, especially with respect to synchronizing with the Me profile. Change-Id: Id6e94a85d53356847e4e019c52e3388de9ecb354
| * | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-1098-4419/+1679
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broken build. This reverts commit d5babab623512cb7c9d27ee10af2702272c64aa6 Change-Id: Ia088b9bb3471c943276a435bd5c749c45125a19d
| * | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1098-1679/+4419
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: I86ce438ad7821460d932824b63aa196c77e61f56 Auto-generated-cl: translation import
* | | | am 32cf21c9: am bfbdceff: Grey out App Check setting when no verifiers existrich cannings2012-09-101-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '32cf21c9b9000238d69870cada23d45233d11670': Grey out App Check setting when no verifiers exist
| * | | Grey out App Check setting when no verifiers existrich cannings2012-09-091-2/+2
| |/ / | | | | | | | | | | | | Bug: 7082362 Change-Id: I6e8a6032b58145fe6e2918f364ffd92cbb97ed67
* | | am e6195a12: am 1352c142: Merge "Add package verification to settings app" ↵rich cannings2012-09-102-0/+10
|\ \ \ | |/ / | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'e6195a12edac8e32c9176771b36b64915498706d': Add package verification to settings app
| * | Add package verification to settings apprich cannings2012-09-072-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Adds a dialog/toggle in security settings to turn package verification on and off. Bug: 7082362 Change-Id: I9985437ae28e4a999992c91a7e88547495ccbda2
* | | am 54ae7e51: am d4b711e6: Merge "Settings for the screen magnification ↵Svetoslav Ganov2012-09-103-18/+64
|\ \ \ | |/ / | | | | | | | | | | | | | | | feature." into jb-mr1-dev * commit '54ae7e51a8a675e4ab4d671e19099f74502aba81': Settings for the screen magnification feature.
| * | Merge "Settings for the screen magnification feature." into jb-mr1-devSvetoslav Ganov2012-09-073-18/+64
| |\ \
| | * | Settings for the screen magnification feature.Svetoslav Ganov2012-09-073-18/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Screen magnification on the device has to he explicitly enabled by the user before allowing a global gesture related interactions. The feature toggle setting is in Settings->Accessibility and it is a separate screen with instructions how to use the feature and a toggle switch. 2. Added a setting in developer options for toggling the magnification auto update feature. If this features is on the screen is zoomed out or rotation or activity start. Also if the feature is enabled the magnified viewport will scroll to show popped up windows. bug:5587727 Change-Id: Ic45a21d3a3928e2f5aac034751801f090b261488
* | | | am 20ec00d3: am 04df8b77: Iteration on multi-user storage UI.Jeff Sharkey2012-09-101-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '20ec00d3e8681f57cdfe465a907c3fc705b05772': Iteration on multi-user storage UI.
| * | | Iteration on multi-user storage UI.Jeff Sharkey2012-09-071-0/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Adds headers to distinguish between current and other users. Also correctly orders color chips. Bug: 7003520 Change-Id: I871f1a38d41dad5a5f7d97d91d2ebaac5951066c
* | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-1098-2529/+827
| | | | | | | | | | | | | | | | | | | | | | | | Broken Build. This reverts commit e88b7faf434ef1ddecf341e6c3470bc055610bb7 Change-Id: I6860b5d4694e8f6338c190f14c6e615a45030076
* | | Import translations. DO NOT MERGEBaligh Uddin2012-09-1098-827/+2529
| | | | | | | | | | | | | | | Change-Id: Ibeb05d837712dbbc9c7728faa7f745ad4f37dcc3 Auto-generated-cl: translation import
* | | am 0c0d6052: am 105d879c: am 98d9380a: am 680c8c8e: resolved conflicts for ↵Elliott Hughes2012-09-0651-104/+1
|\ \ \ | |/ / | | | | | | | | | | | | | | | merge of 33f86196 to stage-aosp-master * commit '0c0d605231e78c3a883b88b4abbc46ee29a7a194': Stop hard-coding sample 12- and 24-hour times.
| * | am 98d9380a: am 680c8c8e: resolved conflicts for merge of 33f86196 to ↵Elliott Hughes2012-09-0651-104/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | stage-aosp-master * commit '98d9380a5c3c6a6bfa5687af993ea43c882226b9': Stop hard-coding sample 12- and 24-hour times.
| | * \ resolved conflicts for merge of 33f86196 to stage-aosp-masterElliott Hughes2012-09-0651-104/+1
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ifc5a986179d010358a93869d9e8867af8c30f9b8
| | | * | Stop hard-coding sample 12- and 24-hour times.Elliott Hughes2012-09-0651-104/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6881640 Change-Id: I6b0d6404b0299f9efa8fd12779799f703f1c764f
| * | | | Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-devBaligh Uddin2012-09-0698-1286/+1332
| |\ \ \ \
| | * | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-1286/+1332
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke the build. This reverts commit 9dcb0727d0d7be183d615d7bdfb6836d2017966a Change-Id: I3a468f51981456476ca9c76086f0a5c08ba6a61b
| * | | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-09-0698-1332/+1286
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | Import translations. DO NOT MERGEBaligh Uddin2012-09-0598-1332/+1286
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If5b1608924c422e97c0a12ff0a41f0ade35b2822 Auto-generated-cl: translation import
* | | | | Merge "Revert "Import translations. DO NOT MERGE""Baligh Uddin2012-09-0698-1153/+823
|\ \ \ \ \
| * | | | | Revert "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-1153/+823
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Broke the build. This reverts commit d08dce4e693d898f12dacac23e84cf17ec3d6ec6 Change-Id: I512a72571adfa5c8cd893a72c7dc40570decec47
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-09-0698-823/+1153
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2012-09-0598-823/+1153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaad0437ec086a52ec61bea09e31f60884d72c211 Auto-generated-cl: translation import
* | | | | | am 5998c8ae: am ee04e472: Merge "Add content descriptions to power control ↵Charles Chen2012-09-051-0/+28
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | widget." into jb-mr1-dev * commit '5998c8ae243f5f84cd22ae283c5abd5373c436bd': Add content descriptions to power control widget.
| * | | | Merge "Add content descriptions to power control widget." into jb-mr1-devCharles Chen2012-09-051-0/+28
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Add content descriptions to power control widget.alanv2012-08-301-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6361285 Change-Id: I4fd7ed519de9a5b7e50e6905550695fad02bcc42
* | | | | am fb2a89c6: am 1537e8b3: Dream settings: list items back to constant heightJohn Spurlock2012-09-052-54/+51
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'fb2a89c686ffe8b37cd90359987505e5425e2ffe': Dream settings: list items back to constant height
| * | | | Dream settings: list items back to constant heightJohn Spurlock2012-09-052-54/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expanding/collapsing items removed, settings icon shown on right with divider if applicable. New "Start" action on the action bar to start dreaming. This is no longer in preview/test mode, but a call to .dream(). Bug: 7010260 Change-Id: Ia1d8b9a70218dcc598bf62befbf545f572bbc6b1
| * | | | FIX BUILD (DO NOT MERGE)Mathias Agopian2012-08-3198-1330/+716
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit b3e78cc41f16b0227a5fd31431c95f911c268567. Change-Id: Ifbff2b21c249dab09126b03a8cbbccde964781df
| * | | | Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-08-3098-716/+1330
| |\ \ \ \
| | * | | | Import translations. DO NOT MERGEBaligh Uddin2012-08-2998-716/+1330
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie33abb2dac44b49a64040688f9ffe7a1d7add9f3 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2012-08-3149-322/+240
|\ \ \ \ \ \