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

150215 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sander Alewijnse
522b51fc73 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:05:47 +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
0516957088 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:26 +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
08c79f8309 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:47:20 +00:00
Deepanshu Gupta
18ed49419c 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:47:17 +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
Brian Carlstrom
25e7721117 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:36:44 +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
ba1d48dd24 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 05:27:32 +00:00
Deepanshu Gupta
f92aa750b7 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 05:27:28 +00:00
Svetoslav Ganov
053f24bb00 am bb9a2035: This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash. 
* commit 'bb9a2035bd45c1b6d336044a9976be6fd1aaccbd':
  This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
 2014-09-04 05:27:07 +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
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
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
Adam Powell
5e274fbc25 am bc01a3e4: Merge "Fix a regression in SearchView focusability" into lmp-dev 
* commit 'bc01a3e4b46b1bf02c98b384ee280c8c1cb1a2f2':
  Fix a regression in SearchView focusability
 2014-09-04 04:44:48 +00:00
Deepanshu Gupta
e35ab0755e am ef798c46: am 81cd0d8d: (-s ours) am a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev 
* commit 'ef798c4697e53e1cd18066834cfba4fc1595726c':
  Resolve color xml attributes properly. [DO NOT MERGE]
 2014-09-04 04:44:44 +00:00
Deepanshu Gupta
0bba102d50 am 5e8e34d9: am aac20cfc: (-s ours) am 9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev 
* commit '5e8e34d9d751d582c29fcf91c2462e6f2225fff5':
  Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
 2014-09-04 04:44:40 +00:00
Deepanshu Gupta
4c72ba8113 am c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev 
* commit 'c9d0cb09531f16c5a30337fa71aa4d7ba37a8768':
  Remove ANDROID_BUILD_TOP from intelliJ path variables.
 2014-09-04 04:43:50 +00:00
Deepanshu Gupta
e98b536d8b am 80899170: Merge "enums in dimension attributes." into lmp-dev 
* commit '8089917012e9133eb4d0ff4985c130c70d693b96':
  enums in dimension attributes.
 2014-09-04 04:39:25 +00:00
Deepanshu Gupta
a6f694dcee am 7d931c01: Merge "Null out "@null" attributes." into lmp-dev 
* commit '7d931c01e47b4b4bac658d1628e0deb64308fb67':
  Null out "@null" attributes.
 2014-09-04 04:39:20 +00:00
Deepanshu Gupta
ed7815d13b am 8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev 
* commit '8fbaefb017b164133ac7e4ea87772fead5396374':
  LayoutLib: Fix warnings in ResourceHelper.
 2014-09-04 04:39:16 +00:00
Deepanshu Gupta
f3803bbcca am 02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev 
* commit '02c6c26dfa188710fc748f3b0cea57122e451cbb':
  LayoutLib: Allow '+' in float attributes.
 2014-09-04 04:39:13 +00:00
Deepanshu Gupta
fda4d9a764 am 229833c3: Merge "Fix invalid conditional check." into lmp-dev 
* commit '229833c30bfae115c0691af11e531473f827c453':
  Fix invalid conditional check.
 2014-09-04 04:39:09 +00:00
Deepanshu Gupta
e1ace42429 am 2d5629df: Merge "Build layoutlib_create tests." into lmp-dev 
* commit '2d5629dff0de6262440682ff73214a7245d40c24':
  Build layoutlib_create tests.
 2014-09-04 04:39:05 +00:00
Jae Seo
76466da907 am 9c723776: Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev 
* commit '9c723776441af73f97e5ed736d2d6ec0d0e8c2d4':
  TIF: Add Quebec ratings for Canada and fix the XML example
 2014-09-04 04:36:52 +00:00