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
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
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
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
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
2016-06-15 01:43:12 +00:00
Trevor Johns
17be9b742a
Update prebuilts for mnc-docs am: 7e9f0673a1 am: a466e36fd7
...
am: 2997b7d8e9
2016-06-15 01:40:30 +00:00
Trevor Johns
2997b7d8e9
Update prebuilts for mnc-docs am: 7e9f0673a1
...
am: a466e36fd7
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
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
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
2016-06-15 00:48:31 +00:00
Trevor Johns
b5dfaab473
resolve merge conflicts of 08f72b4 to mnc-mr-docs am: 1842261dea
...
am: 426672be67
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
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
2016-06-08 14:56:37 +01:00
Andrii Kulian
753b1b92a7
Fix new task starting in samples
...
am: e5d940bda0
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#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
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
Makoto Onuki
a02d7acf66
ShortcutManager demo: Manifest shortcuts + API renames
...
Bug 28785283
Bug 28536066
Change-Id: I5b12715038a30a143f2df7ccc188ea23e88605f9
2016-05-24 17:53:49 -07:00
Andrii Kulian
76895e8aed
Merge "Improve MultiWindow sample" into nyc-dev
...
am: 13ab0f50b1
2016-05-19 17:28:06 +00:00
Andrii Kulian
13ab0f50b1
Merge "Improve MultiWindow sample" into nyc-dev
2016-05-19 17:13:21 +00:00
Michael Wright
ddd647da37
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
...
am: e575990583
2016-05-19 15:11:55 +00:00
TreeHugger Robot
e575990583
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
2016-05-19 15:03:35 +00:00
Andrii Kulian
7d7cc03dbc
Improve MultiWindow sample
...
Now using only one activity able to showcase supported launching options.
Added instance counter for better visibility.
Bug: 28848683
Change-Id: Ib98dad994d39aff1b617dce4371699c846d06f6f
2016-05-19 01:27:08 -07:00
Trevor Johns
8e7e496ae9
Update prebuilts for mnc-docs (DO NOT MERGE ANYWHERE)
...
developers/build: fb039d88ed8e9183cae9ce510bf9c907d23ecc50
developers/samples/android: 7c3c09dcf092593adb8c13f8e15260f4da0a799a
Change-Id: I11ffce54e0f557375c2040682923042e7af5b0ca
2016-05-18 00:47:32 -07:00
Yohei Yukawa
e475c27e49
Merge "Follow class package change: LocaleList" into nyc-dev
...
am: c80ac6dc90
2016-05-18 02:24:48 +00:00
Yohei Yukawa
c80ac6dc90
Merge "Follow class package change: LocaleList" into nyc-dev
2016-05-18 02:14:25 +00:00
Andrii Kulian
d838d5de41
DO NOT MERGE Hide decor caption APIs
...
am: 43d246dfa2
2016-05-18 01:00:06 +00:00
Andrii Kulian
43d246dfa2
DO NOT MERGE Hide decor caption APIs
...
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.
Bug: 28774476
Change-Id: I7b0e32459f18edcb903a1fb9cf80196fddc24d49
2016-05-17 16:17:42 -07:00
Yohei Yukawa
2e3c5bd7cc
Follow class package change: LocaleList
...
In order to avoid layering violation, LocaleList needs to be moved from
android.util package to android.os package [1]. This CL follows up that
package change.
No behavior change is intended.
[1]: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
Bug: 28819696
Change-Id: Ib331cc3a63f7a1e656573f032a1e69eb906f7c14
2016-05-17 15:47:19 -07:00
Michael Wright
10102e4d88
DO NOT MERGE Remove Pointer Capture API.
...
Bug: 26830970
Change-Id: I14d8facef79710eb5397cff83ddde348a39f5c5f
2016-05-17 20:03:29 +01:00
Michael Wright
71620c8898
DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
...
This is a response to API council feedback.
Bug: 26830970
Change-Id: I19d3919dc201fdf2b949074f02490669b4a5d775
2016-05-17 20:03:23 +01:00
Makoto Onuki
b6fc18aa28
Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev
2016-05-17 18:01:30 +00:00
Keyvan Amiri
00f09fa40d
Merge changes Ife2ffbed,I3bd8b266 into nyc-dev
...
am: 3a1d9d5f06
2016-05-13 17:47:01 +00:00
