Commit Graph

3262 Commits

Author SHA1 Message Date
Trevor Johns
2d4385d054 Syncing latest sample prebuilts for mnc-dev. am: 697d71f7cc am: dbd82b9b22
am: d3f580780b

Change-Id: I04f552f971bf45e416b81b970c1b4443fa46de3c
2016-09-29 05:38:06 +00:00
Trevor Johns
d3f580780b Syncing latest sample prebuilts for mnc-dev. am: 697d71f7cc
am: dbd82b9b22

Change-Id: I2ace1b9340ed24f714da0eec682207d0101b55f1
2016-09-29 05:34:07 +00:00
Trevor Johns
697d71f7cc Syncing latest sample prebuilts for mnc-dev.
developers/build: 3c56004c2e943b3a87d99958c18950de0f89f3a7
developers/samples/android: d72f3df26721c64aa403e3b6d400cf8b99260dd1

Change-Id: Ice543fd11f2956aacfa3301bf9bdb4b1f49e9c4d
2016-09-29 05:17:16 +00:00
Trevor Johns
c21b5a0ab8 docs: Add AccelerometerPlay sample to prebuilts am: ef51b0db8e am: 2fbc4b7d6a
am: 947579e66d

Change-Id: I1248cfebf34f2d3865f159046e094fe20e7b26f4
2016-08-28 11:13:11 +00:00
Trevor Johns
947579e66d docs: Add AccelerometerPlay sample to prebuilts am: ef51b0db8e
am: 2fbc4b7d6a

Change-Id: Ie5691a6e495b4df968ae35847e976d44772a60f1
2016-08-28 11:10:08 +00:00
Trevor Johns
ef51b0db8e docs: Add AccelerometerPlay sample to prebuilts
Change-Id: I8e4146cd00df889e60aa9f03f9a79231b02dfdd5
2016-08-28 10:58:43 +00:00
Makoto Onuki
8d2a8f05c7 Update shortcut sample
Use favicon as a shortcut icon, if available.

Change-Id: Ic2393e2de6ce9eb39b5d25d0dafd9686416cdfe7
2016-08-18 11:11:09 -07:00
Trevor Johns
6ecd38debd docs: Update prebuilts for nyc-dev samples am: a374bcd44d
am: d77e9cdd0e

Change-Id: I4da63018cc412c4f513ed3ce33a5ef2f42b6c054
2016-08-12 19:20:14 +00:00
Trevor Johns
a374bcd44d docs: Update prebuilts for nyc-dev samples
Synced to commits:
- //developers/samples/android
  fc1c2eac13aa87531f030f8c65d7e27c301135af
- //developers/build
  18730e97939c9545a26e52d135a99045c86abeaf

Change-Id: I88952b8f86921739af9fed6b87d39a72af835748
2016-08-11 22:59:11 +00:00
TreeHugger Robot
6d48ba4dd4 Merge "Shortcut launcher demo:" into nyc-mr1-dev 2016-08-02 20:37:11 +00:00
Makoto Onuki
5671322243 Shortcut launcher demo:
- Listen to work profile broadcasts and refresh the screen.
- Fix the bug about mixing up user 0 and user 10.
- Add a "user has any shortcuts or not" test to detect
user unlock races.

Change-Id: I4c5ae34317b669dd8fcda466a960074b22e88d5a
2016-08-02 10:26:51 -07:00
Dianne Hackborn
9302998b13 Add API demo for running multiple foreground services.
Change-Id: I44435f6e7750ccbbadf5e293dd10069c6cef94a4
2016-08-01 17:52:18 -07:00
TreeHugger Robot
644dd1aa45 Merge "Fix demo launcher" into nyc-mr1-dev 2016-07-29 20:24:41 +00:00
Makoto Onuki
74d5f56ed8 Fix demo launcher
- pinShortcuts() needs to be passed all pinned shortcut IDs from the target app,
but originally it was passing those from the target *activity*.

- Also LauncherApps throws IllegalStateException when work profile is off.
Catch runtime exceptions and show a message.

Change-Id: I5a97c808ed7d9aff17bd11aa4ed28ee0efc330f0
2016-07-29 10:54:12 -07:00
Makoto Onuki
038f4f7882 Update sample app icons
Bug 30259354

Change-Id: I8fd049e821540c0253e055c967824222d3e0e3a4
2016-07-27 16:32:33 -07:00
Makoto Onuki
8e1f716acc ShortcutManager sample application.
This is slightly more practical than ShortuctDemo.

This app allows the user to publish shortcuts to websites.

Bug 30259354

Change-Id: I0e7358aadf016c75c4926595abbe6ce117d69c2d
2016-07-22 15:27:47 -07:00
Makoto Onuki
767491535c ShortcutDemo: Add Japanese translation
Change-Id: Ic80e69bd62bc53742e13946a2a9c3a8d72ad1e8a
2016-07-13 13:46:40 -07:00
Makoto Onuki
0f3323555c Merge "ShortcutDemo: Add 2nd main activity with manifest shortcuts" into nyc-mr1-dev 2016-07-11 18:36:12 +00:00
Alan Viverette
7999e48357 Remove Support*Demos directories and update sdk.atree
The nyc-support-24.1-dev branch has been successfully moved
ahead of the nyc-mr1-dev branch, so we'll need this to fix
the build.

This reverts commit 52e76badf8.

Change-Id: Ib3d6cf5b52f6632854468983d0c2065b1c7e7d8b
2016-07-01 20:20:11 +00:00
Alan Viverette
52e76badf8 Revert "Remove Support*Demos directories and update sdk.atree" to fix build
Dependency has not landed in frameworks/support yet.

This reverts commit e84ef3afe8.

Change-Id: I699934121e00b785838e85984d3434ab76609783
2016-07-01 14:44:51 +00:00
John Reck
e84ef3afe8 Remove Support*Demos directories and update sdk.atree
These have been migrated to the frameworks/support project.

Cherry-Pick of 6f266e9557

Change-Id: Ice5f95b983bc6e1719cf84f4f564f3fe16af7c95
2016-06-28 12:34:36 -07:00
Makoto Onuki
4aa351c0ec ShortcutDemo: Add 2nd main activity with manifest shortcuts
To test b/29601844

Bug 29601844

Change-Id: I034947f62d5d1ece90f0c5fd0b7b26f48bea809e
2016-06-23 14:40:52 -07:00
Makoto Onuki
1cf985bff6 Shortcut Demo: Address API changes
Bug 29515722
Bug 29516909
Bug 29515090

Change-Id: I7214d1d75acb7550cb8181d076d0b7b938a04488
2016-06-21 11:37:35 -07:00
Makoto Onuki
7621142253 Shortcut Demo: Switch to new XML schema
Bug 29390156

Change-Id: I2311012f5c48ce7d150d4045c602489f95da78f9
2016-06-17 11:50:36 -07:00
Makoto Onuki
bb325c7686 Merge "Shortcut demo: Add a notification with remote input" into nyc-mr1-dev 2016-06-16 17:06:09 +00:00
Trevor Johns
323e8dda5f samples: Sync prebuilts for nyc-dev
am: 5a6b719823

Change-Id: Id94ed42d31c5ac8821bfd6c151cef82e93ac1040
2016-06-15 20:19:30 +00:00
Trevor Johns
5a6b719823 samples: Sync prebuilts for nyc-dev
developers/samples/android: f9872ded3bb6cd3c01ab0881a58764f5171b4c64
developers/build: 23e77f8a040c0b35531a68e776363f32fa7feeeb

Change-Id: I93e7c66e0cff22d3852d36a1a1257bb10eec3ba0
2016-06-15 11:19:33 -07:00
Trevor Johns
7471d91d62 Update prebuilts for mnc-docs am: 7e9f0673a1 am: a466e36fd7 am: 2997b7d8e9
am: 17be9b742a

Change-Id: Ibc93f999bae7da1df909cb9c1a1eb90d182882da
2016-06-15 01:43:12 +00:00
Trevor Johns
17be9b742a Update prebuilts for mnc-docs am: 7e9f0673a1 am: a466e36fd7
am: 2997b7d8e9

Change-Id: I7a96dccf26b3239c9086e38acc7c962e7d1f6cf4
2016-06-15 01:40:30 +00:00
Trevor Johns
2997b7d8e9 Update prebuilts for mnc-docs am: 7e9f0673a1
am: a466e36fd7

Change-Id: If3c83372af2090dfb93574d33d14ddace6228447
2016-06-15 01:38:01 +00:00
Trevor Johns
7e9f0673a1 Update prebuilts for mnc-docs
developers/build: fb039d88ed8e9183cae9ce510bf9c907d23ecc50
developers/samples/android: 7c3c09dcf092593adb8c13f8e15260f4da0a799a

Note: This was previously committed on May 18 2016, but wasn't
automerged. Replaying commit to bring browseable back into sync
downstream.

(cherry picked from commit 8e7e496ae9)
Bug: 29127946
Change-Id: I6275f830532c3c6ce006756aecc3c2ae7e06873d
2016-06-14 18:20:56 -07:00
Trevor Johns
02802b0ab5 resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea am: 426672be67 am: b5dfaab473
am: ab5389446c

Change-Id: Ic5320a5af82191c452554fa8329b756e89dbc4e3
2016-06-15 00:51:00 +00:00
Trevor Johns
ab5389446c resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea am: 426672be67
am: b5dfaab473

Change-Id: Ife6b59d2c9c3ff193afe1b0bb1a51e216eee5eb6
2016-06-15 00:48:31 +00:00
Trevor Johns
b5dfaab473 resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea
am: 426672be67

Change-Id: Ica8ebcf1220536470d53313b003840dee84e611e
2016-06-15 00:43:15 +00:00
Trevor Johns
1842261dea resolve merge conflicts of 08f72b4 to mnc-mr-docs
Change-Id: Ibdd172d148d5983b6578adf7cb0e6335748ca654
2016-06-14 17:21:35 -07:00
Trevor Johns
08f72b4693 docs: Update samples prebuilts for mnc-docs
Change-Id: I7175f178f95d76d9056d8e87b5a96700e3c9309c
2016-06-14 16:42:16 -07:00
Makoto Onuki
46f140b555 Shortcut demo: Add a notification with remote input
To test b/28705275.

Bug 28705275

Change-Id: I47893ce935e5afb20ac9038c0a1becb309f23198
2016-06-14 14:10:52 -07:00
Sergio Giro
cda4e1baac Merge \"KeyDerivationFunction: example about treating data encrypted via SHA1PRNG\" into nyc-dev
am: 11716729a7

Change-Id: I16ee07b32f7ccca8470fc938ad2b2f6442e7bcfe
2016-06-08 14:44:37 +00:00
Sergio Giro
11716729a7 Merge "KeyDerivationFunction: example about treating data encrypted via SHA1PRNG" into nyc-dev 2016-06-08 14:31:38 +00:00
Sergio Giro
952349c6b9 KeyDerivationFunction: example about treating data encrypted via SHA1PRNG
The Crypto provider providing the SHA1PRNG algorithm for random number
generation was deprecated.

This algorithm was sometimes incorrectly used to derive keys.

This example provides a helper class and shows how to treat data that
was encrypted in the incorrect way and re-encrypt it in a proper way.

(cherry picked from commit 477c90ca1a)

Bug: 27873296
Change-Id: I180d76c4aa7fb9aa8c332119bf094e050a63b58c
2016-06-08 14:56:37 +01:00
Andrii Kulian
753b1b92a7 Fix new task starting in samples
am: e5d940bda0

* commit 'e5d940bda03932c9218281c66c606dc94734b9be':
  Fix new task starting in samples

Change-Id: I0fa121818fed34895de7a4c97a6ced5e095c961d
2016-06-03 02:06:23 +00:00
Andrii Kulian
e5d940bda0 Fix new task starting in samples
Added correct intent action and category. Added separate case to
show the behavior with and without FLAG_ACTIVITY_MULTIPLE_TASK.

Bug: 28848683
Change-Id: I4ba3908b7331e6d4c5f2d78c0a861e00487fcae4
2016-06-02 11:56:37 -07:00
Makoto Onuki
ec1232bdbb Merge "ShortcutDemo: Address API rename" into nyc-mr1-dev 2016-06-01 22:44:11 +00:00
Dianne Hackborn
66c8ee24d5 Merge "Fix issue #29058724: Improve JobScheduler API demo" into nyc-dev
am: e3d3154c1a

* commit 'e3d3154c1ad7cfd2543bb839623646b942714908':
  Fix issue #29058724: Improve JobScheduler API demo

Change-Id: I1d0eca577f6aaa81f456737e432eae6c38b0b196
2016-06-01 19:37:49 +00:00
Makoto Onuki
b8dc9f912b ShortcutDemo: Address API rename
Bug 29057378

Change-Id: Iddcdb0d0418e19661cbadb4a6ff8788e8d2dfb0c
2016-06-01 10:09:41 -07:00
Dianne Hackborn
1f502540b7 Fix issue #29058724: Improve JobScheduler API demo
Change-Id: I551d4d3376e522ee2d790331e8f83711450c9d19
2016-05-31 18:03:28 -07:00
Makoto Onuki
f3ee57a5e1 Shortcut demo: Use the new get shortcut drawable API
Bug 28594168

Change-Id: I0efe5a2f129edec43524316022fed435d815f341
2016-05-27 10:46:10 -07:00
Makoto Onuki
793950a273 Merge "ShortcutManager demo: Manifest shortcuts + API renames" into nyc-mr1-dev 2016-05-27 17:21:53 +00:00
Michael Wright
b11ac33af7 Merge "DO NOT MERGE Remove Pointer Capture API." into nyc-dev
am: d48a67a190

* commit 'd48a67a190f785b5f5d1b41a5a8823592730deb7':
  DO NOT MERGE Remove Pointer Capture API.

Change-Id: Ibb2d8315d3d2bf2eeee1f4ea7a54e6aac022cb8e
2016-05-26 14:25:57 +00:00
Michael Wright
d48a67a190 Merge "DO NOT MERGE Remove Pointer Capture API." into nyc-dev 2016-05-26 13:40:24 +00:00