Commit Graph

18171 Commits

Author SHA1 Message Date
Todd Kennedy
5383dc24fc update show/hide button
A Fragment saves its hidden state. Update the text of the button
accodring to state of the Fragment.

Bug: 22666353
2015-07-23 12:31:33 -07:00
Yohann Roussel
15688b61f2 Merge "Revert "Change jack/dex target dependency to jack script"" 2015-07-21 17:05:08 +00:00
Yohann Roussel
942ba80014 Revert "Change jack/dex target dependency to jack script"
This reverts commit 5e944971fb.

Change-Id: I117008ec954607cb0b0fe195b7798659a469b7f1
2015-07-21 16:45:28 +00:00
Yohann Roussel
2e59f83308 Revert "Adapt to jack.jar renaming"
This reverts commit b03144dacb.

Change-Id: Ia3b430a0860eb47250fc8ed1f9381c2af5dad2f0
2015-07-21 16:44:10 +00:00
Yohann Roussel
b03144dacb Adapt to jack.jar renaming
Change-Id: I71d69538d63aaf3d8042e9914971ae98ac1ae95c
2015-07-21 16:37:58 +02:00
Yohann Roussel
5e944971fb Change jack/dex target dependency to jack script
Instead of jack.jar.

(cherry picked from commit 1d489a3333)

Change-Id: I958e1df8b1841ce61f0226cf34efbfc41699bf09
2015-07-20 10:18:28 +02:00
Dianne Hackborn
9b5c387bea am be84c107: am 97942f24: am d574af02: Track reason for screen turning on.
* commit 'be84c1070c50fc9ea945288dc5e18346430f6e15':
  Track reason for screen turning on.
2015-07-15 22:57:21 +00:00
Dianne Hackborn
be84c1070c am 97942f24: am d574af02: Track reason for screen turning on.
* commit '97942f243b2ed6f31e51c95f45399317e1e7c485':
  Track reason for screen turning on.
2015-07-15 22:26:19 +00:00
Dianne Hackborn
97942f243b am d574af02: Track reason for screen turning on.
* commit 'd574af02c86819f2e934356bd5ad3b7a4f1559bc':
  Track reason for screen turning on.
2015-07-15 22:11:27 +00:00
Dianne Hackborn
d574af02c8 Track reason for screen turning on.
Change-Id: I1ab64b6d29d7e2c6f9006587d41a318289f13227
2015-07-15 10:08:36 -07:00
Xavier Ducrohet
9cad4a419d am 70f97752: am 76330269: am f8c219e0: am 73190f3f: (-s ours) Update version of non-maven support package.
* commit '70f977529fb5bf2adf91dffad2244cb8e2fd9926':
  Update version of non-maven support package.
2015-07-15 02:37:14 +00:00
Xavier Ducrohet
70f977529f am 76330269: am f8c219e0: am 73190f3f: (-s ours) Update version of non-maven support package.
* commit '76330269c72a4507cf8af9bfb4a3e2226210d4c3':
  Update version of non-maven support package.
2015-07-15 02:22:02 +00:00
Xavier Ducrohet
76330269c7 am f8c219e0: am 73190f3f: (-s ours) Update version of non-maven support package.
* commit 'f8c219e08f1b1e27cb62de336f33b9e76bd8a29a':
  Update version of non-maven support package.
2015-07-15 02:06:37 +00:00
Xavier Ducrohet
f8c219e08f am 73190f3f: (-s ours) Update version of non-maven support package.
* commit '73190f3f7dd7e5b1cad7ede93f2246757b765949':
  Update version of non-maven support package.
2015-07-15 01:25:41 +00:00
Xavier Ducrohet
73190f3f7d Update version of non-maven support package.
Change-Id: I3a97f458a5ca6a23b4dc04ae0d131488bcd3183d
2015-07-14 16:32:41 -07:00
Jonathan Basseri
aae000c7d5 am d462d4f6: am ab6939cc: am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev
* commit 'd462d4f6928f9565f941e08ce61ade8a424cca11':
  Add carrier config test to test_defs.
2015-07-14 16:52:50 +00:00
Jonathan Basseri
d462d4f692 am ab6939cc: am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev
* commit 'ab6939cc07275d372ac1e579a6f9fc37e50d9094':
  Add carrier config test to test_defs.
2015-07-14 16:30:31 +00:00
Jonathan Basseri
ab6939cc07 am 6637c564: Merge "Add carrier config test to test_defs." into mnc-dev
* commit '6637c564a4ee458cb11c01b57622b3d0a7370aec':
  Add carrier config test to test_defs.
2015-07-14 00:40:06 +00:00
Jonathan Basseri
6637c564a4 Merge "Add carrier config test to test_defs." into mnc-dev 2015-07-13 21:24:11 +00:00
Vadim Tryshev
fa7bac4a51 am 6ee40a6a: am b310a9f6: am 09e17487: am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev
* commit '6ee40a6add8c448b3532b2f6f4060356800e3bde':
  Fixing a crash introduced by my previous CL.
2015-07-10 02:58:06 +00:00
Vadim Tryshev
6ee40a6add am b310a9f6: am 09e17487: am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev
* commit 'b310a9f6f5ac6dc76c974f31ee69476c38a1672b':
  Fixing a crash introduced by my previous CL.
2015-07-10 02:43:03 +00:00
Vadim Tryshev
b310a9f6f5 am 09e17487: am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev
* commit '09e174875c23eb7ca9cd78655103d11d6d110fe4':
  Fixing a crash introduced by my previous CL.
2015-07-10 02:29:46 +00:00
Vadim Tryshev
09e174875c am 1461b8e9: Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev
* commit '1461b8e9a0573442d8259c5035025e847cb511d7':
  Fixing a crash introduced by my previous CL.
2015-07-10 01:31:11 +00:00
Vadim Tryshev
1461b8e9a0 Merge "Fixing a crash introduced by my previous CL." into lmp-mr1-ub-dev 2015-07-09 22:39:18 +00:00
Jonathan Basseri
98108540bf Add carrier config test to test_defs.
Bug: 21619172
Change-Id: I1fac0bcfc4064ea80b46edd128d8c81e80bd2872
2015-07-09 11:34:41 -07:00
Elliott Hughes
4b5e0e3879 am ab49c9ac: am 2b9d34e1: am 73371e58: Merge "Fix gdbclient to work with emulator builds"
* commit 'ab49c9ac69e71019312fb43e0b38b14a8cd66349':
  Fix gdbclient to work with emulator builds
2015-07-09 16:28:06 +00:00
Elliott Hughes
ab49c9ac69 am 2b9d34e1: am 73371e58: Merge "Fix gdbclient to work with emulator builds"
* commit '2b9d34e13250d8da0f40afeb9b5793355117f4d1':
  Fix gdbclient to work with emulator builds
2015-07-09 16:12:47 +00:00
Elliott Hughes
2b9d34e132 am 73371e58: Merge "Fix gdbclient to work with emulator builds"
* commit '73371e581be72ea766a3170b3b647a28484ae69e':
  Fix gdbclient to work with emulator builds
2015-07-09 16:00:15 +00:00
Elliott Hughes
73371e581b Merge "Fix gdbclient to work with emulator builds" 2015-07-09 15:48:55 +00:00
Nikola Veljkovic
4efdec68b0 Fix gdbclient to work with emulator builds
gdbclient got broken by:
https://android-review.googlesource.com/156974

To fix, check for special case when device is actually an emulator,
and set the $DEVICE variable accordingly.

Change-Id: I85d0d520ae1e2ea022aa3e2d08a10cd0b1cb491f
2015-07-09 12:05:13 +02:00
Santos Cordon
bb84318b3c am 95f16268: am f5bfa219: am 0aafaa70: Add calllog CTS tests.
* commit '95f16268780201b1dfd843051b667796d376acb6':
  Add calllog CTS tests.
2015-07-08 02:07:45 +00:00
Santos Cordon
95f1626878 am f5bfa219: am 0aafaa70: Add calllog CTS tests.
* commit 'f5bfa219e5dee6250b9d938b9c7a8a7688eac8a1':
  Add calllog CTS tests.
2015-07-08 01:39:58 +00:00
Santos Cordon
f5bfa219e5 am 0aafaa70: Add calllog CTS tests.
* commit '0aafaa708124778dce14f8dd10a4438fda22f888':
  Add calllog CTS tests.
2015-07-08 00:16:35 +00:00
Benjamin Weiss
e8e19a01c2 am 5e42f777: am 179db98d: am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
* commit '5e42f7773c7180836b5b3d1a9e80e98195596556':
  Introduce sample for RoundedBitmapDrawable
2015-07-07 20:35:51 +00:00
Santos Cordon
0aafaa7081 Add calllog CTS tests.
Bug: 22326097
Change-Id: I3c41d97f8054d20448a6d44d32b04443ba83056b
2015-07-07 13:09:25 -07:00
Benjamin Weiss
5e42f7773c am 179db98d: am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
* commit '179db98d099ac2090d2298eba6b1fd0ee2836bca':
  Introduce sample for RoundedBitmapDrawable
2015-07-07 17:35:47 +00:00
Benjamin Weiss
179db98d09 am f3b07d46: am c84455c1: Introduce sample for RoundedBitmapDrawable
* commit 'f3b07d469e1e4b2baea9ae4952d1455895c55725':
  Introduce sample for RoundedBitmapDrawable
2015-07-07 16:52:56 +00:00
Benjamin Weiss
f3b07d469e am c84455c1: Introduce sample for RoundedBitmapDrawable
* commit 'c84455c11fdace9bc5c82aae99318bd9cd2480fa':
  Introduce sample for RoundedBitmapDrawable
2015-07-07 15:58:31 +00:00
Benjamin Weiss
c84455c11f Introduce sample for RoundedBitmapDrawable
Shows how to set an image to circular using
the setCircular API.

Change-Id: Ic65b9feb74942b6bd1c9debcf88fad5935df6d67
2015-07-07 11:49:45 +01:00
Trevor Johns
1aa598d3c5 am d7e79e79: (-s ours) am 0da1d61e: am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
* commit 'd7e79e7945716ef6d816971d987ca3f9412c68d7':
  Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
2015-07-07 03:23:04 +00:00
Trevor Johns
d7e79e7945 am 0da1d61e: am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
* commit '0da1d61ed70b8e20544b49b97f0cc3ee25434170':
  Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
2015-07-07 00:25:01 +00:00
Trevor Johns
0da1d61ed7 am 4fabcc75: am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
* commit '4fabcc75adade157349b5564d05004d73f7aa00f':
  Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
2015-07-07 00:11:09 +00:00
Trevor Johns
4fabcc75ad am 0d21ec5c: (-s ours) am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
* commit '0d21ec5c41d905122dda25c214c5931666d7ec10':
  Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
2015-07-06 23:30:18 +00:00
Trevor Johns
0d21ec5c41 am 4fe2d033: (-s ours) Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
* commit '4fe2d033580b4f1316317465ef9c92b76cfa95f9':
  Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
2015-07-06 23:13:30 +00:00
Trevor Johns
4fe2d03358 Sync sample prebuilts for mnc-preview-docs (DO NOT MERGE)
Synced to //developers/samples/android commit 535025bac7.

Change-Id: If65e90f25cebb8d774d9c581dbcbb2ba2a8bce51
2015-07-06 15:45:37 -07:00
Yohann Roussel
1b586c3fb3 Merge "Revert "Change jack/dex target dependency to jack script"" 2015-07-04 12:15:30 +00:00
Yohann Roussel
23ad90ad18 Revert "Change jack/dex target dependency to jack script"
This reverts commit 1d489a3333.

Change-Id: I10835bc1c3ecefe49af872d3a2fbab780fb86a1c
2015-07-04 12:09:55 +00:00
Yohann Roussel
4e7d034ff9 Merge "Change jack/dex target dependency to jack script" 2015-07-03 17:02:37 +00:00
Makoto Onuki
a5628f7219 am d800d65c: am f711d9ce: am e31d4f49: Use Android Studio project, also call TelephonyManager.getLine1Number().
* commit 'd800d65cdff3f3818bfc20b708cf0a728bb1c7a5':
  Use Android Studio project, also call TelephonyManager.getLine1Number().
2015-07-03 16:48:48 +00:00
Yohann Roussel
1d489a3333 Change jack/dex target dependency to jack script
Instead of jack.jar.

Change-Id: I359489d8f93f8ba2dbcd53e36c6fd7d93dee024e
2015-07-03 11:29:23 +02:00