summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-4.2.2_r1' of ↵cm-10.1.3-RC2cm-10.1.3-RC1cm-10.1.3cm-10.1.2cm-10.1.1cm-10.1.0-RC5cm-10.1.0-RC4cm-10.1.0-RC3cm-10.1.0-RC2cm-10.1.0-RC1cm-10.1.0cm-10.1-M3cm-10.1-M2mr1.1-stagingcm-10.1Steve Kondik2013-02-1349-50/+50
|\ | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/packages/screensavers/Basic into 1.1 Android 4.2.2 release 1 Conflicts: res/values-cs/strings.xml Change-Id: I2e74aa7b2567cc5a95aab7aaf6dea63737e3a462
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-042-2/+2
| | | | | | | | | | Change-Id: Icd779459e87b8391e103737838ae02a860fbaccb Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-12-0344-88/+45
| | | | | | | | | | Change-Id: I9d6e137a1e1856defa3a0e1fdae151020058cb65 Auto-generated-cl: translation import
| * Import translations. DO NOT MERGEBaligh Uddin2012-11-2948-48/+91
| | | | | | | | | | Change-Id: Ie9316b593f4e5430ca113a72709f13d1ae9d3115 Auto-generated-cl: translation import
| * Update "Basic Sleep Mode Apps" -> "Basic Daydreams"John Spurlock2012-11-271-1/+1
| | | | | | | | | | Bug: 7621151 Change-Id: Ifb00154d4f3a9892e39cd35c512ad8f92e674d84
* | Czech: changed name to something better understandableOndrej Zima2013-02-011-1/+1
|/ | | | | | | | I think the meaning of "Basic application..." which is displayed in list of applications can be little confusing. patch #2 - name unification Change-Id: I5f83c58b6253a78c4f65bedb2cf4be741304ecb6
* Import translations. DO NOT MERGEcm-10.1-M1Baligh Uddin2012-10-161-1/+1
| | | | | Change-Id: I0c6c6082d9f45ab05b54703cb51e9f9fce175ea5 Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-111-1/+1
| | | | | Change-Id: I6f506417e4d66a7a3c7e23317c54bdb84de686bc Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-083-3/+3
| | | | | Change-Id: Iafcf755394cd425e7e1d6e19df8b520803f7669a Auto-generated-cl: translation import
* Merge "Import translations. DO NOT MERGE" into jb-mr1-devBaligh Uddin2012-10-082-4/+2
|\
| * Import translations. DO NOT MERGEBaligh Uddin2012-10-052-4/+2
| | | | | | | | | | Change-Id: I8c18edb62dbe69f56eeaf0a9692500287b94e951 Auto-generated-cl: translation import
* | Various fixes for the Colors dreamRomain Guy2012-10-072-18/+20
|/ | | | | | | | | | | | Bug #7171323 1. Various code cleanups 2. Properly destroy TextureView's SurfaceTexture 3. Stop the render thread on destroy (we were leaking threads before this change) 4. Destroy the renderer synchronously 5. Save a bit of memory by not requesting an alpha channel Change-Id: I323e6c87903dbb8a6c79fe384a473b7293caf9ea
* Import translations. DO NOT MERGEBaligh Uddin2012-10-0427-54/+27
| | | | | Change-Id: I2ccbe697678d4c6d187ed88f916fe8658917819a Auto-generated-cl: translation import
* Import translations. DO NOT MERGEBaligh Uddin2012-10-0319-38/+19
| | | | | Change-Id: Iccd9aa0393f2cbf0c4fbb4ed22085f912e68b70f Auto-generated-cl: translation import
* Fix threading and stopping issues in Colors dream.Jeff Brown2012-10-032-417/+494
| | | | | | | | | | | | | | The colors dream could continue running indefinitely if the system terminated it rather an it ending voluntarily. There were also problems with the GL finish actions being performed on the wrong thread. Refactored the dream to resolve both of these problems cleanly. Bug: 7267653 Change-Id: Id58c473acebdc2eb3be342d792926c54185984a2
* Import translations. DO NOT MERGEBaligh Uddin2012-10-0248-0/+1056
| | | | | Change-Id: If3ce9bf4ad1ac9a46a33719c12b2fe3beaf3b47d Auto-generated-cl: translation import
* renaming Sleep Mode feature.Chris Wren2012-10-021-1/+1
| | | | | Bug: 7267485 Change-Id: I0c0336c9b24465defce2cb98f336536b825dfaa8
* Merge "Convert Colors from GLSurfaceView to TextureView." into jb-mr1-devDaniel Sandler2012-10-011-120/+316
|\
| * Convert Colors from GLSurfaceView to TextureView.Daniel Sandler2012-09-241-120/+316
| | | | | | | | | | | | | | | | | | (At great personal cost.) This fixes the super-janky startup for Colors. Bug: 7171323 Change-Id: If9103eaccdb3202ff94bafea7874437d0f4ddcb4
* | Fix issue #7255954: API Review: rename Dream to DreamServiceDianne Hackborn2012-09-281-2/+1
| | | | | | | | Change-Id: Ia32cb40af1708aaa2a8e74f201438e30d9eabfc4
* | Basic Dreams: abstract away strings for transalationChris Wren2012-09-272-2/+24
|/ | | | Change-Id: Ie18e9a5640c4e9f2ec6fc0ab68c8990dce917c60
* Migrate away from lightsOut() in Basic color dream.John Spurlock2012-09-211-1/+1
| | | | | Bug:7211867 Change-Id: Idcf5a8e94dec80fcf20fb729a99cfbda73f3765d
* new icons for Color Dream.Chris Wren2012-09-193-0/+0
| | | | | Bug: 7166223 Change-Id: I4fe596f685073f7901ecfe313b9031a5920ea1d3
* IconDaniel Sandler2012-08-313-0/+1
| | | | Change-Id: I8733f348d07056756accba94c3a398fb36b79866
* Something a little prettier.Daniel Sandler2012-08-311-8/+29
| | | | | | Might need to put the colors in a resource. Change-Id: I1d6d25fbcf9d026edca360222988ce7378372c11
* This was so much harder than it should have been.Daniel Sandler2012-08-314-0/+314
| | | | Change-Id: I2bef9d4a8de77d170d2228318db85db1d6ec59fe
* Initial empty repositoryChad Jones2012-08-150-0/+0