OSDN Git Service
Ji-Hwan Lee [Thu, 17 Apr 2014 17:04:24 +0000 (17:04 +0000)]
Merge "Minor fix to remove verbose logcat output in SyncStorageEngine"
George Mount [Thu, 17 Apr 2014 16:51:59 +0000 (16:51 +0000)]
Merge "Split Activity Transitions out of PhoneWindow."
George Mount [Tue, 25 Mar 2014 00:44:36 +0000 (17:44 -0700)]
Split Activity Transitions out of PhoneWindow.
Bug
13622834
Made it possible to use shared elements without making
Views invisible.
Change-Id: I1e85c6bc19e634a9af225ad7f0309b4f003ea462
Chris Craik [Thu, 17 Apr 2014 16:31:16 +0000 (16:31 +0000)]
Merge "Deprecate color array drawBitmap methods"
Chris Craik [Thu, 17 Apr 2014 16:30:26 +0000 (16:30 +0000)]
Merge "Add convenience methods, to encourage usage of ALL_SAVE_FLAG"
Robin Lee [Thu, 17 Apr 2014 15:54:53 +0000 (15:54 +0000)]
Merge "Allow ProfileOwner apps to manage app restrictions"
Baligh Uddin [Thu, 17 Apr 2014 15:48:52 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:50 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:48 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:45 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:36 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:31 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:29 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Thu, 17 Apr 2014 15:48:22 +0000 (15:48 +0000)]
Merge "Import translations. DO NOT MERGE"
Robin Lee [Wed, 9 Apr 2014 15:44:21 +0000 (16:44 +0100)]
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
John Spurlock [Thu, 17 Apr 2014 14:38:05 +0000 (14:38 +0000)]
Merge "Interim quick settings update."
John Spurlock [Tue, 15 Apr 2014 20:14:46 +0000 (16:14 -0400)]
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
Adrian Roos [Thu, 17 Apr 2014 13:54:57 +0000 (13:54 +0000)]
Merge "Fix broken status bar when activity is showing above keyguard"
Adrian Roos [Thu, 17 Apr 2014 13:46:41 +0000 (15:46 +0200)]
Fix broken status bar when activity is showing above keyguard
Bug:
14077213
Change-Id: I5d45fd1780498983995a469d0799e024ca25f3c7
Adrian Roos [Thu, 17 Apr 2014 13:09:41 +0000 (15:09 +0200)]
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
Ji-Hwan Lee [Thu, 17 Apr 2014 05:16:38 +0000 (14:16 +0900)]
Minor fix to remove verbose logcat output in SyncStorageEngine
Change-Id: I93b936202a99338329e73a41d4c1651369ecb70f
Sungsoo Lim [Thu, 17 Apr 2014 04:53:43 +0000 (04:53 +0000)]
Merge "Replace sessionStateMap with sessionTokens."
Sungsoo Lim [Sat, 12 Apr 2014 07:51:27 +0000 (16:51 +0900)]
Replace sessionStateMap with sessionTokens.
Change-Id: I6ec3390ca31cd17da35f0b0b83b1b09600d7d6d1
John Reck [Thu, 17 Apr 2014 04:36:51 +0000 (04:36 +0000)]
Merge "Add missing resume() call"
John Reck [Thu, 17 Apr 2014 04:33:15 +0000 (04:33 +0000)]
Merge "Clear mIgnoreDirtyState after draw"
John Reck [Thu, 17 Apr 2014 04:31:25 +0000 (21:31 -0700)]
Add missing resume() call
Bug:
14087850
Change-Id: Ic555ca6027e617c7ed6e7e66b5cf713c36ed1c6c
John Reck [Thu, 17 Apr 2014 01:59:21 +0000 (18:59 -0700)]
Clear mIgnoreDirtyState after draw
Change-Id: I6dfb39e0ebc9a5732678d735d9bc5e8813926096
Chris Craik [Thu, 17 Apr 2014 01:53:07 +0000 (18:53 -0700)]
Deprecate color array drawBitmap methods
Change-Id: I3339214ddaa7a32e9ddbbb1a074fa98e393eaadf
Chris Craik [Wed, 16 Apr 2014 22:35:50 +0000 (15:35 -0700)]
Add convenience methods, to encourage usage of ALL_SAVE_FLAG
Change-Id: I29aefd70071ff49a259db5c06dded3cd531f6ef1
Jason Sams [Thu, 17 Apr 2014 00:00:06 +0000 (00:00 +0000)]
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]
Aaron Whyte [Wed, 16 Apr 2014 23:56:07 +0000 (23:56 +0000)]
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.
Jason Sams [Wed, 16 Apr 2014 23:54:22 +0000 (23:54 +0000)]
am
38f407cb: Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
* commit '
38f407cb1daca91af82943c931593d11a6c84b1c':
RenderScript bicubic resize intrinsic [DO NOT MERGE]
Jason Sams [Wed, 16 Apr 2014 23:49:29 +0000 (23:49 +0000)]
Merge "RenderScript bicubic resize intrinsic [DO NOT MERGE]" into klp-modular-dev
Aaron Whyte [Wed, 16 Apr 2014 23:49:20 +0000 (23:49 +0000)]
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.
Alan Viverette [Wed, 16 Apr 2014 23:48:31 +0000 (23:48 +0000)]
Merge "Clean up VectorDrawable formatting"
Aaron Whyte [Wed, 16 Apr 2014 23:45:22 +0000 (23:45 +0000)]
Merge "Allowed custom secure-adb confirmation via Activity or Service. It used to only be available via an Activity." into klp-modular-dev
Jason Sams [Wed, 16 Apr 2014 23:41:01 +0000 (16:41 -0700)]
RenderScript bicubic resize intrinsic [DO NOT MERGE]
Change-Id: Icebfb3137aacddce0705834c6d4d2547c709cb0a
Ruben Brunk [Wed, 16 Apr 2014 23:36:21 +0000 (23:36 +0000)]
Merge "Update DNG tags."
Adam Powell [Wed, 16 Apr 2014 23:27:00 +0000 (23:27 +0000)]
am
3d678ad4: (-s ours) am
973ddaac: DO NOT MERGE Add isRound to WindowInsets
* commit '
3d678ad462ee237d86efd9d985eb518817761e05':
DO NOT MERGE Add isRound to WindowInsets
Alan Viverette [Wed, 16 Apr 2014 23:24:00 +0000 (16:24 -0700)]
Clean up VectorDrawable formatting
Change-Id: I9110f6ddeda9a811e466e58e451fa95eca08e72e
Adam Powell [Wed, 16 Apr 2014 23:23:02 +0000 (23:23 +0000)]
am
973ddaac: DO NOT MERGE Add isRound to WindowInsets
* commit '
973ddaacaef255b8659d35cfe4151dd5b7436138':
DO NOT MERGE Add isRound to WindowInsets
Fabrice Di Meglio [Wed, 16 Apr 2014 23:20:26 +0000 (23:20 +0000)]
Merge "Add Preference highlighting"
Adam Powell [Wed, 16 Apr 2014 23:16:50 +0000 (23:16 +0000)]
Merge "Revert the revert of adding isRound to WindowInsets after early merge"
Adam Powell [Wed, 16 Apr 2014 23:14:57 +0000 (23:14 +0000)]
Revert the revert of adding isRound to WindowInsets after early merge
This reverts commit
01ebfbd0a0a3a89b563ab6c8c346c669eca39a1a.
Change-Id: I3d5a3523a1505cc3bfd0172c7282a8eda21ae206
Ruben Brunk [Wed, 16 Apr 2014 06:53:53 +0000 (23:53 -0700)]
Update DNG tags.
Change-Id: I497b0fac5d52005c126eaf52c67d30bd224a80b5
Fabrice Di Meglio [Wed, 16 Apr 2014 02:15:20 +0000 (19:15 -0700)]
Add Preference highlighting
- use a specific drawable for highlighting a Preference
at a given position
- also add PreferenceFragment.hasListView() as hidden API
Change-Id: If69854cf6c4852d0f45e2c3a9734b1f63b352f9d
Michael Kolb [Wed, 16 Apr 2014 22:52:31 +0000 (22:52 +0000)]
Merge "Revert "Add isRound to WindowInsets""
Michael Kolb [Wed, 16 Apr 2014 22:52:14 +0000 (22:52 +0000)]
Revert "Add isRound to WindowInsets"
This reverts commit
e5244b5638535964103ca1dfc867442a64243db1.
Change-Id: I6371c718e2189968699e980fd0e7ba91c486aca6
Michael Kolb [Wed, 16 Apr 2014 22:51:32 +0000 (22:51 +0000)]
Merge "Add isRound to WindowInsets"
Baligh Uddin [Wed, 16 Apr 2014 22:17:04 +0000 (15:17 -0700)]
Import translations. DO NOT MERGE
Change-Id: I192157eeea4a9fd359d2d4c1662a153454242ad5
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 22:13:43 +0000 (15:13 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic128b66fb70754adff7faa7f505f907dea499a68
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 22:06:32 +0000 (15:06 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ice08934e78e95e0c229189902366db69498d82fa
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 22:00:17 +0000 (15:00 -0700)]
Import translations. DO NOT MERGE
Change-Id: I57057544950fecf92d0462ce93f3365660fe8810
Auto-generated-cl: translation import
Adam Powell [Wed, 16 Apr 2014 00:38:54 +0000 (17:38 -0700)]
DO NOT MERGE Add isRound to WindowInsets
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.
Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.
Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e
Conflicts:
core/java/android/view/ViewRootImpl.java
Jorim Jaggi [Wed, 16 Apr 2014 21:55:55 +0000 (21:55 +0000)]
Merge "Make MENU key work again to dismiss insecure Keyguard."
Jorim Jaggi [Wed, 16 Apr 2014 21:55:39 +0000 (21:55 +0000)]
Merge "Show enter PIN/PUK before notifications on Keyguard."
Deepanshu Gupta [Wed, 16 Apr 2014 21:54:04 +0000 (21:54 +0000)]
am
cf72f259: Fix incorrect merge conflict to klp-modular-dev-plus-aosp
* commit '
cf72f25981606b4e48130890f22f713d41e0d420':
Fix incorrect merge conflict to klp-modular-dev-plus-aosp
Aaron Whyte [Fri, 11 Apr 2014 17:53:58 +0000 (10:53 -0700)]
Allowed custom secure-adb confirmation via Activity or Service.
It used to only be available via an Activity.
Change-Id: Id79a99a70e721f3b567e75d45ffeba779264ec1e
Deepanshu Gupta [Wed, 16 Apr 2014 21:37:06 +0000 (14:37 -0700)]
Fix incorrect merge conflict to klp-modular-dev-plus-aosp
resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
properly, originally fixed in
35d46778f49c962c990cfc17e521aa80b9e0c016
Change-Id: I5d1abf641564ea19d283f60385d39f7670a2f22e
Jeff Davidson [Wed, 16 Apr 2014 21:32:06 +0000 (21:32 +0000)]
Merge "Class for managing the active scorer application."
Baligh Uddin [Wed, 16 Apr 2014 21:27:36 +0000 (14:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I26770bb21dc101ad08178c8d935bffe73f6a22d7
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 21:25:55 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie838a6accf3cf31099993dde7f01763a741ef882
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 21:25:21 +0000 (14:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: I9c1fa79848e6ddb1190309328e3dd9a5636b3281
Auto-generated-cl: translation import
Baligh Uddin [Wed, 16 Apr 2014 21:24:32 +0000 (14:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib109389af9ab71e378bbbc6bfbaf057f6880f142
Auto-generated-cl: translation import
Jeff Brown [Wed, 16 Apr 2014 21:18:49 +0000 (14:18 -0700)]
resolved conflicts for merge of
3ee9dc58 to master
Change-Id: Idd045d01246367b77718210c8b6665110da58ac4
Jeff Davidson [Mon, 14 Apr 2014 22:14:30 +0000 (15:14 -0700)]
Class for managing the active scorer application.
Allows listing all possible scorer apps, getting the active scorer
app, setting the active scorer app, and determining whether a given
UID is for the active scorer.
Note that setting a default scorer with a system image will be handled
separately - the plan here is to add a read-only build property
containing a package name to use as the scorer out of the box.
When NetworkScorerService is initialized, it will check a provisioning
bit; if that bit isn't set, it will set the current scorer to the
package specified in this build property (if any) and set the
provisioning bit to true.
Bug:
13769362
Change-Id: I18c0b2ba2aceccc88b70c3611a49149e0bf17ecf
Adam Powell [Wed, 16 Apr 2014 00:38:54 +0000 (17:38 -0700)]
Add isRound to WindowInsets
isRound allows a view to determine whether the window it is contained
within obscures the corners of the window content. This allows views
aware of this property to adapt their layout accordingly.
Switch ViewRootImpl to use dispatchApplyInsets instead of
fitSystemWindows.
Change-Id: Ic3e3936b73815b2593cb9720af1a309fbd18406e
Jeff Brown [Wed, 16 Apr 2014 20:52:24 +0000 (20:52 +0000)]
am
fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev
* commit '
fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
Declare VersionCodes.KITKAT_WATCH.
Jeff Brown [Wed, 16 Apr 2014 20:49:14 +0000 (20:49 +0000)]
Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev
Lajos Molnar [Wed, 16 Apr 2014 20:47:40 +0000 (20:47 +0000)]
Merge "media: don't rely on Java 6 parseInt error on leading '+' sign"
Dan Sandler [Wed, 16 Apr 2014 20:32:57 +0000 (20:32 +0000)]
Merge "Fix NPE if showKeyguard() is not called before hideKeyguard()."
Jeff Brown [Wed, 16 Apr 2014 20:15:22 +0000 (13:15 -0700)]
Declare VersionCodes.KITKAT_WATCH.
The constant does not have a final value yet but is useful for
documentation purposes during development.
Change-Id: Iddd9b956eff822a9a25e9df483b5bd3979189023
Dan Sandler [Wed, 16 Apr 2014 20:22:56 +0000 (16:22 -0400)]
Fix NPE if showKeyguard() is not called before hideKeyguard().
Bug:
14112212
Change-Id: Iced1085cf7be8d827cf7e34efe603a399f456c1b
Craig Mautner [Wed, 16 Apr 2014 20:13:09 +0000 (20:13 +0000)]
am
4b81e89d: am
2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '
4b81e89d9b7a2cf3ed5aacd9c647aed47f4c4675':
Fix ActivityContainer callback parcelling.
Craig Mautner [Wed, 16 Apr 2014 20:10:26 +0000 (20:10 +0000)]
am
2fd3cb95: Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
* commit '
2fd3cb9544df1e09caa725a8d542cf2fe1df0c75':
Fix ActivityContainer callback parcelling.
Craig Mautner [Wed, 16 Apr 2014 20:05:31 +0000 (20:05 +0000)]
Merge "Fix ActivityContainer callback parcelling." into klp-modular-dev
Craig Mautner [Wed, 16 Apr 2014 15:31:19 +0000 (08:31 -0700)]
Fix ActivityContainer callback parcelling.
The Binder interface for passing a callback was not implemented
properly. Also the callback for ActivityContainer now has a new
API.
Change-Id: I6b719be0cb57542f022a3cc14e8f4efde60b1a50
Mark Salyzyn [Wed, 16 Apr 2014 19:58:26 +0000 (19:58 +0000)]
am
24dbfdaa: am
936e87e1: am
5788722d: Merge "frameworks: 64 bit compile issues"
* commit '
24dbfdaa701a729e3b231db63787e0d636b7cc3b':
frameworks: 64 bit compile issues
Mark Salyzyn [Wed, 16 Apr 2014 19:53:34 +0000 (19:53 +0000)]
am
6c925305: am
2760778d: jni: liblog reading error API incorrect
* commit '
6c925305091e6df5eacbb8eb5baaf2c63062a5d9':
jni: liblog reading error API incorrect
Mark Salyzyn [Wed, 16 Apr 2014 19:51:10 +0000 (19:51 +0000)]
am
936e87e1: am
5788722d: Merge "frameworks: 64 bit compile issues"
* commit '
936e87e12dd1335c6f773705fd0a7edb32bc4385':
frameworks: 64 bit compile issues
Mark Salyzyn [Wed, 16 Apr 2014 19:49:23 +0000 (19:49 +0000)]
am
2760778d: jni: liblog reading error API incorrect
* commit '
2760778d7020c31f6b7c28383b0db6e0bef99754':
jni: liblog reading error API incorrect
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:15 +0000 (19:49 +0000)]
am
6725580a: am
97114e60: am
13ed576e: am
cda504f2: am
0aea4684: am
91f2a7cb: am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
6725580a6b34c9fb1d5d99e0d12ccedd6fed29da':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:11 +0000 (19:49 +0000)]
am
b873a0a3: (-s ours) am
985bb326: am
fa206123: am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
b873a0a3abc504b3c6b8db51ea8f3bcb97bc3ac7':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:08 +0000 (19:49 +0000)]
am
06f4c8c7: (-s ours) am
884f3b14: am
925b911f: am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
06f4c8c7315956a906d054d52ff7f27bf84db8b9':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:04 +0000 (19:49 +0000)]
am
a84a1753: (-s ours) am
0cffa9fe: am
43f1fe7e: am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
a84a175390c91cd57858f4c539243481d530bfc4':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:49:00 +0000 (19:49 +0000)]
am
43e229a1: (-s ours) am
38f2b1ea: am
30ab17dd: am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
43e229a111147eca7c7fb7a4623d2d04a4df4b43':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Wink Saville [Wed, 16 Apr 2014 19:45:20 +0000 (19:45 +0000)]
Merge "Add LISTEN_DATA_CONNECTIPON_REAL_TIME_INFO as listen event"
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:40 +0000 (19:44 +0000)]
am
97114e60: am
13ed576e: am
cda504f2: am
0aea4684: am
91f2a7cb: am
5a125053: Merge changes I66792c4d,I203b6783 into jb-mr2-dev
* commit '
97114e606219b6d44bb377410f15a0fe9732dd35':
Improve text rendering and measurement. [DO NOT MERGE]
Fix the measurement of text bounds. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:37 +0000 (19:44 +0000)]
am
985bb326: am
fa206123: am
502c83f4: am
00312846: (-s ours) am
0fe63473: am
04b4f8d1: Merge "Set default text style in layoutlib as NORMAL [DO NOT MERGE]" into jb-mr2-dev
* commit '
985bb326a6f2b63ed6ee6041654421fae098bcec':
Set default text style in layoutlib as NORMAL [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:34 +0000 (19:44 +0000)]
am
884f3b14: am
925b911f: am
013af337: am
4eeaa61f: (-s ours) am
87e14187: am
fb120acd: Merge "Add methods for Time_Delegate [DO NOT MERGE]" into jb-mr2-dev
* commit '
884f3b14c654612f922bb3927e17dfa795939594':
Add methods for Time_Delegate [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:31 +0000 (19:44 +0000)]
am
0cffa9fe: am
43f1fe7e: am
5016f769: am
b03e1176: (-s ours) am
533a52fe: am
b7fd6315: Merge "Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]" into jb-mr2-dev
* commit '
0cffa9fe6c796c69d143493aede11e3f1321262e':
Fix sans-serif-thin and sans-serif-light fonts in layoutlib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 16 Apr 2014 19:44:28 +0000 (19:44 +0000)]
am
38f2b1ea: am
30ab17dd: am
289f1ffb: am
90b0b69c: (-s ours) am
014ac85f: am
f14cbb26: Merge "Optimize layout rendering in layoutlib [DO NOT MERGE]" into jb-mr2-dev
* commit '
38f2b1ea4146a52f167d1a73e705590266848336':
Optimize layout rendering in layoutlib [DO NOT MERGE]
Mark Salyzyn [Wed, 16 Apr 2014 19:42:11 +0000 (19:42 +0000)]
am
5788722d: Merge "frameworks: 64 bit compile issues"
* commit '
5788722df7b73f1eff3edb95f2ead83d19603926':
frameworks: 64 bit compile issues
Baligh Uddin [Wed, 16 Apr 2014 19:39:46 +0000 (19:39 +0000)]
Merge "Remove activitystrings.xml from localized resource directories"
Deepanshu Gupta [Wed, 16 Apr 2014 19:38:38 +0000 (19:38 +0000)]
am
492090a5: (-s ours) am
16191f8c: resolved conflicts for merge of
0e2049cd to klp-modular-dev
* commit '
492090a55e2fa94745aaf4e0e295845d8bb1351a':
Layoutlib tests now check methods return value [DO NOT MERGE]
Jorim Jaggi [Wed, 16 Apr 2014 19:36:51 +0000 (21:36 +0200)]
Make MENU key work again to dismiss insecure Keyguard.
Bug:
14110426
Change-Id: Iab8ec9633a2169e6def13a0c6e09b77543adbb41
Mark Salyzyn [Tue, 8 Apr 2014 22:21:50 +0000 (15:21 -0700)]
jni: liblog reading error API incorrect
- return value contains -errno on error.
(cherry pick from commit
b519aeca47a7b798926c00ce5c8cf730e26e75fd)
Bug:
13907124
Change-Id: I91f12db5749fac2ae8ed5b0f033d4eaf83e666f5
Deepanshu Gupta [Wed, 16 Apr 2014 19:32:13 +0000 (19:32 +0000)]
am
35d46778: (-s ours) resolved conflicts for merge of
ec6676dd to klp-modular-dev-plus-aosp
* commit '
35d46778f49c962c990cfc17e521aa80b9e0c016':
Fix theme/style resolution in Layoutlib [DO NOT MERGE]
Mark Salyzyn [Wed, 16 Apr 2014 19:21:44 +0000 (19:21 +0000)]
Merge "frameworks: 64 bit compile issues"
Deepanshu Gupta [Wed, 16 Apr 2014 19:20:01 +0000 (19:20 +0000)]
am
16191f8c: resolved conflicts for merge of
0e2049cd to klp-modular-dev
* commit '
16191f8c4fe92036c8ff2eecd4e57b4642068b99':
Layoutlib tests now check methods return value [DO NOT MERGE]
OSDN Git Service
