Benjamin Weiss
4e8fe73dce
am bfb52300: am be0cc8fb: (-s ours) am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
...
* commit 'bfb523009ef9520790be39b96952322c140f3400':
2015-08-27 21:40:01 +00:00
Trevor Johns
75c344a6b8
am 65400b5f: (-s ours) am 87bea24f: (-s ours) am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
...
* commit '65400b5f38921a4efe3c7e0af4acc922d2dca4a6':
2015-08-27 21:39:58 +00:00
Benjamin Weiss
bfb523009e
am be0cc8fb: (-s ours) am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
...
* commit 'be0cc8fb97782151f3c87550ddc7bd2d2f5779a1':
2015-08-27 10:46:51 +00:00
Trevor Johns
65400b5f38
am 87bea24f: (-s ours) am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
...
* commit '87bea24f774feb7ac83a561b8ecb6b059ae221f4':
2015-08-27 10:46:49 +00:00
Deepanshu Gupta
8c278d30c0
am 23084647: (-s ours) am 1ecf7f46: am f25696b5: am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '2308464796b1b40d81752aabd1dec76c14171917':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 05:18:31 +00:00
Yusuf Ozuysal
24687b4d96
am e98b87f3: am c3d6f680: am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"
...
* commit 'e98b87f3fb5df7218ddbd8d2dcb62afb1d9c5949':
Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 05:18:30 +00:00
Yusuf Ozuysal
29cd5a8ba6
Revert "Add customtabs support lib to extras/android/support/"
...
This reverts commit 53ad2de7f604a6dcacf0
2015-08-27 05:13:35 +00:00
Deepanshu Gupta
2308464796
am 1ecf7f46: am f25696b5: am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '1ecf7f4647b0eef14ce9fc8f2819ce66768b76bf':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 04:57:22 +00:00
Yusuf Ozuysal
e98b87f3fb
am c3d6f680: am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"
...
* commit 'c3d6f6802950a70cd6ed241b67563da3b0f41e99':
Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 04:53:21 +00:00
Deepanshu Gupta
1ecf7f4647
am f25696b5: am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit 'f25696b53e50e3a2d4be49fc198ebdcecd1d6c0e':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 02:12:11 +00:00
Yusuf Ozuysal
c3d6f68029
am 04a6dcac: Revert "Add customtabs support lib to extras/android/support/"
...
* commit '04a6dcacf0a86b6b0d243a88c8bcf87f24516045':
Revert "Add customtabs support lib to extras/android/support/"
2015-08-27 01:44:05 +00:00
Deepanshu Gupta
f25696b53e
am 5163378d: (-s ours) am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '5163378d218cdd9e5e7b5db9de7ed37dd8887dd8':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-27 01:33:07 +00:00
Yusuf Ozuysal
04a6dcacf0
Revert "Add customtabs support lib to extras/android/support/"
...
This reverts commit 53ad2de7f6
2015-08-26 23:31:45 +00:00
Xiaohui Chen
2875a106d4
Merge "runtest: introduce --user parameter"
2015-08-26 22:27:36 +00:00
Xiaohui Chen
d9a364e405
Merge "intellij-gen: Fix test source dir tag."
2015-08-26 22:06:49 +00:00
Yusuf Ozuysal
bf585da94d
am 9df340b1: am 1c6e1387: am 53ad2de7: Add customtabs support lib to extras/android/support/
...
* commit '9df340b17590d4acaba408d715cd2456b4e75def':
Add customtabs support lib to extras/android/support/
2015-08-26 21:11:53 +00:00
Deepanshu Gupta
5163378d21
am f3ddcb27: am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit 'f3ddcb279bfdc9618bf0b29a33d6ad188bcd8aff':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-26 20:17:20 +00:00
Yusuf Ozuysal
9df340b175
am 1c6e1387: am 53ad2de7: Add customtabs support lib to extras/android/support/
...
* commit '1c6e1387a2b8c956fe356557e6ee7e2249778721':
Add customtabs support lib to extras/android/support/
2015-08-26 19:23:55 +00:00
Yusuf Ozuysal
1c6e1387a2
am 53ad2de7: Add customtabs support lib to extras/android/support/
...
* commit '53ad2de7f6677c31eb42dbd117b4857f38fc36f4':
Add customtabs support lib to extras/android/support/
2015-08-26 19:16:20 +00:00
Joe Baker-Malone
1783bbffbc
Merge "chmod a-x on files that shouldn't be executable"
2015-08-26 17:31:19 +00:00
Elliott Hughes
e9e1e260e8
am d14b469b: am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
...
* commit 'd14b469bdc007d7df2621f4300fb2587e6d473e2':
Patch android-21 with aarch64 <sys/user.h> fixes.
2015-08-26 15:55:53 +00:00
Elliott Hughes
d14b469bdc
am b851cbc2: am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
...
* commit 'b851cbc2cd9b6f36a6e5c7f150c82eb0744d573f':
Patch android-21 with aarch64 <sys/user.h> fixes.
2015-08-26 15:47:48 +00:00
Elliott Hughes
b851cbc2cd
am 1a8697f9: Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
...
* commit '1a8697f91c7f95477e5e1de4580d5b9e5ea3e6fd':
Patch android-21 with aarch64 <sys/user.h> fixes.
2015-08-26 15:29:20 +00:00
Elliott Hughes
1a8697f91c
Merge "Patch android-21 with aarch64 <sys/user.h> fixes."
2015-08-26 15:22:05 +00:00
Deepanshu Gupta
f3ddcb279b
am 844574cb: Update LayoutLib revision number. [DO NOT MERGE]
...
* commit '844574cb2c69dcd57be9523f0c2c0c3dcc4da867':
Update LayoutLib revision number. [DO NOT MERGE]
2015-08-26 05:50:19 +00:00
Elliott Hughes
2e60272c03
Patch android-21 with aarch64 <sys/user.h> fixes.
...
This makes the files match (AOSP ToT post-M) bionic.
Bug: http://b/23377194
Change-Id: Ie72614612fbe49c4250ca1383d1d224e8bff62dc
2015-08-25 18:43:20 -07:00
Joe Baker-Malone
489a703e79
chmod a-x on files that shouldn't be executable
...
Part of fix for http://b.android.com/163193
Change-Id: I1160e7b59e93e0ec6e99bcf277ad4875efaef194
2015-08-25 17:42:52 -07:00
Yusuf Ozuysal
53ad2de7f6
Add customtabs support lib to extras/android/support/
...
Currently the only way to get access to customtabs library through
download m2repository and using the aar file whereas all other
support libs are also present in extras/android/support/ with
the corresponding resources and jar file.
This adds the jar and manifest to the corresponding folder to avoid
the confusion to developers.
Change-Id: Id6d71e4071c0725257cadb539cd47230d6727914
2015-08-25 15:46:58 -07:00
Deepanshu Gupta
844574cb2c
Update LayoutLib revision number. [DO NOT MERGE]
...
Change-Id: I5a32442861809dfa8e4b39a232777388f8c082b5
2015-08-25 11:53:39 -07:00
Jae Seo
66fec586ac
am 99ec23c9: am 3fb1da70: MediaRouter: Remove an unused member in SampleMediaRouteProvider
...
* commit '99ec23c9edc672418d3780a6a6b532239ad1a5ab':
MediaRouter: Remove an unused member in SampleMediaRouteProvider
2015-08-25 05:59:49 +00:00
Jae Seo
99ec23c9ed
am 3fb1da70: MediaRouter: Remove an unused member in SampleMediaRouteProvider
...
* commit '3fb1da70efd85a390475a3ea467ce14b4e481236':
MediaRouter: Remove an unused member in SampleMediaRouteProvider
2015-08-25 05:54:11 +00:00
Jae Seo
e8a9034311
am dd7c2dc3: am b26f52f2: MediaRouter: Add a sample for the custom route icon
...
* commit 'dd7c2dc33effe7b1a54303ee5e37880557461610':
MediaRouter: Add a sample for the custom route icon
2015-08-25 05:50:45 +00:00
Jae Seo
3fb1da70ef
MediaRouter: Remove an unused member in SampleMediaRouteProvider
...
Change-Id: I9eb7d16a49017697e2586dc1988e4411566d65d4
2015-08-25 14:46:29 +09:00
Jae Seo
dd7c2dc33e
am b26f52f2: MediaRouter: Add a sample for the custom route icon
...
* commit 'b26f52f2c06ee64f4e154f560c93f65982817482':
MediaRouter: Add a sample for the custom route icon
2015-08-25 05:46:20 +00:00
Xiaohui Chen
85586e0e03
runtest: introduce --user parameter
...
Currently runtest script installs and then runs test apks with default
"adb install" and "adb shell am instrument" behavior. They are actually
different, "adb install" uses USER_ALL, "am instrument" uses
USER_CURRENT. This cl introduces a way to specify exactly which user a
test should run with in a multiple user environment. This also provides
a work around for b/22976637 for now.
Bug: 19913735
Bug: 22976637
Change-Id: I65e2b2c79768734a8bc9261f8c4693c9f89016b1
2015-08-24 22:11:59 -07:00
Xiaohui Chen
6984d17aa7
intellij-gen: Fix test source dir tag.
...
Change-Id: Iba8ab25f27f72088088b06ea180bc3b8e912e5c9
2015-08-24 22:11:59 -07:00
Jae Seo
b26f52f2c0
MediaRouter: Add a sample for the custom route icon
...
Bug: 23116379
Change-Id: Ie744f40584e4f39cf17cd58d238f98059a8a88a3
2015-08-25 13:59:20 +09:00
Jaewan Kim
34b1f56010
am 586256c8: am 327fee84: Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev
...
* commit '586256c891c25018b93bef15b8e8c610b281c624':
MediaRouter: Prevent activity from restarting
2015-08-25 01:53:08 +00:00
Jaewan Kim
586256c891
am 327fee84: Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev
...
* commit '327fee84b57a902ee35f2dd7c5d2c4e65f790aac':
MediaRouter: Prevent activity from restarting
2015-08-25 01:44:24 +00:00
Jaewan Kim
327fee84b5
Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev
2015-08-25 01:40:35 +00:00
Robert Hahn
0f26802668
am 19888db2: am e6b72719: Added Transitions and minor code clean up
...
* commit '19888db2271373ec6e9bb8e681fc6f1ef390434b':
Added Transitions and minor code clean up
2015-08-24 23:38:50 +00:00
Alan Viverette
1940845e85
Add sample activity for ViewPager in Support4Demos
...
Bug: 23467280
Change-Id: Ifd2ec9c46a6c4f24fd5adc291a0a4d3b484f7ab5
2015-08-24 15:41:17 -04:00
Robert Hahn
19888db227
am e6b72719: Added Transitions and minor code clean up
...
* commit 'e6b72719a85a4731673d1d56f7b4f7463f18e249':
Added Transitions and minor code clean up
2015-08-24 18:02:17 +00:00
Robert Hahn
e6b72719a8
Added Transitions and minor code clean up
...
Added support for the DetailView Activity
transition. The DetailView can now be started
from the launcher or the Cards example.
Added support for Browse entrance transition.
Minor code clean up such as renaming
GridExample fragment to GridExampleFragment
and removing unused methods.
Change-Id: Ib1c11af82be5b858960e243acd7f11ce8dbd06f7
2015-08-24 10:51:57 -07:00
Jaewan Kim
5d04bdb493
MediaRouter: Prevent activity from restarting
...
This keeps the playlist for orientation changes.
Bug: 23399327
Change-Id: I89d436a0455190798180ceef3bcb2028eacbf23b
2015-08-24 20:03:45 +09:00
Andreas Gampe
268e86d92d
am 98ad1a79: am 4cacf112: am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack"
...
* commit '98ad1a7966ebedfce1d33e89a0a75e089a0744a3':
Development/scripts: Add sanitizer dump support to stack
2015-08-22 01:38:16 +00:00
Andreas Gampe
98ad1a7966
am 4cacf112: am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack"
...
* commit '4cacf1124db6f46a02dcb67cd6d1c3e7fe6daf81':
Development/scripts: Add sanitizer dump support to stack
2015-08-22 00:48:39 +00:00
Andreas Gampe
4cacf1124d
am 07ddfb0e: Merge "Development/scripts: Add sanitizer dump support to stack"
...
* commit '07ddfb0edff3e5b4d5888fafb703a8c253677965':
Development/scripts: Add sanitizer dump support to stack
2015-08-22 00:40:50 +00:00
Andreas Gampe
07ddfb0edf
Merge "Development/scripts: Add sanitizer dump support to stack"
2015-08-22 00:34:13 +00:00
Andreas Gampe
d900d08d81
Development/scripts: Add sanitizer dump support to stack
...
Add trace parsing for sanitizer output. The output is different
from debuggerd output (and we do not have control over it). Use
two separate regexes and factor out the parsing into a method
returning a tuple of data.
Note: as we have no control over the prologue of the dump, we
cannot change it to include information like the ABI. Thus, this
functionality only works in a lunched tree, where the tool
implicitly uses the symbols directory.
Change-Id: Ic1189f4f65cf7728d1baec7055ecb549b0aa5f62
2015-08-21 17:29:47 -07:00
