summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add convenience methods to encourage usage of ALL_SAVE_FLAGChris Craik2014-04-172-17/+38
| | | | Change-Id: I7a3bb2b83ca0463282764898e755b5f1a71ac557
* Merge "Call SkShader::isOpaque() to determine opaqueness."Leon Scroggins2014-04-171-7/+7
|\
| * Call SkShader::isOpaque() to determine opaqueness.Skia_Android Canary Bot2014-04-171-7/+7
| | | | | | | | | | | | | | | | It is invalid to call SkShader::getFlags() before calling SkShader::setContext() - it will always return 0. Instead, call SkShader::isOpaque(). Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
* | Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG""Chris Craik2014-04-172-34/+27
|\ \
| * | Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"Chris Craik2014-04-172-34/+27
| | | | | | | | | | | | | | | | | | This reverts commit 39b7353acacf08a3c0204a9ec122fff420e53310. Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
* | | Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"Ji-Hwan Lee2014-04-171-1/+1
|\ \ \
| * | | Minor fix to remove verbose logcat output in SyncStorageEngineJi-Hwan Lee2014-04-171-1/+1
| | | | | | | | | | | | | | | | Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
* | | | Merge "Split Activity Transitions out of PhoneWindow."George Mount2014-04-1720-1148/+1747
|\ \ \ \
| * | | | Split Activity Transitions out of PhoneWindow.George Mount2014-04-1720-1148/+1747
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 13622834 Made it possible to use shared elements without making Views invisible. Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
* | | | | Merge "Deprecate color array drawBitmap methods"Chris Craik2014-04-172-5/+18
|\ \ \ \ \
| * | | | | Deprecate color array drawBitmap methodsChris Craik2014-04-162-5/+18
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3339214ddaa7a32e9ddbbb1a074fa98e393eaadf
* | | | | | Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"Chris Craik2014-04-172-27/+34
|\ \ \ \ \ \ | |_|/ / / / |/| | | / / | | |_|/ / | |/| | |
| * | | | Add convenience methods, to encourage usage of ALL_SAVE_FLAGChris Craik2014-04-162-27/+34
| |/ / / | | | | | | | | | | | | Change-Id: I29aefd70071ff49a259db5c06dded3cd531f6ef1
* | | | Merge "Allow ProfileOwner apps to manage app restrictions"Robin Lee2014-04-177-0/+121
|\ \ \ \
| * | | | Allow ProfileOwner apps to manage app restrictionsRobin Lee2014-04-177-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple wrapper around the UserManager.{get|set}ApplicationRestrictions APIs. Also added a new Intent to signal to running apps that the set of restrictions has changed since startup. Change-Id: Ifd108108a73f87325b499d9de2e1b2aacc59b264
* | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-171-1/+1
|\ \ \ \ \
| * | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib109389af9ab71e378bbbc6bfbaf057f6880f142 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-174-7/+7
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-164-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9c1fa79848e6ddb1190309328e3dd9a5636b3281 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-171-2/+2
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-161-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie838a6accf3cf31099993dde7f01763a741ef882 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1756-2/+59
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1656-2/+59
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I26770bb21dc101ad08178c8d935bffe73f6a22d7 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1756-149/+1201
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1656-149/+1201
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I57057544950fecf92d0462ce93f3365660fe8810 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-172-3/+3
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-162-3/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ice08934e78e95e0c229189902366db69498d82fa Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-1756-12/+237
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-1656-12/+237
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic128b66fb70754adff7faa7f505f907dea499a68 Auto-generated-cl: translation import
* | | | | | Merge "Import translations. DO NOT MERGE"Baligh Uddin2014-04-171-1/+1
|\ \ \ \ \ \
| * | | | | | Import translations. DO NOT MERGEBaligh Uddin2014-04-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I192157eeea4a9fd359d2d4c1662a153454242ad5 Auto-generated-cl: translation import
* | | | | | Merge "Interim quick settings update."John Spurlock2014-04-1727-172/+467
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Interim quick settings update.John Spurlock2014-04-1727-172/+467
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make existing QS panel available via pulldown from header (or keyguard status view on keyguard), update the affordances as a hint. Don't allow QS to scroll, cap to max rows. Add scrim over panel to indicate that this is purely temporary. Bug:14081801 Bug:14059974 Change-Id: I166033975cbc44b91f45ee70ea5c7540390670dd
* | | | | Merge "Fix broken status bar when activity is showing above keyguard"Adrian Roos2014-04-171-2/+12
|\ \ \ \ \
| * | | | | Fix broken status bar when activity is showing above keyguardAdrian Roos2014-04-171-2/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 14077213 Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
* | | | | Make camera affordance fly awayAdrian Roos2014-04-171-0/+9
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stop gap measure to differenciate the accepted vs rejected response of the camera affordance on the lockscreen. Bug: 14081010 Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
* | | | Merge "Replace sessionStateMap with sessionTokens."Sungsoo Lim2014-04-171-15/+14
|\ \ \ \
| * | | | Replace sessionStateMap with sessionTokens.Sungsoo Lim2014-04-171-15/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I6ec3390ca31cd17da35f0b0b83b1b09600d7d6d1
* | | | | Merge "Add missing resume() call"John Reck2014-04-173-26/+4
|\ \ \ \ \
| * | | | | Add missing resume() callJohn Reck2014-04-163-26/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 14087850 Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
* | | | | | Merge "Clear mIgnoreDirtyState after draw"John Reck2014-04-172-3/+5
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Clear mIgnoreDirtyState after drawJohn Reck2014-04-162-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
* | | | | | am a09695f5: (-s ours) am 38f407cb: Merge "RenderScript bicubic resize ↵Jason Sams2014-04-170-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intrinsic [DO NOT MERGE]" into klp-modular-dev * commit 'a09695f59c06256663f3a46546fbcdd6da10f180': RenderScript bicubic resize intrinsic [DO NOT MERGE]
| * \ \ \ \ \ am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" ↵Jason Sams2014-04-162-0/+121
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into klp-modular-dev * commit '38f407cb1daca91af82943c931593d11a6c84b1c': RenderScript bicubic resize intrinsic [DO NOT MERGE]
| | * \ \ \ \ \ Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into ↵Jason Sams2014-04-162-0/+121
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-dev
| | | * | | | | | RenderScript bicubic resize intrinsic [DO NOT MERGE]Jason Sams2014-04-162-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
* | | | | | | | | am ee5d512d: am 4980996b: Merge "Allowed custom secure-adb confirmation via ↵Aaron Whyte2014-04-163-16/+56
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Activity or Service. It used to only be available via an Activity." into klp-modular-dev * commit 'ee5d512d624c15fa0c7e179ace24c7055a9f539d': Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
| * | | | | | | | am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or ↵Aaron Whyte2014-04-163-16/+56
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Service. It used to only be available via an Activity." into klp-modular-dev * commit '4980996bcc4e8065cf5dff1cf989d73face38281': Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity.
| | * | | | | | | Merge "Allowed custom secure-adb confirmation via Activity or Service. It ↵Aaron Whyte2014-04-163-16/+56
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used to only be available via an Activity." into klp-modular-dev
| | | * | | | | | | Allowed custom secure-adb confirmation via Activity or Service.Aaron Whyte2014-04-163-16/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It used to only be available via an Activity. Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
generated by cgit v1.1 at 2025-03-28 09:58:05 +0000