OSDN Git Service
Wink Saville [Thu, 4 Sep 2014 16:21:29 +0000 (16:21 +0000)]
am
bfa06279: Merge "Cleanup ISub.aidl" into lmp-dev
* commit '
bfa06279cc8240015bd10b8be2748838122c7d11':
Cleanup ISub.aidl
Wink Saville [Thu, 4 Sep 2014 16:10:16 +0000 (16:10 +0000)]
Merge "Cleanup ISub.aidl" into lmp-dev
Alexandra Gherghina [Thu, 4 Sep 2014 15:44:37 +0000 (15:44 +0000)]
am
3d23ae9f: Merge "Fix NPE from empty PackageInfo" into lmp-dev
* commit '
3d23ae9fc413511123b69c6326fb543880653bb0':
Fix NPE from empty PackageInfo
Alexandra Gherghina [Thu, 4 Sep 2014 15:33:48 +0000 (15:33 +0000)]
Merge "Fix NPE from empty PackageInfo" into lmp-dev
Derek Sollenberger [Thu, 4 Sep 2014 15:08:52 +0000 (15:08 +0000)]
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.
Derek Sollenberger [Thu, 4 Sep 2014 15:01:26 +0000 (15:01 +0000)]
Merge "Remove invalid premul step from HWUI's matrix color filter." into lmp-dev
Alexandra Gherghina [Fri, 29 Aug 2014 12:43:59 +0000 (13:43 +0100)]
Fix NPE from empty PackageInfo
Bug:
17325905
Change-Id: I38ae5e242b1bf615620cf069a2cccede6ee42125
Winson Chung [Thu, 4 Sep 2014 14:38:21 +0000 (14:38 +0000)]
am
e9883b8a: Delay in app transition until home animation completes. (Bug
17012456)
* commit '
e9883b8a92d72a3cfd947b3ce835bc8e4da2f1b2':
Delay in app transition until home animation completes. (Bug
17012456)
Winson Chung [Tue, 2 Sep 2014 01:08:39 +0000 (18:08 -0700)]
Delay in app transition until home animation completes. (Bug
17012456)
Change-Id: I3469738a70bd872ff03c48c23201d4e0b6c8d8bb
Dan Sandler [Thu, 4 Sep 2014 13:46:48 +0000 (13:46 +0000)]
am
195fa1ec: Merge "Notification: Limit length of accepted strings" into lmp-dev
* commit '
195fa1ecb5c0cc50346b8883e775ab131422e778':
Notification: Limit length of accepted strings
Dan Sandler [Thu, 4 Sep 2014 13:36:33 +0000 (13:36 +0000)]
Merge "Notification: Limit length of accepted strings" into lmp-dev
Kenny Guy [Thu, 4 Sep 2014 13:20:25 +0000 (13:20 +0000)]
am
5c32b77f: Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev
* commit '
5c32b77f3d356749ad7ea523ec399765929a07bd':
Ensure all RemoteViews use myUserId rather than context.
Kenny Guy [Thu, 4 Sep 2014 13:09:31 +0000 (13:09 +0000)]
Merge "Ensure all RemoteViews use myUserId rather than context." into lmp-dev
Sander Alewijnse [Thu, 4 Sep 2014 12:05:47 +0000 (12:05 +0000)]
am
7b4dc272: Merge "Rename email extra to email bundle key." into lmp-dev
* commit '
7b4dc2726e9352ee0ddfc97591cd39d66a99f60e':
Rename email extra to email bundle key.
Sander Alewijnse [Thu, 4 Sep 2014 11:59:40 +0000 (11:59 +0000)]
Merge "Rename email extra to email bundle key." into lmp-dev
Kenny Guy [Tue, 2 Sep 2014 11:11:07 +0000 (12:11 +0100)]
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
Kenny Guy [Thu, 4 Sep 2014 11:31:26 +0000 (11:31 +0000)]
am
29ad833b: Merge "Use context for user when calling notifyAsUser" into lmp-dev
* commit '
29ad833b319d4d403dd26ed0fd73dc07a91c2f44':
Use context for user when calling notifyAsUser
Sander Alewijnse [Thu, 4 Sep 2014 10:23:09 +0000 (11:23 +0100)]
Rename email extra to email bundle key.
Bug:
17197410
Change-Id: I321bc52cbb73a14869538700204ac7b5aefb3755
Kenny Guy [Thu, 4 Sep 2014 11:23:51 +0000 (11:23 +0000)]
Merge "Use context for user when calling notifyAsUser" into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 06:47:20 +0000 (06:47 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:47:17 +0000 (06:47 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:37:17 +0000 (06:37 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:37:13 +0000 (06:37 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:26:25 +0000 (06:26 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:26:21 +0000 (06:26 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:16:36 +0000 (06:16 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:16:32 +0000 (06:16 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:07:21 +0000 (06:07 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 06:07:18 +0000 (06:07 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:56:35 +0000 (05:56 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:56:32 +0000 (05:56 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:37 +0000 (05:48 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:48:33 +0000 (05:48 +0000)]
am
e9ea028b: am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
e9ea028b74950722163560d5dfb97b4403111cc4':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Brian Carlstrom [Thu, 4 Sep 2014 05:36:44 +0000 (05:36 +0000)]
am
ffedfd4a: Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev
* commit '
ffedfd4a045a498844247c2f5366e8a8e3ede124':
Ensure that BackgroundDexOptService can still perform dexopt
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:41 +0000 (05:32 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:32:32 +0000 (05:32 +0000)]
am
6a9c6c6b: Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
* commit '
6a9c6c6baedb994a619573388056c95475f84abf':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 05:27:32 +0000 (05:27 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 05:27:28 +0000 (05:27 +0000)]
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]
Svetoslav Ganov [Thu, 4 Sep 2014 05:27:07 +0000 (05:27 +0000)]
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.
Brian Carlstrom [Thu, 4 Sep 2014 04:58:24 +0000 (04:58 +0000)]
Merge "Ensure that BackgroundDexOptService can still perform dexopt" into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 04:45:13 +0000 (04:45 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:45:09 +0000 (04:45 +0000)]
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]
Adam Powell [Thu, 4 Sep 2014 04:44:48 +0000 (04:44 +0000)]
am
bc01a3e4: Merge "Fix a regression in SearchView focusability" into lmp-dev
* commit '
bc01a3e4b46b1bf02c98b384ee280c8c1cb1a2f2':
Fix a regression in SearchView focusability
Deepanshu Gupta [Thu, 4 Sep 2014 04:44:44 +0000 (04:44 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:44:40 +0000 (04:44 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:43:50 +0000 (04:43 +0000)]
am
c9d0cb09: Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev
* commit '
c9d0cb09531f16c5a30337fa71aa4d7ba37a8768':
Remove ANDROID_BUILD_TOP from intelliJ path variables.
Deepanshu Gupta [Thu, 4 Sep 2014 04:39:25 +0000 (04:39 +0000)]
am
80899170: Merge "enums in dimension attributes." into lmp-dev
* commit '
8089917012e9133eb4d0ff4985c130c70d693b96':
enums in dimension attributes.
Deepanshu Gupta [Thu, 4 Sep 2014 04:39:20 +0000 (04:39 +0000)]
am
7d931c01: Merge "Null out "@null" attributes." into lmp-dev
* commit '
7d931c01e47b4b4bac658d1628e0deb64308fb67':
Null out "@null" attributes.
Deepanshu Gupta [Thu, 4 Sep 2014 04:39:16 +0000 (04:39 +0000)]
am
8fbaefb0: Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev
* commit '
8fbaefb017b164133ac7e4ea87772fead5396374':
LayoutLib: Fix warnings in ResourceHelper.
Deepanshu Gupta [Thu, 4 Sep 2014 04:39:13 +0000 (04:39 +0000)]
am
02c6c26d: Merge "LayoutLib: Allow \'+\' in float attributes." into lmp-dev
* commit '
02c6c26dfa188710fc748f3b0cea57122e451cbb':
LayoutLib: Allow '+' in float attributes.
Deepanshu Gupta [Thu, 4 Sep 2014 04:39:09 +0000 (04:39 +0000)]
am
229833c3: Merge "Fix invalid conditional check." into lmp-dev
* commit '
229833c30bfae115c0691af11e531473f827c453':
Fix invalid conditional check.
Deepanshu Gupta [Thu, 4 Sep 2014 04:39:05 +0000 (04:39 +0000)]
am
2d5629df: Merge "Build layoutlib_create tests." into lmp-dev
* commit '
2d5629dff0de6262440682ff73214a7245d40c24':
Build layoutlib_create tests.
Jae Seo [Thu, 4 Sep 2014 04:36:52 +0000 (04:36 +0000)]
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
Deepanshu Gupta [Thu, 4 Sep 2014 04:36:02 +0000 (04:36 +0000)]
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]
Deepanshu Gupta [Thu, 4 Sep 2014 04:35:58 +0000 (04:35 +0000)]
am
135b8207: am
1c3a8845: am
47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
* commit '
135b820789d393683df09f10631e7e9b16cfdb31':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Adam Powell [Thu, 4 Sep 2014 04:34:26 +0000 (04:34 +0000)]
am
c3070461: Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev
* commit '
c30704610f77b486d6c52f80b8ed36f41763448f':
Change the CAB to use the up-glyph for closing action modes
Shishir Agrawal [Thu, 4 Sep 2014 04:34:21 +0000 (04:34 +0000)]
am
64fb11a6: Add a config variable to control radio power cycle on SIM refresh reset.
* commit '
64fb11a66e470d0405b0523c38ce7e86785d3765':
Add a config variable to control radio power cycle on SIM refresh reset.
Deepanshu Gupta [Thu, 4 Sep 2014 04:24:46 +0000 (04:24 +0000)]
am
0ddd915f: am
509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
* commit '
0ddd915fb1d0add3bcab269abc1f8f46e2135b7a':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:24:04 +0000 (04:24 +0000)]
am
1c3a8845: am
47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
* commit '
1c3a884519dc5937bf321519d6adafb41a333bc1':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:14:41 +0000 (04:14 +0000)]
am
509e5db1: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
* commit '
509e5db14908f85c1ad4b93e8bbed5afd4c2c8fe':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 04:14:31 +0000 (04:14 +0000)]
am
47a40013: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
* commit '
47a400131f026fd4afdf09e77fe82e79201c1458':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Wink Saville [Thu, 4 Sep 2014 03:42:37 +0000 (20:42 -0700)]
Cleanup ISub.aidl
Fix copyright and remove @param context
Change-Id: Icf0a7899070f03161db54aac4a83f6dd060bc28d
Svetoslav Ganov [Thu, 4 Sep 2014 03:09:48 +0000 (03:09 +0000)]
This is no longer needed for factory ROM and since it changes behavior - reverting. Also causes NPE crash.
Revert "NumberPicker not announcing current selection."
This reverts commit
44d026c95bb9e582b7b18e355ec7a3458df52259.
Change-Id: I0bb6db9666fc9eb477737d1114c5c87035ed202b
Adam Powell [Thu, 4 Sep 2014 02:51:40 +0000 (02:51 +0000)]
Merge "Fix a regression in SearchView focusability" into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 02:49:21 +0000 (02:49 +0000)]
am
81cd0d8d: (-s ours) am
a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
* commit '
81cd0d8d52f83bf3cc6193dead8aa6486d23bdc0':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:49:17 +0000 (02:49 +0000)]
am
aac20cfc: (-s ours) am
9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
aac20cfcb4752a38bb27fb134869868c487d855f':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Adam Powell [Thu, 4 Sep 2014 02:35:37 +0000 (19:35 -0700)]
Fix a regression in SearchView focusability
A bit of code was removed that re-read the View style attributes
during SearchView construction to extract the focusable attribute, but
with a different default value if it was entirely missing. Restore it,
and lump re-reading the focusable attribute in with SearchView's
styleable filter array instead of using the giant View one for a
second time during inflation.
Bug
17292230
Change-Id: Ic5a2dd2d55893b0b290f1f7a3b6de09b37329245
Deepanshu Gupta [Thu, 4 Sep 2014 02:22:53 +0000 (02:22 +0000)]
am
a780eee4: Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
* commit '
a780eee46244062d699f76875fd05775c2ee92de':
Resolve color xml attributes properly. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 02:22:43 +0000 (02:22 +0000)]
am
9776312a: Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
* commit '
9776312a80f0072bf1d1fe8183e168f7d5879c4c':
Fix "@null" resource values in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:48 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into jb-mr2-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:37 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:53:16 +0000 (01:53 +0000)]
Merge "Resolve color xml attributes properly. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:51:53 +0000 (01:51 +0000)]
Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:27 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-modular-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:50:05 +0000 (01:50 +0000)]
Merge "Fix "@null" resource values in LayoutLib. [DO NOT MERGE]" into klp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:48:22 +0000 (01:48 +0000)]
Merge "enums in dimension attributes." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:48:13 +0000 (01:48 +0000)]
Merge "Null out "@null" attributes." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:46:54 +0000 (01:46 +0000)]
Merge "LayoutLib: Fix warnings in ResourceHelper." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:46:40 +0000 (01:46 +0000)]
Merge "LayoutLib: Allow '+' in float attributes." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:46:13 +0000 (01:46 +0000)]
Merge "Fix invalid conditional check." into lmp-dev
Deepanshu Gupta [Thu, 4 Sep 2014 01:45:35 +0000 (01:45 +0000)]
Merge "Build layoutlib_create tests." into lmp-dev
Jae Seo [Thu, 4 Sep 2014 01:23:34 +0000 (01:23 +0000)]
Merge "TIF: Add Quebec ratings for Canada and fix the XML example" into lmp-dev
Adam Powell [Thu, 4 Sep 2014 01:18:13 +0000 (01:18 +0000)]
Merge "Change the CAB to use the up-glyph for closing action modes" into lmp-dev
Shishir Agrawal [Wed, 3 Sep 2014 16:05:23 +0000 (09:05 -0700)]
Add a config variable to control radio power cycle on SIM refresh reset.
This was required for legacy devices and causes issues in the newer devices.
Bug:
17154939
Change-Id: Ib231975d3210a8c4f3f10ac3af1b636e3de5fcbf
John Reck [Thu, 4 Sep 2014 00:50:23 +0000 (00:50 +0000)]
am
73339a99: Fix some wrong-thread issues around animator management
* commit '
73339a99a97570d8000ef03560c4fb5346b46a3d':
Fix some wrong-thread issues around animator management
Scott Rowe [Thu, 4 Sep 2014 00:50:12 +0000 (00:50 +0000)]
am
4a7fd3ad: am
14f413be: am
048d8baa: am
0ccf80c3: Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
* commit '
4a7fd3ad0ef613a59d4cb3f766deabe02d5ef9c5':
docs: b/
15790433 updated for xxhdpi and xxxhdpi
Jungshik Jang [Thu, 4 Sep 2014 00:50:08 +0000 (00:50 +0000)]
am
5957c55c: Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." into lmp-dev
* commit '
5957c55c12ed54941ddcd8bd20d64c0466951424':
Rename ro.config.music_vol_steps into ro.config.media_vol_steps.
Svetoslav [Thu, 4 Sep 2014 00:50:04 +0000 (00:50 +0000)]
am
d370dcc7: Merge "Clear binder identity when sending window change accessibility events." into lmp-dev
* commit '
d370dcc75d9319635ddf5b3a97cf483b12bb146f':
Clear binder identity when sending window change accessibility events.
Ricardo Cervera [Thu, 4 Sep 2014 00:49:59 +0000 (00:49 +0000)]
am
44707d95: am
17aec620: am
15abafe2: am
c0393e7f: Merge "docs: Docs for Android project view. Bug:
17108468" into klp-modular-docs
* commit '
44707d95181b9225fd7e7c8d2da173990fa14ec2':
docs: Docs for Android project view. Bug:
17108468
Alan Viverette [Thu, 4 Sep 2014 00:49:55 +0000 (00:49 +0000)]
am
1d53feb9: Merge "Only use default backgrounds when not extending AlertDialog style" into lmp-dev
* commit '
1d53feb96f775c0542fecff0a2d36a6b6e45dbaa':
Only use default backgrounds when not extending AlertDialog style
Wink Saville [Thu, 4 Sep 2014 00:49:49 +0000 (00:49 +0000)]
am
f8773dfb: Merge "Add PhoneStateListener(Looper looper) and some documentation." into lmp-dev
* commit '
f8773dfbbc84b52f308f61d75ae2a028773dc749':
Add PhoneStateListener(Looper looper) and some documentation.
Wink Saville [Thu, 4 Sep 2014 00:38:28 +0000 (17:38 -0700)]
Merge commit '
3432c20c' into fix-merge-conflict
* commit '
3432c20c':
Hide SubscriptionManager using individual @hide on fields and methods.
Conflicts:
telephony/java/android/telephony/SubscriptionManager.java
Change-Id: Ic8d528b7a046f0b2a9735ba62720de142952d7ef
John Reck [Wed, 3 Sep 2014 23:46:05 +0000 (16:46 -0700)]
Fix some wrong-thread issues around animator management
Bug:
17372309
Fixes a case where UI thread and RT thread both used the same method
which wasn't safe for either of them.
Adds additional assertions & logging in unusual circumstances to
try and track down where the issue is occuring from.
Change-Id: I93d31a6fd0c5927259b67bdf96a475944226eee6
Scott Rowe [Thu, 4 Sep 2014 00:20:15 +0000 (00:20 +0000)]
am
14f413be: am
048d8baa: am
0ccf80c3: Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
* commit '
14f413be3c7701750b996b90c95471e8cf04ae96':
docs: b/
15790433 updated for xxhdpi and xxxhdpi
Adam Powell [Thu, 4 Sep 2014 00:17:45 +0000 (17:17 -0700)]
Change the CAB to use the up-glyph for closing action modes
In an effort to reduce glyph proliferation, change the "done"
checkmark from the CAB to the up-navigation arrow, placing the CAB
firmly in the current navigation hierarchy. This matches behavior for
expandable action views such as SearchView.
Allow the use of different CAB "done" layouts by theme; the material
layout should not include the "done" text and should use the standard
borderless selectable item background.
Bug
17372188
Change-Id: Icfb3e0bbc6a718e22ab27f9d520da5fe4eb833e7
Jungshik Jang [Thu, 4 Sep 2014 00:13:40 +0000 (00:13 +0000)]
Merge "Rename ro.config.music_vol_steps into ro.config.media_vol_steps." into lmp-dev
Scott Rowe [Thu, 4 Sep 2014 00:13:02 +0000 (00:13 +0000)]
am
048d8baa: am
0ccf80c3: Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
* commit '
048d8baaffadc28ee8e7bab0ce61a868c09c311a':
docs: b/
15790433 updated for xxhdpi and xxxhdpi
Svetoslav [Thu, 4 Sep 2014 00:03:43 +0000 (00:03 +0000)]
Merge "Clear binder identity when sending window change accessibility events." into lmp-dev
Scott Rowe [Wed, 3 Sep 2014 23:58:25 +0000 (23:58 +0000)]
am
0ccf80c3: Merge "docs: b/
15790433 updated for xxhdpi and xxxhdpi" into klp-modular-docs
* commit '
0ccf80c31dbf236ec8ffafc8c72f036c3137bc5a':
docs: b/
15790433 updated for xxhdpi and xxxhdpi
Brian Carlstrom [Wed, 3 Sep 2014 23:37:28 +0000 (16:37 -0700)]
Ensure that BackgroundDexOptService can still perform dexopt
Bug:
16696554
Change-Id: Id5877618ec9620112fa31dd69016c060bb26b2a7
OSDN Git Service
