Commit Graph

13878 Commits

Author SHA1 Message Date
Andrew Hsieh
62bfb47039 am 0c3ed0f3: am 11cd67cc: am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
* commit '0c3ed0f34e0e190387727d8d2f06c527efbb31a5':
  Implement libportable for unknown arch 64bit.
2014-04-10 02:49:36 +00:00
Andrew Hsieh
0c3ed0f34e am 11cd67cc: am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
* commit '11cd67cc315c73165cc339f8a78c386f2452a250':
  Implement libportable for unknown arch 64bit.
2014-04-10 02:46:25 +00:00
Andrew Hsieh
11cd67cc31 am 2d2e407f: Merge "Implement libportable for unknown arch 64bit."
* commit '2d2e407f1ff28f5c6d168bfccf20e2ebbbd5649a':
  Implement libportable for unknown arch 64bit.
2014-04-10 02:44:28 +00:00
Andrew Hsieh
2d2e407f1f Merge "Implement libportable for unknown arch 64bit." 2014-04-10 02:42:31 +00:00
Tim Kilbourn
931d5741f9 am 55458e67: am e0cd23d9: Use ImageCardview in leanback samples.
* commit '55458e676cd45a6c40a0d54bdc88c3a9b14cd34c':
  Use ImageCardview in leanback samples.
2014-04-10 01:07:01 +00:00
Tim Kilbourn
55458e676c am e0cd23d9: Use ImageCardview in leanback samples.
* commit 'e0cd23d9d8dc95c502198a3f1d73e950d6b9ecd4':
  Use ImageCardview in leanback samples.
2014-04-09 23:50:42 +00:00
Alan Viverette
676bf55007 Merge "Update ApiDemos to use API 20, default theme" 2014-04-09 22:43:20 +00:00
Craig Stout
269cc3663c am f6da1180: am 3d2e6fb9: Add VerticalGridActivity to the leanback demo.
* commit 'f6da1180134826aae5490635f08e174ce0cc6b0e':
  Add VerticalGridActivity to the leanback demo.
2014-04-09 14:10:07 +00:00
Craig Stout
f6da118013 am 3d2e6fb9: Add VerticalGridActivity to the leanback demo.
* commit '3d2e6fb9687438adce494692feec57b7b34a2109':
  Add VerticalGridActivity to the leanback demo.
2014-04-09 14:03:31 +00:00
Tim Kilbourn
e0cd23d9d8 Use ImageCardview in leanback samples.
Change-Id: I14606ff001cfd4ce244f32a8f1c973847ac1d0e3
2014-04-09 00:45:00 -07:00
Craig Stout
3d2e6fb968 Add VerticalGridActivity to the leanback demo.
Change-Id: I38e8a85d5a7ae30b1c0ee71cff979456bdac0665
2014-04-09 00:10:44 -07:00
Alan Viverette
c69dbd9404 Update ApiDemos to use API 20, default theme
Change-Id: I74f47722093bb2dd72b506603afcd5c300d53431
2014-04-08 15:31:33 -07:00
WenHan Gu
859559268d Implement libportable for unknown arch 64bit.
Change-Id: I1e1fd8714b907bfccd5fa8df12a94697886e59cb
2014-04-08 16:28:22 +08:00
Alan Viverette
f8f90106f7 Merge "Fix numbering in API Demos" 2014-04-08 01:56:51 +00:00
Alan Viverette
b020f1cbf5 Fix numbering in API Demos
Change-Id: Ia2983f96c3cd1b48bac9941465adf39989536794
2014-04-07 16:22:44 -07:00
Steve Moyer
e4e5195e59 am f457a863: (-s ours) am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
* commit 'f457a8630fb678ae60c4970995499c57fc74a12c':
  DO NOT MERGE: fix package for AndroidJUnitRunner
2014-04-07 22:57:20 +00:00
Steve Moyer
f457a8630f am 1601b1c9: (-s ours) am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
* commit '1601b1c9e632cce64d9f9aa676891e228b28eb73':
  DO NOT MERGE: fix package for AndroidJUnitRunner
2014-04-07 22:52:06 +00:00
Steve Moyer
1601b1c9e6 am 6c56e9e1: (-s ours) Merge "DO NOT MERGE: fix package for AndroidJUnitRunner"
* commit '6c56e9e104d6071d459f04b266c6b8c53a32c635':
  DO NOT MERGE: fix package for AndroidJUnitRunner
2014-04-07 22:48:19 +00:00
Steve Moyer
6c56e9e104 Merge "DO NOT MERGE: fix package for AndroidJUnitRunner" 2014-04-07 22:43:27 +00:00
George Mount
b3059f8744 Use framework Transition MoveImage and Slide
Change-Id: I3c55ee699288f1945ae0a23dfad2ae4fd9caa9a0
2014-04-07 09:13:55 -07:00
Tim Kilbourn
2afda8f4bd am e88b659c: am 29830054: Add callbacks for actions in details.
* commit 'e88b659c2b5ad7dc142f73a5ddfe9e49c7ccb94c':
  Add callbacks for actions in details.
2014-04-06 08:43:28 +00:00
Tim Kilbourn
e88b659c2b am 29830054: Add callbacks for actions in details.
* commit '29830054ff0d668aa51732aa080fcac113f9895c':
  Add callbacks for actions in details.
2014-04-06 08:02:36 +00:00
Tim Kilbourn
29830054ff Add callbacks for actions in details.
Change-Id: I5d56e65c45c686fa1b4a686d67f27fb316f9ddf9
2014-04-04 16:39:12 -07:00
Steve Moyer
3a49f89e86 DO NOT MERGE: fix package for AndroidJUnitRunner
Change-Id: I6b3fb006212f273d018121800d1d94e8a8d7404d
2014-04-04 16:32:31 -07:00
Tim Kilbourn
77815190e4 am 62ff9646: am 7f94b8d6: Add a details fragment to leanback samples.
* commit '62ff9646276f2176c78367e7ae6694ce29a50149':
  Add a details fragment to leanback samples.
2014-04-04 22:34:36 +00:00
Tim Kilbourn
62ff964627 am 7f94b8d6: Add a details fragment to leanback samples.
* commit '7f94b8d6e6bd1dc4e2e8d95d1aeb1c3c00a13dd0':
  Add a details fragment to leanback samples.
2014-04-04 22:26:29 +00:00
Tim Kilbourn
7f94b8d6e6 Add a details fragment to leanback samples.
Change-Id: Ib958e02b464618107ab7233cb0e05bddc6ef56df
2014-04-04 12:46:19 -07:00
Xavier Ducrohet
bff5b88aee am 14c79bb8: (-s ours) am f3ff0296: Move ZipAlign to build-tools. DO NOT MERGE.
* commit '14c79bb8db40a38156b4ef228539c6e69c022063':
  Move ZipAlign to build-tools. DO NOT MERGE.
2014-04-04 17:59:34 +00:00
Xavier Ducrohet
14c79bb8db am f3ff0296: Move ZipAlign to build-tools. DO NOT MERGE.
* commit 'f3ff0296c96a81a6ebb053bf39f7484d03dc4678':
  Move ZipAlign to build-tools. DO NOT MERGE.
2014-04-04 17:52:33 +00:00
Xavier Ducrohet
f3ff0296c9 Move ZipAlign to build-tools. DO NOT MERGE.
(cherry picked from commit 76510e2dd2)

Change-Id: I2262795c0dfe9b103fda8c9a50a80d688ece5a12
2014-04-04 10:45:35 -07:00
Steve Moyer
eea325e558 am 510fca8b: (-s ours) am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
* commit '510fca8beb2113b38c943f17570d0248af356ac5':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-04-04 16:47:08 +00:00
Steve Moyer
510fca8beb am 20c4a334: (-s ours) am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
* commit '20c4a33489f27fe704f6eb66ec49bc9063b59951':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-04-04 16:39:25 +00:00
Steve Moyer
20c4a33489 am 0b1a1f7b: (-s ours) Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests"
* commit '0b1a1f7b38f6fdfa4de35238529036d2a6230615':
  DO NOT MERGE: Add SmsTest and mege emulator smoke tests
2014-04-04 16:36:17 +00:00
Steve Moyer
0b1a1f7b38 Merge "DO NOT MERGE: Add SmsTest and mege emulator smoke tests" 2014-04-04 16:32:00 +00:00
Xavier Ducrohet
8821b239d1 am d6ccbcd2: am 47eadf1e: Merge "Move ZipAlign to build-tools."
* commit 'd6ccbcd253d34feb75cba4cbd98f520dfa789757':
  Move ZipAlign to build-tools.
2014-04-04 03:19:02 +00:00
Xavier Ducrohet
d6ccbcd253 am 47eadf1e: Merge "Move ZipAlign to build-tools."
* commit '47eadf1ecef5e898d63863edaa644615942ad0fd':
  Move ZipAlign to build-tools.
2014-04-04 00:08:23 +00:00
Steve Moyer
6ded79d696 DO NOT MERGE: Add SmsTest and mege emulator smoke tests
Picked Changes:
Add SMS test to verify emulator can receive sms from DDMS
Adding test tag to sms test
Add up to 6 10 second delays to wait for sms
Merging emulator smoke test projects
Combining SmsTest, GpsLocationTests, and ConnectivityTest

Conflicts:
	build/sdk.atree

Change-Id: I1343c59418a69b2f5e1eb0c6cde54f2bc09300ac
2014-04-03 16:02:56 -07:00
Xavier Ducrohet
47eadf1ece Merge "Move ZipAlign to build-tools." 2014-04-03 22:21:08 +00:00
Xavier Ducrohet
76510e2dd2 Move ZipAlign to build-tools.
Change-Id: Id83a8dc86946bcde78e9eaaab009a06a59fccbd0
2014-04-03 10:09:53 -07:00
Andrew Hsieh
1da473b4cc am c415108e: am 497b94df: Merge "Headers update from bionic for x86_64 support"
* commit 'c415108e0e1eae28827db43ddacf987040a3b150':
  Headers update from bionic for x86_64 support
2014-04-02 09:09:42 +00:00
Andrew Hsieh
c415108e0e am 497b94df: Merge "Headers update from bionic for x86_64 support"
* commit '497b94df024cc6b4b6a5e98886dc85e8bc391994':
  Headers update from bionic for x86_64 support
2014-04-02 09:01:43 +00:00
Andrew Hsieh
497b94df02 Merge "Headers update from bionic for x86_64 support" 2014-04-02 08:21:49 +00:00
Michael Wright
26b91ca81c Add logging for failed injections to Monkey.
Bug: 13679803
Change-Id: Iefb0073ad892b15b734b739fe036262ea60066d2
2014-04-01 00:05:37 +00:00
Dave Platt
73f1ba806f Update sample NSD app to work reliably with current Android
Change the management of NSD Listener objects to one which ensures
that each Listener will be used for only one NSD service request at
a time (as the APIs were intended to function).  Listeners are now
allocated in a "lazy" on-demand way, rather than having one Listener
of each type allocated at application startup time.  When the Register
or Discover button is clicked, any existing Listener request of that
type will be canceled and the Listener discarded (avoiding the need
to wait until the Listener callback has been completed), and a new
Listener will be allocated.

Moves code around in the application-lifecycle callbacks to reflect
the current Android lifecycle.  Doing important things like
unregistering NSD services should not be done in the onDestroy()
callback, as there is no guarantee that the app won't be killed
before this callback is invoked.  This can lead to "zombie"
NSD registrations in KitKat.

Adds additional lifecycle logging.

Pass 2 - fix typo, clean up trailing whitespace

Pass 3 - fix onStart/onRestart mismatch

Bug: 13512512
Change-Id: Ic164110759204b27d8a14376777b593ebe1865fa
2014-03-31 13:45:36 -07:00
Andrew Hsieh
4e2c5f8afa am 2a87ef1a: am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits"
* commit '2a87ef1a90597ff231cf41e22009a048869b55e1':
  Move _types.h to 32-bit arch dirs to avoid impact on 64-bits
2014-03-29 03:23:43 +00:00
Andrew Hsieh
00f82e18c6 am 930e9fee: am ac982541: Merge "Refresh locale.h from bionic"
* commit '930e9feeda4f71c13735dc8441e553dfbc4aa4a1':
  Refresh locale.h from bionic
2014-03-29 03:23:42 +00:00
Andrew Hsieh
161289c3e2 am d64062a0: am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so"
* commit 'd64062a05fadc29576b5ef757edefd4099cfc9ca':
  Add 64-bit libc.so/libm.so/libdl.so
2014-03-29 03:23:41 +00:00
Andrew Hsieh
2a87ef1a90 am 0123d349: Merge "Move _types.h to 32-bit arch dirs to avoid impact on 64-bits"
* commit '0123d3496ac20fadbedf3c0fa38447e66a0b8ff2':
  Move _types.h to 32-bit arch dirs to avoid impact on 64-bits
2014-03-29 03:21:24 +00:00
Andrew Hsieh
930e9feeda am ac982541: Merge "Refresh locale.h from bionic"
* commit 'ac982541a91fb9999b55a52ef0e269731968c231':
  Refresh locale.h from bionic
2014-03-29 03:17:40 +00:00
Andrew Hsieh
d64062a05f am 1782523e: Merge "Add 64-bit libc.so/libm.so/libdl.so"
* commit '1782523e75b76d2c67b807fc1520c61532a129a6':
  Add 64-bit libc.so/libm.so/libdl.so
2014-03-29 03:17:38 +00:00