128473 Commits

Author SHA1 Message Date
Chris Craik
c306ad61a7 Add convenience methods to encourage usage of ALL_SAVE_FLAG
Change-Id: I7a3bb2b83ca0463282764898e755b5f1a71ac557
2014-04-17 14:28:18 -07:00
Leon Scroggins
7085d138b2 Merge "Call SkShader::isOpaque() to determine opaqueness." 2014-04-17 17:25:22 +00:00
Chris Craik
ddd4a9b9c3 Merge "Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"" 2014-04-17 17:06:22 +00:00
Ji-Hwan Lee
e8ee783541 Merge "Minor fix to remove verbose logcat output in SyncStorageEngine" 2014-04-17 17:04:24 +00:00
George Mount
99d2ffa126 Merge "Split Activity Transitions out of PhoneWindow." 2014-04-17 16:51:59 +00:00
George Mount
31a217290c Split Activity Transitions out of PhoneWindow.
Bug 13622834
Made it possible to use shared elements without making
Views invisible.

Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
2014-04-17 09:49:25 -07:00
Chris Craik
091ddb1374 Revert "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
This reverts commit 39b7353acacf08a3c0204a9ec122fff420e53310.

Change-Id: I732eab8a2843dd23c86bd1526ec95db5352d39a0
2014-04-17 16:37:23 +00:00
Chris Craik
0932cf87c1 Merge "Deprecate color array drawBitmap methods" 2014-04-17 16:31:16 +00:00
Chris Craik
2632f19728 Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG" 2014-04-17 16:30:26 +00:00
Robin Lee
56a0a269cd Merge "Allow ProfileOwner apps to manage app restrictions" 2014-04-17 15:54:54 +00:00
Baligh Uddin
5f0f54871f Merge "Import translations. DO NOT MERGE" 2014-04-17 15:49:05 +00:00
Baligh Uddin
cdb6bb59c7 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:49:05 +00:00
Baligh Uddin
0c4d25f799 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:48 +00:00
Baligh Uddin
16b5480bd0 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:45 +00:00
Baligh Uddin
715ec84d4c Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:37 +00:00
Baligh Uddin
b1a19c5134 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:37 +00:00
Baligh Uddin
48bd1b195f Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:29 +00:00
Baligh Uddin
72f8056db1 Merge "Import translations. DO NOT MERGE" 2014-04-17 15:48:22 +00:00
Robin Lee
66e5d96cf9 Allow ProfileOwner apps to manage app restrictions
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
2014-04-17 15:58:03 +01:00
John Spurlock
9b5d028c69 Merge "Interim quick settings update." 2014-04-17 14:38:05 +00:00
John Spurlock
73203ebf97 Interim quick settings update.
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
2014-04-17 10:26:45 -04:00
Skia_Android Canary Bot
5932b0d8fc Call SkShader::isOpaque() to determine opaqueness.
It is invalid to call SkShader::getFlags() before calling
SkShader::setContext() - it will always return 0. Instead, call
SkShader::isOpaque().

Change-Id: If35108dc7f0eca55d2ec8466b8a50fd54dfb13a2
2014-04-17 09:55:59 -04:00
Adrian Roos
379ac2d8b6 Merge "Fix broken status bar when activity is showing above keyguard" 2014-04-17 13:54:57 +00:00
Adrian Roos
25ab3d9438 Fix broken status bar when activity is showing above keyguard
Bug: 14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
2014-04-17 15:46:41 +02:00
Adrian Roos
c8ba7d3f87 Make camera affordance fly away
Stop gap measure to differenciate the accepted vs rejected
response of the camera affordance on the lockscreen.

Bug: 14081010
Change-Id: I04d170aa3f07ce5f440fb1d27f7c62ef2a903a03
2014-04-17 15:09:41 +02:00
Ji-Hwan Lee
886113dfca Minor fix to remove verbose logcat output in SyncStorageEngine
Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
2014-04-17 14:16:38 +09:00
Sungsoo Lim
33ac0dfc9f Merge "Replace sessionStateMap with sessionTokens." 2014-04-17 04:53:43 +00:00
Sungsoo Lim
7de5e23471 Replace sessionStateMap with sessionTokens.
Change-Id: I6ec3390ca31cd17da35f0b0b83b1b09600d7d6d1
2014-04-17 13:47:14 +09:00
John Reck
c731435649 Merge "Add missing resume() call" 2014-04-17 04:36:52 +00:00
John Reck
3b3d66ef68 Merge "Clear mIgnoreDirtyState after draw" 2014-04-17 04:33:15 +00:00
John Reck
6f07a0dc87 Add missing resume() call
Bug: 14087850

Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
2014-04-16 21:32:25 -07:00
John Reck
6313b9259d Clear mIgnoreDirtyState after draw
Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
2014-04-16 21:32:24 -07:00
Chris Craik
cd23df6a08 Deprecate color array drawBitmap methods
Change-Id: I3339214ddaa7a32e9ddbbb1a074fa98e393eaadf
2014-04-16 18:56:35 -07:00
Chris Craik
39b7353aca Add convenience methods, to encourage usage of ALL_SAVE_FLAG
Change-Id: I29aefd70071ff49a259db5c06dded3cd531f6ef1
2014-04-16 18:05:52 -07:00
Jason Sams
a2c8a1b887 am a09695f5: (-s ours) am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
* commit 'a09695f59c06256663f3a46546fbcdd6da10f180':
  RenderScript bicubic resize intrinsic [DO NOT MERGE]
2014-04-17 00:00:06 +00:00
Aaron Whyte
8aa68921a5 am ee5d512d: am 4980996b: Merge "Allowed custom secure-adb confirmation via 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.
2014-04-16 23:56:07 +00:00
Jason Sams
a09695f59c am 38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
* commit '38f407cb1daca91af82943c931593d11a6c84b1c':
  RenderScript bicubic resize intrinsic [DO NOT MERGE]
2014-04-16 23:54:22 +00:00
Jason Sams
38f407cb1d Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev 2014-04-16 23:49:30 +00:00
Aaron Whyte
ee5d512d62 am 4980996b: Merge "Allowed custom secure-adb confirmation via Activity or 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.
2014-04-16 23:49:20 +00:00
Alan Viverette
3d295988f2 Merge "Clean up VectorDrawable formatting" 2014-04-16 23:48:32 +00:00
Aaron Whyte
4980996bcc Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev 2014-04-16 23:45:22 +00:00
Jason Sams
d666d92b80 RenderScript bicubic resize intrinsic [DO NOT MERGE]
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
2014-04-16 16:41:01 -07:00
Ruben Brunk
a2e86e427d Merge "Update DNG tags." 2014-04-16 23:36:21 +00:00
Adam Powell
c44762eb5b am 3d678ad4: (-s ours) am 973ddaac: DO NOT MERGE Add isRound to WindowInsets
* commit '3d678ad462ee237d86efd9d985eb518817761e05':
  DO NOT MERGE Add isRound to WindowInsets
2014-04-16 23:27:00 +00:00
Alan Viverette
d20974bd51 Clean up VectorDrawable formatting
Change-Id: I9110f6ddeda9a811e466e58e451fa95eca08e72e
2014-04-16 16:24:00 -07:00
Adam Powell
3d678ad462 am 973ddaac: DO NOT MERGE Add isRound to WindowInsets
* commit '973ddaacaef255b8659d35cfe4151dd5b7436138':
  DO NOT MERGE Add isRound to WindowInsets
2014-04-16 23:23:02 +00:00
Fabrice Di Meglio
2c5453e5ce Merge "Add Preference highlighting" 2014-04-16 23:20:26 +00:00
Adam Powell
23c5bbb090 Merge "Revert the revert of adding isRound to WindowInsets after early merge" 2014-04-16 23:16:51 +00:00
Adam Powell
2accbf904f Revert the revert of adding isRound to WindowInsets after early merge
This reverts commit 01ebfbd0a0a3a89b563ab6c8c346c669eca39a1a.

Change-Id: I3d5a3523a1505cc3bfd0172c7282a8eda21ae206
2014-04-16 23:14:57 +00:00
Ruben Brunk
7c062369d5 Update DNG tags.
Change-Id: I497b0fac5d52005c126eaf52c67d30bd224a80b5
2014-04-16 16:01:29 -07:00