LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,016 Commits 2 Branches 0 Tags
38b51a31c8c4b1fb2a42608f6abbe72f907ab13a
Commit Graph

3534 Commits

Author SHA1 Message Date
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
aa8c25a84a 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 23:40:56 -07:00
Andrii Kulian
378ffa62e9 Merge "Improve MultiWindow sample" into nyc-dev am: 13ab0f50b1 
am: 453d2d5af5

* commit '453d2d5af5a4e82910fd3ed17bf83ffbac240985':
  Improve MultiWindow sample

Change-Id: I23d2693ed12c7f495920af0da2478e21ac138b46
 2016-05-19 17:59:10 +00: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
453d2d5af5 Merge "Improve MultiWindow sample" into nyc-dev 
am: 13ab0f50b1

* commit '13ab0f50b145baf3605cfd50fd93fddc1d0b25db':
  Improve MultiWindow sample

Change-Id: I7388bdeae7112b86a0c0018165eff50e0bac97c2
 2016-05-19 17:28:04 +00:00
Andrii Kulian
13ab0f50b1 Merge "Improve MultiWindow sample" into nyc-dev 2016-05-19 17:13:21 +00:00
Michael Wright
8225b077bc Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev am: e575990583 
am: a2f5caf77e

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

Change-Id: I8af61a1f7d20e4851182f990f982470ac4d25032
 2016-05-19 15:23:07 +00:00
Michael Wright
a2f5caf77e 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: Ida8e72342627123b0be5976236b5a2e0ca60db13
 2016-05-19 15:11:56 +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
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
ca079b79bb Merge "Follow class package change: LocaleList" into nyc-dev am: c80ac6dc90 am: 8c7fcef8b1 
am: 9f7cb9eb20

* commit '9f7cb9eb208a7bdc9f7f43b7c43d2fda937c570d':
  Follow class package change: LocaleList

Change-Id: If5dd9de4e4a98986384eac9b185680cdd0705ab4
 2016-05-18 02:32:43 +00:00
Yohei Yukawa
9f7cb9eb20 Merge "Follow class package change: LocaleList" into nyc-dev am: c80ac6dc90 
am: 8c7fcef8b1

* commit '8c7fcef8b15d557123d66e4fdfd4a3d0eea71c31':
  Follow class package change: LocaleList

Change-Id: I0ac27e3a512b8b8f3c515a4231a95c6b4e9f67b3
 2016-05-18 02:30:00 +00: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
8c7fcef8b1 Merge "Follow class package change: LocaleList" into nyc-dev 
am: c80ac6dc90

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

Change-Id: Id823d52d6dec9456e6c16e621a4a0f8eff90f68f
 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
edec1897e2 DO NOT MERGE Hide decor caption APIs am: 43d246dfa2 
am: 5d087cbdef

* commit '5d087cbdef4e0069225ad19ee97443e4ab54ea19':
  DO NOT MERGE Hide decor caption APIs

Change-Id: Ib4ce2a12e0eebcf1dcb6518efd5a333d4228d7f8
 2016-05-18 01:02:46 +00:00
Andrii Kulian
5d087cbdef DO NOT MERGE Hide decor caption APIs 
am: 43d246dfa2

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

Change-Id: Ie5552afd5c7f9f8357e4a7e9c5de3c7feda539b7
 2016-05-18 01:00:07 +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
9626804be1 Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev am: b6fc18aa28 
am: d7ddad5dc7

* commit 'd7ddad5dc7f529d64b35188bfc4a32c0e3f3d42e':
  ShortcutDemo: changes for DR API update.

Change-Id: I8942e31415b6700f7301f65f43f43a22a0cca10d
 2016-05-17 18:27:06 +00:00
Makoto Onuki
d7ddad5dc7 Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev 
am: b6fc18aa28

* commit 'b6fc18aa28e087806b3f83bb770d0f8eac37ff72':
  ShortcutDemo: changes for DR API update.

Change-Id: Iddc9c0a315acf7220d90f80f77aa22b944e2ae48
 2016-05-17 18:18:20 +00:00
Makoto Onuki
b6fc18aa28 Merge "ShortcutDemo: changes for DR API update." into nyc-mr1-dev 2016-05-17 18:01:30 +00:00
Dake Gu
f7aeafbaf0 Merge "Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 am: 6489b522dc" into nyc-mr1-dev-plus-aosp 
am: daba65a3b6

* commit 'daba65a3b6c0b01bf5cda444f782120ac3ebd168':
  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: I2b5535edc717dc2424e38fef09004b08b135fd8b
 2016-05-13 17:52:16 +00:00
Dake Gu
e0697dbc01 Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev am: 097514b34c am: 0ba81b53e9 
am: 5913fe0f4a

* commit '5913fe0f4aa3ced92575240f78efd105e50f2eab':
  SupportLeanbackshowcase: clean up preference fragment code

Change-Id: I956508e09f8c6a9cb7ef677a58365b565c5785a2
 2016-05-13 17:52:15 +00:00
Dake Gu
079b5f0596 Merge changes Ife2ffbed,I3bd8b266 into nyc-dev am: 3a1d9d5f06 
am: 6489b522dc

* commit '6489b522dc8e6cd4fe23e627cd903e7bde79d2dc':
  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: I605acb4bef521d6b257acc1da736e38bd606acf6
 2016-05-13 17:49:41 +00:00
Dake Gu
5913fe0f4a Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev am: 097514b34c 
am: 0ba81b53e9

* commit '0ba81b53e910e3e5c9f9ed86ae41870baf426ebc':
  SupportLeanbackshowcase: clean up preference fragment code

Change-Id: I5edc1876f5ad17f06b76da0ce1450f73592202f5
 2016-05-13 17:49:40 +00:00
Keyvan Amiri
6489b522dc 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: I884c565e8786d1aa8848a21b8f12bea056e4ea3f
 2016-05-13 17:47:02 +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
0ba81b53e9 Merge "SupportLeanbackshowcase: clean up preference fragment code" into nyc-dev 
am: 097514b34c

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

Change-Id: I187cfcfea3fa5cad77cc50b22f7babea9e34f409
 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
4662bee4d3 Merge "Added missing licensing information in source files." into nyc-dev am: b94abc7c9c am: a8cfb79f18 
am: 8727d39d17

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

Change-Id: Ib41426fb54b6ae2776406a1188d4440e627822b5
 2016-05-13 16:57:25 +00:00
Susnata Basak
8727d39d17 Merge "Added missing licensing information in source files." into nyc-dev am: b94abc7c9c 
am: a8cfb79f18

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

Change-Id: Ia183dae224e31a3df01d48663857c7c8d6ef79c4
 2016-05-13 16:54:52 +00:00
susnata
a8cfb79f18 Merge "Added missing licensing information in source files." into nyc-dev 
am: b94abc7c9c

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

Change-Id: If862f65104e15936d58291e385a43c7859c1389a
 2016-05-13 16:52:19 +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
76a7368096 Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev am: 514e08249a am: 889b610439 
am: c718a7d90e

* commit 'c718a7d90e937eafc0242927ef537a4e5b66122a':
  Add usage of app:behavior_skipCollapsed

Change-Id: Ic8a6e5371d20c7963f85e432adec7d0e89b6fceb
 2016-05-13 01:58:25 +00:00
Yuichi Araki
c718a7d90e Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev am: 514e08249a 
am: 889b610439

* commit '889b6104398905ba0363a957235c6f0b1771a9c7':
  Add usage of app:behavior_skipCollapsed

Change-Id: I234966215ff87bd3a15290fe39bba66d22e16322
 2016-05-13 01:55:51 +00:00
Yuichi Araki
889b610439 Merge "Add usage of app:behavior_skipCollapsed" into nyc-dev 
am: 514e08249a

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

Change-Id: Ia38b3a7f2f70db5607f5fbe576d86a362e9f8f6c
 2016-05-13 01:53:18 +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