LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,374 Commits 2 Branches 0 Tags
d7138ba4bf0d0201cceebfd6c5d27585870a7b5f
Commit Graph

1996 Commits

Author SHA1 Message Date
Takeshi Hagikura
3bb3da96ae resolved conflicts for merge of 11e09fc0 to klp-modular-dev 
Extracted the diff for those files between klp-modular-docs and klp-modular-dev in case
https://paste.googleplex.com/5232937083600896

Change-Id: I94950ba66f15b75c1ead60e9f6b38b67e4fa9d6e
 2014-10-24 01:39:19 +00:00
Takeshi Hagikura
11e09fc057 Deletes the wear samples that have been commited in the wrong place. 
Updates the location of wear samples in sdk.atree
Adds SpeedTracker wear sample (https://googleplex-android-review.git.corp.google.com/564608)

Conflicts:
	samples/wearable/AgendaData/Application/build.gradle
	samples/wearable/AgendaData/Application/proguard-rules.txt
	samples/wearable/DataLayer/Application/build.gradle
	samples/wearable/DataLayer/Wearable/src/main/AndroidManifest.xml
	samples/wearable/DelayedConfirmation/Application/build.gradle
	samples/wearable/FindMyPhone/Application/build.gradle
	samples/wearable/FindMyPhone/Application/src/main/AndroidManifest.xml
	samples/wearable/Flashlight/Wearable/proguard-rules.txt
	samples/wearable/Geofencing/Application/build.gradle
	samples/wearable/GridViewPager/Wearable/src/main/java/com/example/android/wearable/gridviewpager/MainActivity.java
	samples/wearable/Quiz/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/build.gradle
	samples/wearable/SynchronizedNotifications/Application/src/main/java/com/example/android/wearable/synchronizednotifications/PhoneActivity.java
	samples/wearable/SynchronizedNotifications/Wearable/build.gradle
	samples/wearable/SynchronizedNotifications/Wearable/src/main/java/com/example/android/wearable/synchronizednotifications/NotificationUpdateService.java

(cherry picked from commit 83642406f8)
Signed-off-by: Trevor Johns <trevorjohns@google.com>

Change-Id: I7107d45d9c54e7d8dc317bd562608d661a8b5284
 2014-10-22 11:20:52 -07:00
Trevor Johns
3992ec5675 Update sdk_repo samples 20 from 1 to 2 
DO NOT MERGE

Change-Id: Ia9d89a28991fc1ac4d81e18fe596bc793e54353c
 2014-10-02 18:36:43 -07:00
anaddaf
543a86c17b Merge "Removing the screenOrientation attribute from the wearable manifest" into klp-modular-dev 2014-09-10 16:26:16 +00:00
anaddaf
34eb5d8c69 Removing the screenOrientation attribute from the wearable manifest 
Bug: 17397357
Change-Id: I81cc3500d25fe22b21ba820d8999a547d8d78097
 2014-09-10 09:20:17 -07:00
anaddaf
ee12f01d6b Updating build.gradle files for play services dependency 
A number of samples were not using the play services from the
repository. In one sample, the incorrect variant
of play services was used on the wearable module.

Bug: 17196108
Change-Id: I5276747a0c7eaf48c542d2540c36819422839d9b
 2014-09-10 09:10:50 -07:00
Raphael Moll
18ec7c4f8a resolved conflicts for merge of 566a4694 to klp-modular-dev 
Change-Id: I04c6c2fdff66e5e82f5f99cc629f9eaa5725ef26
 2014-08-22 11:26:33 -07:00
Raphael Moll
566a46941e am 76c7aa35: Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE. 
* commit '76c7aa353666479df9545a66f3f49eb8ff69a86e':
  Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE.
 2014-08-22 16:53:16 +00:00
Raphael Moll
76c7aa3536 Update sdk_repo samples 19 rev from 5 to 6. DO NOT MERGE. 
Change-Id: I140d043086c8da434a8b6bf16cfb3c3763e2ba89
 2014-08-22 04:28:39 +00:00
anaddaf
d97ecae3db Upating the "date" content of notifications to include seconds 
Including "seconds" in the content of notifications to enables fast
creation/update of notifications; previously, the watch-only ones
could be created once every minute.

Bug: 16898049
Change-Id: Idd7a5b78d4cc948d4c8b3862fd998a91044d6007
 2014-08-15 09:46:44 -07:00
Naoki Ishihara
096d3f7723 am 89230cf8: am 56d2cb15: Adding browsable prebuilt samples for August push 
* commit '89230cf8482c5c67e7fea4f87a1e31ecfc4375f7':
  Adding browsable prebuilt samples for August push
 2014-08-14 22:32:16 +00:00
Naoki Ishihara
89230cf848 am 56d2cb15: Adding browsable prebuilt samples for August push 
* commit '56d2cb15b332fc44ccd755693a644c007e616dc4':
  Adding browsable prebuilt samples for August push
 2014-08-14 22:29:04 +00:00
Naoki Ishihara
897d76c8a5 Adding browsable prebuilt samples for August push 
Change-Id: I7b10e94da639ad0e304abd2507c66265073d2398
 2014-08-14 22:23:08 +00:00
Naoki Ishihara
56d2cb15b3 Adding browsable prebuilt samples for August push 
Change-Id: I7b10e94da639ad0e304abd2507c66265073d2398
 2014-08-14 15:16:04 -07:00
Mark Renouf
35b1a50abd Explicitly call onApplyWindowInsets from a listener 
Fixes layout for round displays, following revert of 41d69c3
(ag/512678 - "Override dispatchApplyWindowInsets in GridViewPager")

Change-Id: Ic1a423b8be3dd7e52f61f109eb9f2cc549a5e311
 2014-08-11 11:13:35 -04:00
Alan Lau
2d0d654104 Change setScrollVertically to protected to make scroll work in subclasses. 
setScrollVertically is called by the animator and if it has no access to the
method in the subclass.  This will allow 3P app to extend the view.

Change-Id: I976355168fe1ed4e1f70b66aaab27ca16214dc05
 2014-07-25 11:03:48 -07:00
Griff Hazen
7003893fce DO NOT MERGE Update version of sdk 20 samples to 2 
To allow for a release of new API 20 samples.

Bug: 16158275

Change-Id: I459af267ec76271df10d93cf99439d40883d3a83
 2014-07-22 15:01:22 -07:00
Tony Wickham
ab63d27944 Added _index.html and screenshots to all samples. 
Bug 15814554

Change-Id: Icdb08c5cc39f97c88674e4177b88b47adce59127
 2014-07-08 19:48:23 -07:00
Andy Wickham
ea56da7073 Use WearableListView in Timer sample app. 
Bug: 15864517
Change-Id: Ia56111457c2d74571e69a5a554d5755bb1c1b220
 2014-07-02 20:45:22 -07:00
Andy Wickham
50532de03f Add AOSP Copyright header to samples. 
Bug: 16039713
Change-Id: I0aead1428c7c6a100214dabb85dbf357e37fcfc8
 2014-07-02 14:23:37 -07:00
Andy Wickham
5fa0a4c90d Make connected watches show as compatible with Wearable samples. 
Bug: 15840402

Change-Id: I805153643b8c307eab9b2c2cf278042b968c16af
 2014-06-30 16:48:26 -07:00
Tony Wickham
8be07748c0 Merge "Timer sample app now uses Set a timer voice command instead of Set alarm." into klp-modular-dev 2014-06-26 18:34:16 +00:00
Tony Wickham
2184712510 Timer sample app now uses Set a timer voice command instead of Set alarm. 
Change-Id: I1904d3b164d06d987eca0568b9c22a2ae36c8563
 2014-06-24 17:40:30 -07:00
Andy Wickham
11b32f0384 Clean up samples (gradle files and Compat stuff in wearable code). 
- Remove -v13 and -v4 dependencies on wearable side
- Verify phone is set to compile on API 19 and wearable on 20
- Replace NotificationCompat in wearable side since it uses API 20
- Move ElizaChat code to Application directory

Bug: 15809453
Change-Id: Ib75e7894505f82e5b4d8591b4dfa91a3de8e0329
 2014-06-23 19:15:26 -07:00
Griff Hazen
96f19c456f Sample showing how to embed a wearable app into a phone 
With a keystore present.

Change-Id: I3693f8c4b7ff09fe2fc3023bfe561b929333b8a4
 2014-06-23 15:36:51 -07:00
Dan Aminzade
9fd71d61f2 Add new SynchronizedNotifications sample. 
This sample demonstrates how to use DataItems to construct linked
phone- and wearable-side notifications.

Change-Id: I6defa7fad671ba2ec0de25c8913abd66d07846a2
 2014-06-23 15:32:56 -07:00
Griff Hazen
6cb66cf80e Switch wearable samples to gradle 0.12. 
And remove unnecessary lint warning skips and noCompress 'apk'

Bug: 15827591
Change-Id: I862fa7188277ac7de0dca22ecf0d9129ca941ee5
 2014-06-23 14:41:03 -07:00
Mark Renouf
2cba0745a4 Adds a GridViewPager sample wearable app 
Change-Id: I014670493bb54bc1a6e3c1ecda716b9ea8d83412
 2014-06-22 21:24:55 -04:00
Griff Hazen
9872c0c7c0 Move all wearable samples to development/samples/wearable 
Update build.gradle to compile them all, and remove
gradle stopships.

Copied from vendor/google_clockwork klp-modular-dev as of:
01930cc85bc1ba974a412db7d3c9d17387702e16

Bug: 15591212
Bug: 15264403

Change-Id: I4d05c35c995e675d92039b1dfb2a33e454285af5
 2014-06-22 00:18:09 -07:00
Griff Hazen
b6bca95390 Add first wearable sample to sdk samples distribution 
Wearable samples sometimes have special gradle setups that nest
one application within another. As such, inclusion in the existing
samples generator may be tricky. Instead, just prepare the sample
for direct inclusion into the sdk distribution.

Create a convenience gradle build to build all wearable samples
at once.

Bug: 15591212
Change-Id: I6e03f7c5cc87909430b927aca4b403ded77917ab
 2014-06-20 16:31:07 -07:00
Raphael Moll
2ed3edb6c9 SDK samples package 20 revision 1 
Change-Id: I11f1bdeb7c1f5755962fd923556d778b8c3fa3cd
 2014-06-14 18:48:30 -07:00
Yigit Boyar
67bdb44d98 DO NOT MERGE Remove deprecated RecyclerView methods 
Change-Id: If9b0aca85221d64dbbb5cda75f985a91de6c67d2
 2014-05-28 01:18:25 +00:00
Chet Haase
3b3ab0e040 Add demo for animating RecyclerView actions 
Change-Id: Ie076db6646cf734706fe2ea8659ee57f3a7742e9
 2014-05-17 15:21:44 +00:00
Chet Haase
abbe7bd1e0 Revert "Add demo for animating RecyclerView actions" 
This reverts commit 828b2aa2f4.

Change-Id: I0f773b5c42530cad924e454dc816ddc372db95f7
 2014-05-15 00:01:07 +00:00
Chet Haase
828b2aa2f4 Add demo for animating RecyclerView actions 
Change-Id: Ieb14cfb627663f507c24205d697347a1da389094
 2014-05-14 14:01:18 -07:00
Tim Kilbourn
d91fd1cb4b DO NOT MERGE Remove banner from manifest. 
The api is hidden in klp-modular-dev.

Change-Id: I78a569c7d876e0716eba9163490331dc5d81f87e
 2014-05-06 14:16:35 -07:00
Yigit Boyar
6001125a83 Merge "Updated recycler view demo with smooth scrolling" into klp-modular-dev 2014-05-02 20:18:32 +00:00
Yigit Boyar
c270d6d8ba Updated recycler view demo with smooth scrolling 
Change-Id: I039d10a0e707e05dd4c5ce37344f4ecc80d00880
 2014-05-02 13:08:21 -07: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
Jerome Poichet
08bb3fb71a Adding search to Leanback demo 
Change-Id: I054b64b7c3752bd6dbfdba2b26248222d7a678bd
 2014-04-14 11:04:15 -07:00
Vince Harron
611cfde5c0 Prefixed minSdkVersion with "android:" 
Set minSdkVersion to 11 to support ActionBar API

Change-Id: Id023af411c6a8b5dc6a94765a9391306ce19a31f
 2014-04-13 12:17:28 -07:00
Ricardo Cervera
5f9077b359 am 2dba5be6: am d5ec144b: Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 
* commit '2dba5be6d9c0e0542d65f9687245d092e0158843':
  docs: Updated samples descriptions for Apr samples push.
 2014-04-12 00:26:28 +00:00
Ricardo Cervera
d5ec144b8c Merge "docs: Updated samples descriptions for Apr samples push." into klp-docs 2014-04-12 00:21:07 +00:00
Alexander Lucas
ad5f0e867b am eb72a600: am 4a25165a: Merge "Updated Samples metadata for April push of samples" into klp-docs 
* commit 'eb72a6002c8ebdeeb94e432dadc828d7d158cbf2':
  Updated Samples metadata for April push of samples
 2014-04-11 20:29:54 +00:00
Alexander Lucas
4a25165ae0 Merge "Updated Samples metadata for April push of samples" into klp-docs 2014-04-11 20:23:32 +00:00
Alexander Lucas
c7ad654960 Updated Samples metadata for April push of samples 
Change-Id: Ie4136c1cb9051bead3c73a93ccf646577d721a50
 2014-04-11 13:21:11 -07:00
Ricardo Cervera
24dfd97b7f docs: Updated samples descriptions for Apr samples push. 
Change-Id: I0b487789735a1251e5cc3d9b9e9e38376771c5c7
 2014-04-11 09:55:40 -07:00
Alexander Lucas
e6dcd2f593 am 4bf9ebc7: am fb5e574e: Updated browseable samples for april push 
* commit '4bf9ebc7b6a589c8e1370b21a25ed5b7deb37d02':
  Updated browseable samples for april push
 2014-04-11 16:08:43 +00:00
Alexander Lucas
fb5e574e79 Updated browseable samples for april push 
Change-Id: Idd8cc6b7c43ab93f05f0a5d69d5379631721d185
 2014-04-10 15:44:01 -07:00
Tim Kilbourn
e0cd23d9d8 Use ImageCardview in leanback samples. 
Change-Id: I14606ff001cfd4ce244f32a8f1c973847ac1d0e3
 2014-04-09 00:45:00 -07:00