LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,957 Commits 2 Branches 0 Tags
cda4e1baac4e944ab91dedfeab87007543fd0c5a
Commit Graph

3224 Commits

Author SHA1 Message Date
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
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

* commit '13ab0f50b145baf3605cfd50fd93fddc1d0b25db':
  Improve MultiWindow sample

Change-Id: Ie762ec28b81051a9549f2034f0ff39506656da17
 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

* commit 'e575990583183fc804e1ff41e91dea8c7dd5decc':
  DO NOT MERGE Rename PointerIcon and Pointer Capture APIs

Change-Id: Ib7f4001f3f78af9036e7ceba9f7e49a094b32772
 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
Yohei Yukawa
e475c27e49 Merge "Follow class package change: LocaleList" into nyc-dev 
am: c80ac6dc90

* commit 'c80ac6dc90722a139457ff68ca687ba6acde8a2b':
  Follow class package change: LocaleList

Change-Id: I0ea61b4b5e518dba6beda8ae43dee578d8d15380
 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

* commit '43d246dfa202e01051f942995ed81c1d6128569e':
  DO NOT MERGE Hide decor caption APIs

Change-Id: I7dd78c3f5466c2e776ae152936b0cbf86173c669
 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

* commit '3a1d9d5f06913525e5dc157abb9bc1cdb6a81315':
  Showcase app: added a video playing at the end of GuidedStepFragment workflow
  Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L.

Change-Id: I2335daa33dde0f4d21616f2aea4525563da1c302
 2016-05-13 17:47:01 +00:00
Dake Gu
c428170e91 Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev 
am: 097514b34c

* commit '097514b34cd5e4c22df302cadef34d95159f869e':
  SupportLeanbackshowcase: clean up preference fragment code

Change-Id: Ie67a31332642a4ba9c80dd3b83e923c9d215d6c4
 2016-05-13 17:47:01 +00:00
Dake Gu
3a1d9d5f06 Merge changes Ife2ffbed,I3bd8b266 into nyc-dev 
* changes:
  Showcase app: added a video playing at the end of GuidedStepFragment workflow
  Showcase app: Fixed video fragment not showing video. Updated Settings and deprecated APIs for the app to be installable on L.
 2016-05-13 17:42:06 +00:00
Dake Gu
097514b34c Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev 2016-05-13 17:41:41 +00:00
susnata
147f009526 Merge "Added missing licensing information in source files." into nyc-dev 
am: b94abc7c9c

* commit 'b94abc7c9c0e558a189e6beb85e68ddb9419bd44':
  Added missing licensing information in source files.

Change-Id: Ic0b5c2214eb3dc44979e4fcb2d70788fc0dc6764
 2016-05-13 16:52:18 +00:00
Susnata Basak
b94abc7c9c Merge "Added missing licensing information in source files." into nyc-dev 2016-05-13 16:47:30 +00:00
Yuichi Araki
06b7ca35c3 Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev 
am: 514e08249a

* commit '514e08249aec11859633a748539235bbe42b576d':
  Add usage of app:behavior_skipCollapsed

Change-Id: Ic9bdb582065694aeefd0642b2428f21cd54a281b
 2016-05-13 01:53:17 +00:00
Yuichi Araki
514e08249a Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev 2016-05-13 01:48:42 +00:00
Makoto Onuki
f3f9a3b553 ShortcutDemo: changes for DR API update. 
Bug 28536066

Change-Id: I1c23bd57aba42e761ed31f8c9584d61c6900aa70
 2016-05-12 16:46:02 -07:00
Keyvan Amiri
13ceed33b4 Showcase app: added a video playing at the end of GuidedStepFragment 
workflow

Now, after the user clicks on 'Watch Now', the sample video from the
"Video Consumption Examples" fragment will start playing, and on
back-press, they will be forwarded back to the Showcase app home screen.

Change-Id: Ife2ffbed1ed00a52df0a9cff4ab41a5868adee3d
 2016-05-12 15:42:54 -07:00
Keyvan Amiri
64e78adc19 Showcase app: Fixed video fragment not showing video. Updated Settings 
and deprecated APIs for the app to be installable on L.

Video player was not being prepared for asynchronous playing after the
media source was set. Used the same preparation module for both the
Music and Video players.
Also, updated Settings to include a switch widget. Depredatecd some of
the APIs to level 1 to be able to install app on L.

Change-Id: I3bd8b266be028e80d87367a2c3c8a8174e924b92
 2016-05-12 15:15:18 -07:00
susnata
5e291a4981 Added missing licensing information in source files. 
Change-Id: I0065ff1eebae17f2aaf4be252e61a0dc379cbe93
 2016-05-12 14:28:06 -07:00
Adrian Roos
201cda71a6 Merge "Update Sample Device Admin" into nyc-dev 
am: ddb8d18cc8

* commit 'ddb8d18cc83510aa48843ed7ccc54b1926ff2486':
  Update Sample Device Admin

Change-Id: I85ccbb2c94ee364164502682085dca805de37490
 2016-05-12 20:58:16 +00:00
Adrian Roos
ddb8d18cc8 Merge "Update Sample Device Admin" into nyc-dev 2016-05-12 20:52:25 +00:00
Dake Gu
322844393e SupportLeanbackshowcase: update songs and metadata 
am: 15f4055a2e

* commit '15f4055a2eb5364db40bf57fea22ac5da8e28204':
  SupportLeanbackshowcase: update songs and metadata

Change-Id: I7f078f174c9e29c9210c17c187d57e53e8af09ca
 2016-05-12 20:31:34 +00:00
Dake Gu
15f4055a2e SupportLeanbackshowcase: update songs and metadata 
Change-Id: Ic57ba25f9ced69d3cbba3d31f3c6a701af141367
 2016-05-12 12:07:39 -07:00
Dake Gu
2672623e1d SupportLeanbackshowcase: clean up preference fragment code 
Remove the dialog code and the problematic stack.
Make fragment public static.

Change-Id: I3ebda40e6778d206d494429797d7cd6f15c580f4
 2016-05-12 11:25:26 -07:00
Makoto Onuki
1b474f6c66 Remove ShortcutManager samples from nyc-dev 
Bug 28704708

Change-Id: Ie54cd5675dc81fcbf96df3da50ade3b497ee2609
 2016-05-11 13:38:45 -07:00
Adrian Roos
1052d438de Update Sample Device Admin 
Adds options to exercise the newly added KEYGUARD_DISABLE_REMOTE_INPUT
and not so newly added KEYGUARD_DISABLE_FINGERPRINT.

Change-Id: I0e2a05f2a668b7d8ceacde3abcf5f8c80cb4bdb9
Fixes: 26981262
 2016-05-11 15:51:11 -04:00
Yuichi Araki
64b53700b7 Add usage of app:behavior_skipCollapsed 
Change-Id: I693d53265da8c7ff2a7a3815e74f4cfcf5a23e3b
 2016-05-11 10:20:32 +09:00
Makoto Onuki
a6065437c3 Merge "Fix the tab focus when view pager current page changes." into nyc-mr1-dev 2016-05-10 20:42:42 +00:00
Dake Gu
dcba115971 SupportLeanbackShowcase: bring gradle, build tools, lib up to date 
am: 15f5a3351f

* commit '15f5a3351ff79b37d0f899e3ae9ac1b535306fe3':
  SupportLeanbackShowcase: bring gradle, build tools, lib up to date

Change-Id: I9922a3a645cdce7908ce342761d2ac997ddb8720
 2016-05-10 19:01:14 +00:00
Dake Gu
15f5a3351f SupportLeanbackShowcase: bring gradle, build tools, lib up to date 
Change-Id: I829aba8ca84065efda5aa37976067010c6adc1cb
 2016-05-10 11:04:32 -07:00