Commit Graph

1744 Commits

Author SHA1 Message Date
Alan Viverette
08f1ee33a1 am 19142864: am 1cb84db2: Merge "Add RTL support in Support4Demos manifest, fix DrawerLayout sample" into jb-mr2-ub-dev
* commit '19142864e826415f6be4f04a9fe125ba6d44cc54':
  Add RTL support in Support4Demos manifest, fix DrawerLayout sample
2013-08-07 13:18:49 -07:00
Alan Viverette
19142864e8 am 1cb84db2: Merge "Add RTL support in Support4Demos manifest, fix DrawerLayout sample" into jb-mr2-ub-dev
* commit '1cb84db2c9279dc82d9580c6c4f8542f77515c96':
  Add RTL support in Support4Demos manifest, fix DrawerLayout sample
2013-08-06 11:13:20 -07:00
Alan Viverette
1cb84db2c9 Merge "Add RTL support in Support4Demos manifest, fix DrawerLayout sample" into jb-mr2-ub-dev 2013-08-06 18:11:11 +00:00
Alan Viverette
c7c384b4f6 Add RTL support in Support4Demos manifest, fix DrawerLayout sample
Change-Id: I1152ad6e49a1b1dc88a70f701bf7ed2fe882e242
2013-08-06 11:10:22 -07:00
Mindy DelliCarpini
e1d5cb5997 resolved conflicts for merge of 73a12453 to master
Change-Id: Ib6944821270b6a76272625748190926adcad8eda
2013-08-06 09:45:39 -07:00
Mindy DelliCarpini
73a124536a am 28a1e658: Merge "Add sample for new ContentLoadingProgressBar." into jb-mr2-ub-dev
* commit '28a1e658c9c028fb5ab239f439cf5b28cc2fe9e9':
  Add sample for new ContentLoadingProgressBar.
2013-08-06 09:32:52 -07:00
Mindy DelliCarpini
28a1e658c9 Merge "Add sample for new ContentLoadingProgressBar." into jb-mr2-ub-dev 2013-08-06 15:58:22 +00:00
Mindy DelliCarpini
3e28c84e96 Add sample for new ContentLoadingProgressBar.
Change-Id: I057fbe3f355030eb5d857e1a86f04302bb1e147e
2013-08-05 16:36:02 -07:00
Daniel Olshansky
bb2d39eb6a am 6a30568b: am 5bcd87e3: First commit for ListViewCellInsertion. (cherry picked from commit c24035501d)
* commit '6a30568bb187dfd507588c728d5c434e104aabfb':
  First commit for ListViewCellInsertion. (cherry picked from commit c24035501d)
2013-08-02 17:40:57 -07:00
Daniel Olshansky
6a30568bb1 am 5bcd87e3: First commit for ListViewCellInsertion. (cherry picked from commit c24035501d)
* commit '5bcd87e362af9e1a5c45ce2e036bf14b562fbb17':
  First commit for ListViewCellInsertion. (cherry picked from commit c24035501d)
2013-08-02 17:38:24 -07:00
Jeff Brown
7e9ab48ed0 am 5f4e7a10: Merge "Support7Demos: media router sample" into jb-mr2-ub-dev
* commit '5f4e7a104b764f07bdc963aa7e668cc3913f85e3':
  Support7Demos: media router sample
2013-08-02 17:37:35 -07:00
Jeff Brown
5f4e7a104b Merge "Support7Demos: media router sample" into jb-mr2-ub-dev 2013-08-02 23:36:17 +00:00
Daniel Olshansky
5bcd87e362 First commit for ListViewCellInsertion.
(cherry picked from commit c24035501d)
2013-08-02 21:47:02 +00:00
Alan Viverette
cfc35db8c5 Merge "Add sample code for ExploreByTouchHelper class." 2013-08-02 20:32:01 +00:00
Alan Viverette
b468ddad5d Merge "Remove AccessibilityNodeProvider sample code." 2013-08-02 20:14:24 +00:00
Chong Zhang
036c81a9d2 Support7Demos: media router sample
Change-Id: Ie2a6a98cd256caae84f76dd398f9113f07cd4dd3
(cherry picked from commit ba708c7f49)
2013-08-02 12:46:30 -07:00
Chong Zhang
ab020ba010 Merge "Support7Demos: media router sample" 2013-08-02 00:23:39 +00:00
Chong Zhang
ba708c7f49 Support7Demos: media router sample
Change-Id: Ie2a6a98cd256caae84f76dd398f9113f07cd4dd3
2013-08-01 00:39:41 -07:00
Dianne Hackborn
b3e4bab48d Add new Intent demos.
Change-Id: Iad47cca8c3fc5ccd184e07e95c9c13877f1d4ff0
2013-07-31 16:38:48 -07:00
Chris Banes
4bdb5da779 am 4a331512: am fe17cee4: Fix ActionBarUsage in Support7Demos
* commit '4a331512cbdeb4b95af4d43e09c8096d68dceedd':
  Fix ActionBarUsage in Support7Demos
2013-07-31 06:55:43 -07:00
Chris Banes
4a331512cb am fe17cee4: Fix ActionBarUsage in Support7Demos
* commit 'fe17cee4e41993e3f12685d1dda26f26b7013c12':
  Fix ActionBarUsage in Support7Demos
2013-07-31 06:53:25 -07:00
Chet Haase
d9654ca88d Merge "First commit for SlidingFragment." 2013-07-30 17:27:39 +00:00
Chet Haase
d6cb483b3c Merge "First commit for ListViewDraggingAnimation." 2013-07-30 17:27:30 +00:00
Chet Haase
bc423d38d9 Merge "First commit for CardFlip." 2013-07-30 17:27:19 +00:00
Chet Haase
57a59ccacf Merge "First commit for ListViewCellInsertion." 2013-07-30 17:27:11 +00:00
Chet Haase
a67b6cd993 Merge "First commit for FoldingLayout." 2013-07-30 17:27:04 +00:00
Chet Haase
2853dbdd74 Merge "First commit for ImagePixelization." 2013-07-30 17:26:53 +00:00
Chet Haase
e81cc552c2 Merge "First commit for ListViewExpandingCells." 2013-07-30 17:25:56 +00:00
Daniel Olshansky
8cfd63c979 First commit for ListViewExpandingCells.
Change-Id: I8d64562f8c7c0e207aef0b36df10ee3744dd446a
2013-07-29 15:07:05 -07:00
Daniel Olshansky
4ea559806d First commit for ImagePixelization.
Change-Id: I02ab79d17cb32773a9bd1a4c50bc76bde8925368
2013-07-29 15:02:28 -07:00
Daniel Olshansky
425e318026 First commit for FoldingLayout.
Change-Id: I3eaca79e3c7a0c6d2e8f5c6de5a3d4c3db4bf5a5
2013-07-29 14:58:49 -07:00
Daniel Olshansky
c24035501d First commit for ListViewCellInsertion. 2013-07-29 11:05:36 -07:00
Daniel Olshansky
b6eeed4a19 First commit for CardFlip.
Change-Id: Ic0e68fdcb23ea70208adfda69f9e500955fa1254
2013-07-29 09:42:40 -07:00
Daniel Olshansky
d79643bbd1 First commit for ListViewDraggingAnimation.
Change-Id: Ib1642809b33cba3f8e319b43688047672cffaf19
2013-07-29 09:21:31 -07:00
Daniel Olshansky
0d2f159061 First commit for SlidingFragment.
Change-Id: Iefffc341c7b1cca8a668218097bbcdbfbafa1713
2013-07-29 09:14:51 -07:00
Chris Banes
fe17cee4e4 Fix ActionBarUsage in Support7Demos
It was using SearchViewCompat and causing an FC

Change-Id: Ib69a6d68b29cc9669a6595bdd75b5369458f561b
2013-07-26 10:15:07 +01:00
Trevor Johns
7def7e7e0d am f6f2808c: am 2a4aa3cd: Remove AppRestrictions and BluetoothLeGatt samples
* commit 'f6f2808c5302f90a16bfdaaca3034ac24f2d91f9':
  Remove AppRestrictions and BluetoothLeGatt samples
2013-07-24 16:58:12 -07:00
Trevor Johns
f6f2808c53 am 2a4aa3cd: Remove AppRestrictions and BluetoothLeGatt samples
* commit '2a4aa3cd5dc0f13f676ed1994e6748a156eb5801':
  Remove AppRestrictions and BluetoothLeGatt samples
2013-07-24 16:55:15 -07:00
Trevor Johns
2a4aa3cd5d Remove AppRestrictions and BluetoothLeGatt samples
These have been moved to the new samples repository in
developers/samples/android.

Change-Id: I77312ea146ccb47ec8ecf38c9448149ec4c34962
2013-07-24 12:36:28 -07:00
Fred Chung
b6cd736ce9 am 8905657e: am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev
* commit '8905657ea4b25ac6ee2820f79d6d9ed90aa2122e':
  Removed redundant launcher icon reference.
2013-07-22 11:45:32 -07:00
Fred Chung
8905657ea4 am 19dd9d20: Merge "Removed redundant launcher icon reference." into jb-mr2-dev
* commit '19dd9d200cc6783b468c4392a724dc1dd1f15523':
  Removed redundant launcher icon reference.
2013-07-22 11:42:41 -07:00
Fred Chung
581b9fdfb1 am 9aa3da19: am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev
* commit '9aa3da19b5d0172e50d857ea3c640a64daf4b056':
  App restriction for restricted profile sample.
2013-07-22 11:33:48 -07:00
Fred Chung
6758cf0530 Removed redundant launcher icon reference.
Change-Id: I637736a97744db79e803e1fba4b5c0bd993e4e53
2013-07-22 11:33:02 -07:00
Fred Chung
9aa3da19b5 am 63bc4aaf: Merge "App restriction for restricted profile sample." into jb-mr2-dev
* commit '63bc4aaf4cef9e82fd6554f6a06f64815b809c6e':
  App restriction for restricted profile sample.
2013-07-22 11:32:00 -07:00
Fred Chung
b71371d3af App restriction for restricted profile sample.
This sample demonstrates how to expose restrictions for a restricted user on a multiuser device.  This feature is available on Android 4.3 (API level 18) and above platforms.

Change-Id: I4ef1bbda8e530dd8370d754de814fce96eaae1f1
2013-07-21 23:19:18 -07:00
Stephan Linzner
8397e0c6f7 Fixed startActivity() Bug in LaunchActivityTest
Activity under test was called in setUp instead of each test method.
Now each test method makes a separate call to startActivity() like
mentioned in our documentation.

Change-Id: I41df74cd5dae30e57cb481bb85714e361a9189e8
Signed-off-by: Stephan Linzner <slinzner@google.com>
2013-07-12 13:21:47 +02:00
Stephan Linzner
682ed1d880 Merge "Initial Commit for Android Testing Training Sample" 2013-07-12 11:15:31 +00:00
Stephan Linzner
fcf428647f Initial Commit for Android Testing Training Sample
Testing training sample code for Activity testing. Including
test cases for Instrumentation and Unit Testing of Activities
Uses old test structure with src/ and tests/ folder for
easy import to eclipse. Contains a build.gradle to
easily run it via the new build system from cli. Remapping
of tests/ is done within the build.gradle configuration file

Change-Id: I15f815ad185257a8fa650b3c0f10ba761044379c
Signed-off-by: Stephan Linzner <slinzner@google.com>
2013-07-11 16:05:31 +02:00
Fred Chung
fde787842f am b597143c: am 7167a054: Bluetooth LE sample.
* commit 'b597143cce0eefc7c749f82e233667a6975c4c75':
  Bluetooth LE sample.
2013-07-08 15:24:08 -07:00
Fred Chung
b597143cce am 7167a054: Bluetooth LE sample.
* commit '7167a054a8027f75025c865322fa84791a9b3bd1':
  Bluetooth LE sample.
2013-07-08 15:22:09 -07:00