drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155,433 Commits 1 Branch 0 Tags
Commit Graph

155433 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Derek Sollenberger
bde4b91ba6 am 36563491: am f19b8f33: am 5f535ec1: Merge "Remove invalid premul step from HWUI\'s matrix color filter." into lmp-dev 
* commit '365634917c6f488ff73aa6d8db0d0f0f2e8d2941':
  Remove invalid premul step from HWUI's matrix color filter.
 2014-09-04 15:28:51 +00:00
Derek Sollenberger
8aed5f9032 am f19b8f33: am 5f535ec1: Merge "Remove invalid premul step from HWUI\'s matrix color filter." into lmp-dev 
* commit 'f19b8f33d19a6aa35360d6f7d3bfdac97e9d09f6':
  Remove invalid premul step from HWUI's matrix color filter.
 2014-09-04 15:19:12 +00:00
Derek Sollenberger
4e68459f55 am 5f535ec1: Merge "Remove invalid premul step from HWUI\'s matrix color filter." into lmp-dev 
* commit '5f535ec1a130062e365f4fd9b7335076f895ecdc':
  Remove invalid premul step from HWUI's matrix color filter.
 2014-09-04 15:09:27 +00:00
Derek Sollenberger
e23b8dd58f Merge "Remove invalid premul step from HWUI's matrix color filter." into lmp-dev 2014-09-04 15:01:28 +00:00
Winson Chung
c8e9fe78e2 am 46b61181: am 710c3806: am e9883b8a: Delay in app transition until home animation completes. (Bug 17012456) 
* commit '46b611811a46aa478d23172c8ae0fbece7bb62a2':
  Delay in app transition until home animation completes. (Bug 17012456)
 2014-09-04 14:58:30 +00:00
Winson Chung
52b6521aa1 am 710c3806: am e9883b8a: Delay in app transition until home animation completes. (Bug 17012456) 
* commit '710c38061e169f07717915b1bd57cf532708d15a':
  Delay in app transition until home animation completes. (Bug 17012456)
 2014-09-04 14:48:58 +00:00
Winson Chung
965a763295 am e9883b8a: Delay in app transition until home animation completes. (Bug 17012456) 
* commit 'e9883b8a92d72a3cfd947b3ce835bc8e4da2f1b2':
  Delay in app transition until home animation completes. (Bug 17012456)
 2014-09-04 14:38:36 +00:00
Winson Chung
3884715c45 Delay in app transition until home animation completes. (Bug 17012456) 
Change-Id: I3469738a70bd872ff03c48c23201d4e0b6c8d8bb
 2014-09-04 14:29:38 +00:00
Dan Sandler
af038f69ff am 6e01c30b: am 5832bf2a: am 195fa1ec: Merge "Notification: Limit length of accepted strings" into lmp-dev 
* commit '6e01c30bfec0c8e4a5dce0ff318b32a91b2ab7e7':
  Notification: Limit length of accepted strings
 2014-09-04 14:08:00 +00:00
Dan Sandler
32e1c51f53 am 5832bf2a: am 195fa1ec: Merge "Notification: Limit length of accepted strings" into lmp-dev 
* commit '5832bf2a544f37b7894e0764e133eb98913f248d':
  Notification: Limit length of accepted strings
 2014-09-04 13:56:52 +00:00
Dan Sandler
8b5dca7cc2 am 195fa1ec: Merge "Notification: Limit length of accepted strings" into lmp-dev 
* commit '195fa1ecb5c0cc50346b8883e775ab131422e778':
  Notification: Limit length of accepted strings
 2014-09-04 13:46:51 +00:00
Kenny Guy
3f9c59cea1 am aa0ffe26: am 0d548a70: am 5c32b77f: Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 
* commit 'aa0ffe267c3bbdefb548cb5de6c7bda29f5365cb':
  Ensure all RemoteViews use myUserId rather than context.
 2014-09-04 13:40:58 +00:00
Dan Sandler
d2961355bd Merge "Notification: Limit length of accepted strings" into lmp-dev 2014-09-04 13:36:34 +00:00
Kenny Guy
c08ab9528e am 0d548a70: am 5c32b77f: Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 
* commit '0d548a7043e56d0e5070b475cbdfc9a3fb41c13e':
  Ensure all RemoteViews use myUserId rather than context.
 2014-09-04 13:30:39 +00:00
Kenny Guy
8edc8913d3 am 5c32b77f: Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 
* commit '5c32b77f3d356749ad7ea523ec399765929a07bd':
  Ensure all RemoteViews use myUserId rather than context.
 2014-09-04 13:20:35 +00:00
Kenny Guy
a449018105 Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev 2014-09-04 13:09:32 +00:00
Sander Alewijnse
b44b5d2fa9 am 32cbce43: am 085baf07: am 7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev 
* commit '32cbce437fbd3f9ed94275b630a98bda970b7b08':
  Rename email extra to email bundle key.
 2014-09-04 12:26:03 +00:00
Sander Alewijnse
a637377217 am 085baf07: am 7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev 
* commit '085baf078946adc9bc97b054309558e97377509a':
  Rename email extra to email bundle key.
 2014-09-04 12:16:18 +00:00
Sander Alewijnse
cb1d748e9a am 7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev 
* commit '7b4dc2726e9352ee0ddfc97591cd39d66a99f60e':
  Rename email extra to email bundle key.
 2014-09-04 12:06:13 +00:00
Sander Alewijnse
8e31523317 Merge "Rename email extra to email bundle key." into lmp-dev 2014-09-04 11:59:41 +00:00
Kenny Guy
7f45fad757 am 05ba9c9f: am 377da54c: am 29ad833b: Merge "Use context for user when calling notifyAsUser" into lmp-dev 
* commit '05ba9c9fdeaff32287aeebbe90fc8c6f9364a350':
  Use context for user when calling notifyAsUser
 2014-09-04 11:51:14 +00:00
Kenny Guy
2b4decf074 am 377da54c: am 29ad833b: Merge "Use context for user when calling notifyAsUser" into lmp-dev 
* commit '377da54cfa02194798c81c93c92da42de728da75':
  Use context for user when calling notifyAsUser
 2014-09-04 11:41:34 +00:00
Kenny Guy
879ebec4e2 Ensure all RemoteViews use myUserId rather than context. 
Remote views may be inflated in another user so
explicitly use processes user id rather than the
user id of the context.

Bug: 17302505
Change-Id: I985c91745f03dd7e6b2ab6357600077664d8e6be
 2014-09-04 12:40:24 +01:00
Narayan Kamath
5779df0b2c am 38e8ae0d: am 04c72e30: am be76be83: Merge "android_media_MediaMuxer_setLocation: amended signature." 
* commit '38e8ae0d3b7135520453eb371d2963581a08d77c':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-09-04 11:36:22 +00:00
Kenny Guy
6b19d02eb3 am 29ad833b: Merge "Use context for user when calling notifyAsUser" into lmp-dev 
* commit '29ad833b319d4d403dd26ed0fd73dc07a91c2f44':
  Use context for user when calling notifyAsUser
 2014-09-04 11:31:03 +00:00
Sander Alewijnse
aff9f4cb88 Rename email extra to email bundle key. 
Bug:17197410
Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
 2014-09-04 12:28:52 +01:00
Narayan Kamath
f71f91d438 am 04c72e30: am be76be83: Merge "android_media_MediaMuxer_setLocation: amended signature." 
* commit '04c72e304c7c79b77eed61a6aa605526cf14ecca':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-09-04 11:25:42 +00:00
Kenny Guy
4c4e796444 Merge "Use context for user when calling notifyAsUser" into lmp-dev 2014-09-04 11:23:53 +00:00
Narayan Kamath
04c72e304c am be76be83: Merge "android_media_MediaMuxer_setLocation: amended signature." 
* commit 'be76be83b188bb4cbcd3bc9bd6398af4d444ecb0':
  android_media_MediaMuxer_setLocation: amended signature.
 2014-09-04 11:14:42 +00:00
Narayan Kamath
be76be83b1 Merge "android_media_MediaMuxer_setLocation: amended signature." 2014-09-04 11:06:47 +00:00
Robert Shih
39478fdfcf android_media_MediaMuxer_setLocation: amended signature. 
Change parameter `nativeObject` from type `jint` to `jlong` to match its JNI
signature.

Bug: 12890910

(cherry picked from commit 3cb78498d3f664f541ba7d28f4543cf8c12733f1)

Reported-By: ashok.bhat@arm.com, marcus.oakland@arm.com

Change-Id: I624dfb41485be823d31797514664d3a5f9e52eb0
 2014-09-04 11:18:25 +01:00
Deepanshu Gupta
4005ea078d am 08e6f1d2: (-s ours) am 7d440238: am 90154b23: am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '08e6f1d2d69130dcc4fafd16d364c2aba2d334af':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 07:08:39 +00:00
Deepanshu Gupta
7492b43cb0 am 16634a42: (-s ours) am b7984184: am 0f6746e3: am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '16634a42d862e5133d1bff86ae6873f6c34f9d73':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 07:08:34 +00:00
Deepanshu Gupta
6946d2d9f0 am 7d440238: am 90154b23: am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '7d440238dbd38b5dc0be91d1d1ff01d3046bfaa4':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:57:50 +00:00
Deepanshu Gupta
aba1227269 am b7984184: am 0f6746e3: am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'b7984184dd63533f5a69539dc2a4b33b1cd23c3a':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:57:46 +00:00
Deepanshu Gupta
b116a98e42 am 90154b23: am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '90154b239a5bc0d48238a6fb16339f5b5150e585':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:48:09 +00:00
Deepanshu Gupta
45b37fa4f0 am 0f6746e3: am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '0f6746e36713cedda18fe0ff3d7b2daa78835e06':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:48:04 +00:00
Deepanshu Gupta
ae62d71d36 am 7f26655a: (-s ours) am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '7f26655a5bcaa8a6273ed603a465090d0e434d07':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:37:17 +00:00
Deepanshu Gupta
16099eed0f am 84268142: (-s ours) am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '84268142a64d463453556588bd4f7092af31fae9':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:37:13 +00:00
Deepanshu Gupta
7f26655a5b am a4d97866: am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'a4d978668219572b71538dc98dab461fe99dfcc3':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:26:25 +00:00
Deepanshu Gupta
84268142a6 am ccd53eec: am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'ccd53eecb946ad8d08fb332f0159db4816e62604':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:26:21 +00:00
Deepanshu Gupta
a4d9786682 am 2d70a5a9: am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2d70a5a9d1556f269b8ed79b1f6a896ce8241b51':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:16:36 +00:00
Deepanshu Gupta
ccd53eecb9 am 6a6e63a0: am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '6a6e63a0efed47fea0b1f080a3092d7931941851':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:16:32 +00:00
Deepanshu Gupta
2d70a5a9d1 am 06a31255: am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '06a31255133bcc21ed2f1d821b5e120fefddc117':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 06:07:21 +00:00
Deepanshu Gupta
6a6e63a0ef am 80b90161: am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '80b901611008824ff897f5434a840680b1ae40d5':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 06:07:18 +00:00
Deepanshu Gupta
06a3125513 am 3f1cc48a: (-s ours) am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '3f1cc48ad1f87e8ea35d2d706eafb707743cc662':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:56:35 +00:00
Deepanshu Gupta
80b9016110 am b14ab8d4: (-s ours) am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'b14ab8d402ac3b001601492d9f989e54f761cc2e':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:56:32 +00:00
Deepanshu Gupta
3f1cc48ad1 am ae6a52eb: am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'ae6a52eb0b02eae92b8800b29dbaf34e647bc3ae':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:48:37 +00:00
Deepanshu Gupta
b14ab8d402 am e9ea028b: am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'e9ea028b74950722163560d5dfb97b4403111cc4':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:48:33 +00:00
Deepanshu Gupta
ae6a52eb0b am 1eb506aa: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev 
* commit '1eb506aa8cd2045f1d7c75d7c9e59df6a103c1e5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:32:41 +00:00