Commit Graph

13838 Commits

Author SHA1 Message Date
Deepanshu Gupta
11ca5f1e66 am 5f00e195: (-s ours) am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '5f00e19500e78b9da9bba2889c53a0ec9f144133':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:25:08 +00:00
Deepanshu Gupta
1f492924c4 am 40cab515: am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '40cab5153e4ab36f70096bba7ff7a60fd40d4ed3':
2014-05-02 19:24:01 +00:00
Deepanshu Gupta
5f00e19500 am 48ed332b: am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '48ed332b5aff2b4dbd472bb8c1f44dfb949ced77':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:23:11 +00:00
Raphael Moll
c63c2d31ba Temporarily disable rs/bcc in win_sdk
Change-Id: Ic3c49f14098662c83167151a2abc7f46d847c67f
2014-05-02 12:21:17 -07:00
Deepanshu Gupta
48ed332b5a am b866a591: am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'b866a59170206edc25f33dca28ee7f037050cc7f':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:20:09 +00:00
Deepanshu Gupta
40cab5153e am 5a65a7ab: (-s ours) am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '5a65a7ab1359a809516d0a93a273b1fe5944858d':
2014-05-02 19:19:54 +00:00
Deepanshu Gupta
b866a59170 am b73c7b12: (-s ours) am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'b73c7b1244f8de87ee0f38308266508790e3eca5':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:16:20 +00:00
Deepanshu Gupta
5a65a7ab13 am 2613ee50: am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '2613ee50778d138973c0df75b054b19bbee874be':
2014-05-02 19:16:05 +00:00
Deepanshu Gupta
b73c7b1244 am c0e290d3: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'c0e290d39f8ae6d9d41b869001cb4390d8037df4':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:12:36 +00:00
Deepanshu Gupta
2613ee5077 am 19e61e5f: am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit '19e61e5f528ade77831a7e3307cf213fc111341f':
2014-05-02 19:12:22 +00:00
Deepanshu Gupta
c0e290d39f am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:09:00 +00:00
Deepanshu Gupta
19e61e5f52 am a5d913ab: Add ICU jar to SDK [DO NOT MERGE]
* commit 'a5d913ab3789e552bdfcc0a2a6b9fb87d6f1b0ca':
  Add ICU jar to SDK [DO NOT MERGE]
2014-05-02 19:08:45 +00:00
Deepanshu Gupta
a5d913ab37 Add ICU jar to SDK [DO NOT MERGE]
Bundle the ICU jar with the SDK.

Change-Id: I0773cee58b072f3bf60c2594b6dee251ef101cf0
(cherry picked from commit 79cc4f9212)
2014-05-02 11:59:11 -07:00
Vince Harron
e8ab84bbfb am ab7ab626: am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
* commit 'ab7ab6260d509387db93f88b505c1976a7e0b5ad':
  Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:56:36 +00:00
Vince Harron
ab7ab6260d am caa62895: am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
* commit 'caa62895daa96952010e0a610ebb334042dc0f0f':
  Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:51:15 +00:00
Vince Harron
caa62895da am 611cfde5: Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
* commit '611cfde5c024add8345c4dd8cc9ab41b1f363905':
  Prefixed minSdkVersion with "android:" Set minSdkVersion to 11 to support ActionBar API
2014-05-01 17:47:15 +00:00
Andrew Hsieh
1b10ec4818 am fc30ef32: am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
* commit 'fc30ef32c781970fc05b3753152cee459c51ce0e':
  Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:28:41 +00:00
Andrew Hsieh
fc30ef32c7 am 4d8f4793: am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
* commit '4d8f4793cdc9804e582805a22cfcd94343f8d9cc':
  Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:24:57 +00:00
Andrew Hsieh
4d8f4793cd am 261d178e: Merge "Track transition from SIGRTMIN to __SIGRTMIN"
* commit '261d178e55db870331bd5eb8a41a22aa8f6c3589':
  Track transition from SIGRTMIN to __SIGRTMIN
2014-05-01 01:22:48 +00:00
Andrew Hsieh
261d178e55 Merge "Track transition from SIGRTMIN to __SIGRTMIN" 2014-05-01 01:20:04 +00:00
Brian Carlstrom
fb9c4e0c9f Track transition from SIGRTMIN to __SIGRTMIN
Change-Id: I69064edf1a7e95c91f90d9b05c1cf3f9c8c46747
2014-04-30 17:58:41 -07:00
Dave Platt
1dd16c67e9 Merge "Update sample NSD app to work reliably with current Android" 2014-04-30 23:39:27 +00:00
Tim Kilbourn
d810db8136 Merge "Set row heights for browse rows." 2014-04-30 19:23:06 +00:00
Chiao Cheng
e2962681b6 Merge "Overhaul of intellij-gen script." 2014-04-30 18:07:29 +00:00
Tim Kilbourn
6044578753 Set row heights for browse rows.
Set a size on the text_bg so the cards appear at the correct size.

Change-Id: Ic2a836431485aaaea922a6bb3868e3e937f1ec21
2014-04-30 09:42:26 -07:00
Bill Yi
9dc9ca97a5 am b5255dab: am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
* commit 'b5255dabc0131f907c607a79f08c8bc9ea92551f':
2014-04-30 00:53:04 +00:00
Bill Yi
b5255dabc0 am 23f68632: Merge commit \'d297be2136209cab4edbcf8879520f65fb564103\' into HEAD
* commit '23f68632c7f1a368bcc471b9b782f29fb32619ca':
2014-04-30 00:49:29 +00:00
George Mount
69ac8ef1c4 Add new sample transition XML.
Change-Id: Iab0dc6f1533a2d841ff3edbda24535ba17184c7c
2014-04-29 13:46:56 -07:00
Bill Yi
23f68632c7 Merge commit 'd297be2136209cab4edbcf8879520f65fb564103' into HEAD 2014-04-29 11:33:09 -07:00
Tim Kilbourn
04c85ceee7 Minor card tweaks for leanback demo.
- Set card size to 160x100
- Show 10 rows

Change-Id: I440eef119250d3385ce5d367ec231bfe7c0201b4
2014-04-28 15:23:48 -07:00
Andrew Hsieh
be0a44eaf7 am cb606e1f: am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
* commit 'cb606e1fe286507f17d35373e6b8cb295c27eeee':
  Bump __clang_minor__ check to 6 for __builtin_isnan
2014-04-28 17:11:12 +00:00
Andrew Hsieh
cb606e1fe2 am 88765fac: am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
* commit '88765facf16ad4887bf6a1c91c64839ecda9d081':
  Bump __clang_minor__ check to 6 for __builtin_isnan
2014-04-28 17:05:58 +00:00
Andrew Hsieh
88765facf1 am e23f9c5d: Merge "Bump __clang_minor__ check to 6 for __builtin_isnan"
* commit 'e23f9c5d308c0499c442cbd0bb07d336471dcb88':
  Bump __clang_minor__ check to 6 for __builtin_isnan
2014-04-28 17:02:31 +00:00
Andrew Hsieh
e23f9c5d30 Merge "Bump __clang_minor__ check to 6 for __builtin_isnan" 2014-04-28 16:59:32 +00:00
Jim Miller
44e89d3e2f Merge "Add test harness for new keyguard features: - disable all notifications on secure keyguard - disable unredacted notifications on secure keyguard - disable TrustAgents" 2014-04-26 00:32:32 +00:00
Jim Miller
1d8e0796c5 Add test harness for new keyguard features:
- disable all notifications on secure keyguard
- disable unredacted notifications on secure keyguard
- disable TrustAgents

Change-Id: I864a103263996dcd491ff77f744bff8398af9cc8
2014-04-25 15:28:28 -07:00
Andrew Hsieh
5999e41aa2 am b7375594: am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
* commit 'b73755948be7081e1e01276f21e9c589a7d24a6d':
  Update arch-x86/lib-bootstrap/lib64
2014-04-25 17:02:14 +00:00
Andrew Hsieh
b73755948b am 36e2bc95: am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
* commit '36e2bc959feb77b875761710cb8a3a1f43882703':
  Update arch-x86/lib-bootstrap/lib64
2014-04-25 16:58:59 +00:00
Andrew Hsieh
36e2bc959f am 90dada06: Merge "Update arch-x86/lib-bootstrap/lib64"
* commit '90dada064c8fb05b91889cb7978b7ebe335f7cbb':
  Update arch-x86/lib-bootstrap/lib64
2014-04-25 16:55:57 +00:00
Andrew Hsieh
b280e72a97 Bump __clang_minor__ check to 6 for __builtin_isnan
It appears that upstream 3.5 still can't accept __builtin_isnan redeclared
with calling convention, eg.

cat > isnan.c <<EOF
int __builtin_isnan(double) __attribute__((pcs("aapcs")));
EOF

  clang  -target armv5te-none-linux-androideabi -c isnan.c
  isnan.c:1:5: error: function declared 'aapcs' here was previously declared without calling convention
  int __builtin_isnan(double) __attribute__((pcs("aapcs")));
      ^
  isnan.c:1:5: note: previous declaration is here

Change-Id: Iff466fd913c3deec27aa3ff355a208543028d368
2014-04-25 09:55:31 -07:00
Andrew Hsieh
90dada064c Merge "Update arch-x86/lib-bootstrap/lib64" 2014-04-25 16:51:49 +00:00
Dongwon Kang
0bcf62a1e8 Merge "Add sample ATSC TvInputService app." 2014-04-25 10:21:05 +00:00
Andrew Hsieh
fec8b6eb28 Update arch-x86/lib-bootstrap/lib64
Note that this is only used (symlinked) by android-20/arch-x86/lib-bootstrap
for x86_64 build

Change-Id: I9ab023b0383f406fd5b05debf2dd75ea9f2243d8
2014-04-24 12:26:29 -07:00
Andrew Hsieh
693f2b6904 am a589c985: am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes."
* commit 'a589c985e9d6cfad4c938004442bc032ef68cee6':
  Update libportable to catch up bionic changes.
2014-04-24 15:43:20 +00:00
Andrew Hsieh
a589c985e9 am 36037576: am 867634ec: Merge "Update libportable to catch up bionic changes."
* commit '36037576fcfe5de9d8862812bd37b5a5cfcd6957':
  Update libportable to catch up bionic changes.
2014-04-24 09:02:45 +00:00
Andrew Hsieh
36037576fc am 867634ec: Merge "Update libportable to catch up bionic changes."
* commit '867634ecf44a88e407f6080859b1ca12d159eb63':
  Update libportable to catch up bionic changes.
2014-04-24 03:07:34 +00:00
Andrew Hsieh
867634ecf4 Merge "Update libportable to catch up bionic changes." 2014-04-24 03:05:22 +00:00
Brett Chabot
2e17ac46c8 Merge "Temporarily turn off runtest's disabling of dalvik verifier" 2014-04-23 22:32:54 +00:00
WenHan Gu
70174f1084 Update libportable to catch up bionic changes.
Note __open should not be used anymore.
Also, fix a x86 fenv bug.

Change-Id: I8430ccfdb7d7685e1ee6e71333d65590c09e3d6c
2014-04-23 21:47:49 +08:00
Jeff Sharkey
4c4580e5f6 Add code to exercise DocumentsContract.
Also fix broken "atLeastKitKat" definition.

Change-Id: I7c82ebb7b230ac66da3194412c845ff0c2b72f85
2014-04-22 22:03:37 -07:00