Commit Graph

3209 Commits

Author SHA1 Message Date
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
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
Dake Gu
2f1ccf605a SupportLeanbackShowcase: add Android.mk
am: de41d1a459

* commit 'de41d1a459358347e3dff90aa1317713c7bc4f86':
  SupportLeanbackShowcase: add Android.mk

Change-Id: I246eea715d3807649d05e48eeac322ccc9a44cc1
2016-05-10 17:44:05 +00:00
Dake Gu
de41d1a459 SupportLeanbackShowcase: add Android.mk
Workaround two problems:

Bug 28138876: gradle build resource id crash after the AAPT2 change
in support library.

Bug 28672886: N preview emulator is too slow, built with prebuilt
to install on 23 emulator.

Change-Id: I810ab659af030d49ee503f4b28ad4bf7a34c4097
2016-05-10 02:42:08 -07:00
Keyvan Amiri
54905cd10c Showcase app: Added media row actions to the music fragment
am: f797f525ce

* commit 'f797f525ce3b5ce0338a18e64ece25e7bd5d8b1f':
  Showcase app: Added media row actions to the music fragment

Change-Id: I87190e81c31c65291e24b74af12d6b9195f85210
2016-05-10 05:20:46 +00:00
Keyvan Amiri
f797f525ce Showcase app: Added media row actions to the music fragment
With the latest support for custom actions from leanback support, showcase
app now demos Playlist and Favorite action buttons for each media item
row. Upon favoriting a song, the media row is highlighted with a
different color. Also, clicking on song details will start playing that
song.

Change-Id: I59111563bebea3b0bf28e12d74f71421dc971f88
2016-05-09 16:32:03 -07:00
Makoto Onuki
28dde7fe5f Fix the tab focus when view pager current page changes.
Bug 27548047

Change-Id: I3ed4202b0077b965d3dafec2d969d3ddf7d5737c
2016-05-09 15:24:13 -07:00
susnata
9c3a7bdc5f Merge "Renaming title for couple rows in CardExampleFragment." into nyc-dev
am: ce9efcc800

* commit 'ce9efcc80001147f577a3476e8a3ae2907136bd3':
  Renaming title for couple rows in CardExampleFragment.

Change-Id: I5ef4126621a3cc08963cb4cddc879945a02d0098
2016-05-06 22:32:35 +00:00
Susnata Basak
ce9efcc800 Merge "Renaming title for couple rows in CardExampleFragment." into nyc-dev 2016-05-06 22:23:54 +00:00
susnata
e035b113c3 Renaming title for couple rows in CardExampleFragment.
Change-Id: I8abaf2b54e87c1dca0a90dfbbecc89d680494f64
2016-05-06 14:28:38 -07:00
susnata
e1762661c2 Merge "Switching launcher icon for page fragment." into nyc-dev
am: fc9a4b3f53

* commit 'fc9a4b3f53224686289feec624561da6ded0fce1':
  Switching launcher icon for page fragment.

Change-Id: I4c64a6adde1eaaeec858ccbd3876e1570f651562
2016-05-06 21:28:14 +00:00
Susnata Basak
fc9a4b3f53 Merge "Switching launcher icon for page fragment." into nyc-dev 2016-05-06 21:19:26 +00:00
Dianne Hackborn
bad61ac301 Merge "Fix issue #28051399: API demos crashing on Remote service binding options" into nyc-dev
am: 14e56c1aa6

* commit '14e56c1aa6ca7555ccd996a73845a0b41abc791d':
  Fix issue #28051399: API demos crashing on Remote service binding options

Change-Id: I7f7dea00b52ddfc7b8fd9860d75713b7910ccbfa
2016-05-06 17:20:30 +00:00
Dianne Hackborn
14e56c1aa6 Merge "Fix issue #28051399: API demos crashing on Remote service binding options" into nyc-dev 2016-05-06 17:08:07 +00:00
Chulwoo Lee
4441640286 Merge "Change contents animations" into nyc-dev
am: 2bb3dd8632

* commit '2bb3dd863284acfb335debb98d1b8f7e8a58a376':
  Change contents animations

Change-Id: If88541bcfb0806dbbbefeb4a2d045529dbf6ec87
2016-05-06 02:15:04 +00:00
Chulwoo Lee
2bb3dd8632 Merge "Change contents animations" into nyc-dev 2016-05-06 02:07:45 +00:00
Dake Gu
4635918491 Merge "SupportLeanbackDemo: support delay loading page fragment data" into nyc-dev
am: 0c91f79b5a

* commit '0c91f79b5ae87fe635e3f10e33a30970a8b468d5':
  SupportLeanbackDemo: support delay loading page fragment data

Change-Id: Ib43a0cf93704b7135dc778a93ddbd129978b338f
2016-05-06 02:05:46 +00:00