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

151620 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexandra Gherghina
88aca358fc am 3d23ae9f: Merge "Fix NPE from empty PackageInfo" into lmp-dev 
* commit '3d23ae9fc413511123b69c6326fb543880653bb0':
  Fix NPE from empty PackageInfo
 2014-09-04 15:44:47 +00:00
Alexandra Gherghina
0cd0b186c3 Merge "Fix NPE from empty PackageInfo" into lmp-dev 2014-09-04 15:33:50 +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
Alexandra Gherghina
db811dbc70 Fix NPE from empty PackageInfo 
Bug: 17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
 2014-09-04 15:46:23 +01: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
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
Dan Sandler
d2961355bd Merge "Notification: Limit length of accepted strings" into lmp-dev 2014-09-04 13:36:34 +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
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
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
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
Kenny Guy
4c4e796444 Merge "Use context for user when calling notifyAsUser" into lmp-dev 2014-09-04 11:23:53 +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
c33fc8de1d am 48349ea9: am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit '48349ea91823112e3fd2d431116027aed743b1a4':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:33:14 +00:00
Deepanshu Gupta
c634383ac4 am 8bc68f96: am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '8bc68f964801f3dcb36a76628cd3d289f3f279ca':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:33:10 +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
Deepanshu Gupta
e9ea028b74 am 6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '6a9c6c6baedb994a619573388056c95475f84abf':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:32:32 +00:00
Deepanshu Gupta
48349ea918 am 66224e25: am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit '66224e2524e9b6723c783f14598c2e02118ea7f5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:22:43 +00:00
Deepanshu Gupta
8bc68f9648 am 52ee9b99: am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '52ee9b99f55cd17c484fcaf2433c688967284468':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:22:40 +00:00
Deepanshu Gupta
66224e2524 am 12bbbb2b: am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit '12bbbb2bb71a532f3b3ec59fd9232902420cf3d2':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 05:12:31 +00:00
Deepanshu Gupta
52ee9b99f5 am ffd0e8bf: am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'ffd0e8bf9f803e4881736d1b2e8b54e31888e980':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 05:12:28 +00:00
Brian Carlstrom
1f1737a73b am ffedfd4a: Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 
* commit 'ffedfd4a045a498844247c2f5366e8a8e3ede124':
  Ensure that BackgroundDexOptService can still perform dexopt
 2014-09-04 05:04:14 +00:00
Deepanshu Gupta
12bbbb2bb7 am d3328343: am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit 'd3328343deaff01cfe5eadf57ac27da30832aabe':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:59:40 +00:00
Deepanshu Gupta
ffd0e8bf9f am a6f32d7f: am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit 'a6f32d7ff19319c5ed61d113672f112a6f54c938':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:59:34 +00:00
Brian Carlstrom
f663480ae3 Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev 2014-09-04 04:58:26 +00:00
Deepanshu Gupta
86807a33eb am fa23013e: am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit 'fa23013e9f46d6c8170d4343daf1db0c5dc8bd6d':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:54:05 +00:00
Deepanshu Gupta
2db22e72da am 53350bf3: am 43cba321: (-s ours) am 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '53350bf3e194543778a82e4a8dc27e8d8e1f823a':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:54:00 +00:00
Deepanshu Gupta
d3328343de am f264080d: am 3ce96efc: am d181ffe6: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-dev 
* commit 'f264080d227617d431804e110e65cc154e8a8d17':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:46:39 +00:00
Deepanshu Gupta
a6f32d7ff1 am 64d4ef8c: am 63889480: am 6530cca1: Fix "@null" resource values in LayoutLib. [DO NOT MERGE] 
* commit '64d4ef8cf2f9ec6b7af6795fa9feb18cc07ba3d9':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:46:28 +00:00
Deepanshu Gupta
cd31f76067 am 4a4683c7: (-s ours) am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit '4a4683c72a649b6435e872b71936a68dd97fe408':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:45:13 +00:00
Deepanshu Gupta
aa52a6c33e am 43cba321: (-s ours) am 135b8207: am 1c3a8845: am 47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev 
* commit '43cba3210bd3e28e4bcba366980293143b938093':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:45:09 +00:00
Deepanshu Gupta
4a4683c72a am a92f199d: am 0ddd915f: am 509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev 
* commit 'a92f199dcce9708b5c2a814c110827216a176fd5':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:36:02 +00:00