summaryrefslogtreecommitdiffstats
path: root/samples
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'android-4.3_r3' into cm-10.2Ricardo Cerqueira2013-09-1722-1655/+0
|\
| * Remove AppRestrictions and BluetoothLeGatt samplesTrevor Johns2013-07-2429-2029/+0
| * Removed redundant launcher icon reference.Fred Chung2013-07-221-3/+3
| * App restriction for restricted profile sample.Fred Chung2013-07-2114-207/+581
* | Merge tag 'android-4.3_r2.1' into cm-10.2Ricardo Cerqueira2013-07-24433-5545/+20701
|\|
| * Bluetooth LE sample.Fred Chung2013-07-0816-0/+1217
| * Redefine content position in milliseconds instead of seconds.Jeff Brown2013-06-111-3/+4
| * Update media router api.Jeff Brown2013-06-111-4/+0
| * Update media router API.Jeff Brown2013-05-302-57/+78
| * am 9c6fb05e: am 58cbe71c: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes...Chet Haase2013-05-30127-0/+5529
| |\
| | * am 58cbe71c: am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demosChet Haase2013-05-30127-0/+5529
| | |\
| | | * am 8654b6c6: am 3ff1591c: am 28b127ec: New DevBytes animation demosChet Haase2013-05-30127-0/+5529
| | | |\
| | | | * am 28b127ec: New DevBytes animation demosChet Haase2013-05-30127-0/+5529
| | | | |\
| | | | | * New DevBytes animation demosChet Haase2013-05-30127-0/+5529
| | * | | | am 5f1aa33a: am 44bafdcc: Merge "DO NOT MERGE. Example code for FileProvider....Xavier Ducrohet2013-05-135-0/+147
| | |\| | |
| | | * | | Merge "DO NOT MERGE. Example code for FileProvider." into jb-mr1.1-ub-devXavier Ducrohet2013-05-135-0/+147
| | | |\ \ \
| | | | * | | DO NOT MERGE. Example code for FileProvider.Jeff Sharkey2013-05-135-0/+147
| * | | | | | Remove Toggle System UI options from Support7DemosChris Banes2013-05-253-16/+1
| * | | | | | Update media router API.Jeff Brown2013-05-202-54/+64
| * | | | | | Update media router API.Jeff Brown2013-05-165-8/+9
| * | | | | | Update media router API.Jeff Brown2013-05-135-62/+116
| * | | | | | am 1aa17274: am a50fc7f1: am 138f3a31: add nav drawer sampleScott Main2013-05-1029-0/+432
| |\| | | | |
| | * | | | | am a50fc7f1: am 138f3a31: add nav drawer sampleScott Main2013-05-1029-0/+432
| | |\| | | |
| | | * | | | add nav drawer sampleScott Main2013-05-1029-0/+432
| | | |/ / /
| * | | | | Update Support7Demos for MenuInflater change:Chris Banes2013-04-303-3/+3
| * | | | | Update Support7Demos for action bar compat API changes.Adam Powell2013-04-299-78/+64
| * | | | | Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb...Fabrice Di Meglio2013-04-201-1/+1
| |\ \ \ \ \
| | * | | | | Fix bug #8656546 API REVIEW: android.text.bidi / android.textFabrice Di Meglio2013-04-191-1/+1
| * | | | | | Merge "appcompat: Add samples for options menu usage with fragments." into jb...Jeff Brown2013-04-204-0/+336
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | appcompat: Add samples for options menu usage with fragments.Jeff Brown2013-04-184-0/+336
| * | | | | | Merge "Add Android KeyStore API demo" into jb-mr2-devKenny Root2013-04-204-0/+742
| |\ \ \ \ \ \
| | * | | | | | Add Android KeyStore API demoKenny Root2013-04-194-0/+742
| | |/ / / / /
| * | | | | | Merge "Update to follow TransportMediator API changes." into jb-mr2-devDianne Hackborn2013-04-192-11/+11
| |\ \ \ \ \ \
| | * | | | | | Update to follow TransportMediator API changes.Dianne Hackborn2013-04-182-11/+11
| | |/ / / / /
| * | | | | | resolved conflicts for merge of b105894b to jb-mr2-devAdam Powell2013-04-1912-1/+601
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | am 2622ae27: am 98c5d4a2: Add Support4Demos examples for DrawerLayout and Sli...Adam Powell2013-04-1912-1/+601
| | |\| | |
| | | * | | Add Support4Demos examples for DrawerLayout and SlidingPaneLayoutAdam Powell2013-04-1812-1/+601
| | | |/ /
| * | | | Merge "Fix issue #8520788: Add WakefulBroadcastReceiver" into jb-mr2-devDianne Hackborn2013-04-177-1/+222
| |\ \ \ \
| | * | | | Fix issue #8520788: Add WakefulBroadcastReceiverDianne Hackborn2013-04-177-1/+222
| * | | | | Merge "DO NOT MERGE Deferring new collections widget apis. Revert "Updating W...Winson Chung2013-04-174-49/+140
| |\ \ \ \ \
| | * | | | | DO NOT MERGE Deferring new collections widget apis. Revert "Updating WeatherL...Winson Chung2013-04-174-49/+140
| * | | | | | Changes to handle restrictions API changeAmith Yamasani2013-04-172-42/+55
| | |/ / / / | |/| | | |
| * | | | | Merge "Fix some crashes in the sample" into jb-mr2-devAmith Yamasani2013-04-152-18/+34
| |\ \ \ \ \
| | * | | | | Fix some crashes in the sampleAmith Yamasani2013-04-102-18/+34
| * | | | | | Update media router API.Jeff Brown2013-04-112-7/+7
| * | | | | | Update for java docs.Dianne Hackborn2013-04-112-19/+13
| * | | | | | Merge "Issue #7341342 API request: way to determine current orientation..." i...Dianne Hackborn2013-04-122-0/+8
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| | * | | | | Issue #7341342 API request: way to determine current orientation...Dianne Hackborn2013-04-102-0/+8
| | |/ / / /
| * | | | | Merge "Remove OptionalPermissions demo." into jb-mr2-devNick Kralevich2013-04-118-648/+0
| |\ \ \ \ \
| | * | | | | Remove OptionalPermissions demo.Nick Kralevich2013-04-118-648/+0
| | |/ / / /