OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Request re-layout after setText if layout width is 0" into nyc-dev
Siyamed Sinir [Tue, 19 Apr 2016 17:09:52 +0000 (17:09 +0000)]
Merge "Request re-layout after setText if layout width is 0" into nyc-dev
am: d01e6f9

* commit 'd01e6f90832e7b7d55218836aae227452080f9b8':
  Request re-layout after setText if layout width is 0

Change-Id: Ia2ad9975ecbc3ebf2b468f515fcbf82a9bc4bb2d

8 years agoFixed a rebase gone wrong with pageindicator
Selim Cinek [Tue, 19 Apr 2016 17:03:23 +0000 (17:03 +0000)]
Fixed a rebase gone wrong with pageindicator
am: 20e84c7

* commit '20e84c750f7ef783344f9890764906e20b0df822':
  Fixed a rebase gone wrong with pageindicator

Change-Id: I08bfc4b3c0cb3a8159645c7ff6d017daa8db6c9e

8 years agoMerge "Request re-layout after setText if layout width is 0" into nyc-dev
Siyamed Sinir [Tue, 19 Apr 2016 17:00:13 +0000 (17:00 +0000)]
Merge "Request re-layout after setText if layout width is 0" into nyc-dev

8 years agoFixed a rebase gone wrong with pageindicator
Selim Cinek [Tue, 19 Apr 2016 16:47:20 +0000 (09:47 -0700)]
Fixed a rebase gone wrong with pageindicator

The return statement was lost.

Change-Id: Ica403337bf9dce2c0b1c2447a0aa4359f991ac0d
Fixes: 27927374

8 years agoMerge "Use adjusted popup window position when calculating best-fit" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 16:47:16 +0000 (16:47 +0000)]
Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev
am: 0529197

* commit '0529197e9df8837ac63b011937391ff29426e6b5':
  Use adjusted popup window position when calculating best-fit

Change-Id: Ib6688f23f3bf86519fcada8c274c2e2462e8d201

8 years agoMerge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into...
Alan Viverette [Tue, 19 Apr 2016 16:47:15 +0000 (16:47 +0000)]
Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev
am: a98cc8b

* commit 'a98cc8beb9af5678320b6fae8507dbe2da2c74dc':
  Call OnTimeChangedListener on AM/PM change in clock-style TimePicker

Change-Id: I04bc4a5acdc74a0a85e43002979b14cea55055f0

8 years agoMerge "Use adjusted popup window position when calculating best-fit" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 16:39:13 +0000 (16:39 +0000)]
Merge "Use adjusted popup window position when calculating best-fit" into nyc-dev

8 years agoMerge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into...
Alan Viverette [Tue, 19 Apr 2016 16:39:08 +0000 (16:39 +0000)]
Merge "Call OnTimeChangedListener on AM/PM change in clock-style TimePicker" into nyc-dev

8 years agoMerge "Fix QS edit overanimating" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 16:28:28 +0000 (16:28 +0000)]
Merge "Fix QS edit overanimating" into nyc-dev
am: 90a225d

* commit '90a225d46d5f674b144fb3942623797b0b537871':
  Fix QS edit overanimating

Change-Id: I43d3d7d0010fe0eaf4b7d76b7cc0537ef28f9441

8 years agoMerge "Recreate activity with correct configuration" into nyc-dev
Andrii Kulian [Tue, 19 Apr 2016 16:22:03 +0000 (16:22 +0000)]
Merge "Recreate activity with correct configuration" into nyc-dev
am: 5ac2da0

* commit '5ac2da04c1321e8620fc85afae7a168c01ce218b':
  Recreate activity with correct configuration

Change-Id: Ice3b3f64ef882ded3583cd7767741696e520c23b

8 years agoMerge "Fix QS edit overanimating" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 16:20:47 +0000 (16:20 +0000)]
Merge "Fix QS edit overanimating" into nyc-dev

8 years agoMerge "Recreate activity with correct configuration" into nyc-dev
Andrii Kulian [Tue, 19 Apr 2016 16:19:04 +0000 (16:19 +0000)]
Merge "Recreate activity with correct configuration" into nyc-dev

8 years agoFix QS edit overanimating
Jason Monk [Tue, 19 Apr 2016 16:07:15 +0000 (12:07 -0400)]
Fix QS edit overanimating

Tell it when to animate, that way it can't animate too much.

Change-Id: I0acdd780e76a4a0b0d5ed5e2805c44dc59306fc1
Fixes: 27315295

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:55:01 +0000 (15:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 30fc04a  -s ours

* commit '30fc04a99cb84058319abdf16b8c5f144c9b1924':
  Import translations. DO NOT MERGE

Change-Id: I41d8de22a1800edd3f050372c8fda3a36da0b9c1

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:45:34 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:45:03 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: f2a87aa  -s ours

* commit 'f2a87aa9c32e3aef50e7ba3eda44299559da1056':
  Import translations. DO NOT MERGE

Change-Id: I3869c4ab4b79841057b8244fb3d57e88320ae013

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:45:01 +0000 (15:45 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 4a19326  -s ours

* commit '4a19326d9166f02b01f341ef338ee88ef29335bc':
  Import translations. DO NOT MERGE

Change-Id: Ia8930286364cdbcd8105866eb0e2506abd00fda4

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:44:59 +0000 (15:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 451dc7e  -s ours

* commit '451dc7e146551c09d5d199113d484f07923d7086':
  Import translations. DO NOT MERGE

Change-Id: Iab53fea7693b353e7c934efcc036eb159b9f7ef6

8 years agoMerge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
Calin Juravle [Tue, 19 Apr 2016 15:38:40 +0000 (15:38 +0000)]
Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
am: f016d3a

* commit 'f016d3aef7711bf6703d9ef053c40afabdaf71a9':
  Move profile registration from bindApplication to LoadedApk

Change-Id: Id98e772f1f8917062b3b28dbb4032c7aacfed105

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:36:56 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:36:48 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 19 Apr 2016 15:36:44 +0000 (15:36 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Move profile registration from bindApplication to LoadedApk" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 15:29:18 +0000 (15:29 +0000)]
Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev

8 years agoMerge "No QS hotspot unless supported" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 15:26:09 +0000 (15:26 +0000)]
Merge "No QS hotspot unless supported" into nyc-dev
am: 93e742b

* commit '93e742b58818b3c8130c6cf7ccaba2d0a77d3a72':
  No QS hotspot unless supported

Change-Id: I141c636c23907d19ee33444239afea3239d7e656

8 years agoMerge "Set lock screen to be in public mode if one of its profile is secure" into...
Tony Mak [Tue, 19 Apr 2016 15:20:09 +0000 (15:20 +0000)]
Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev
am: 95a127c

* commit '95a127cbf49f8fb6496e4b81b2f0d716d7f8cfbc':
  Set lock screen to be in public mode if one of its profile is secure

Change-Id: Ibeaf86c324644aa088eafe47171c5dab811201d4

8 years agoMerge "No QS hotspot unless supported" into nyc-dev
Jason Monk [Tue, 19 Apr 2016 15:19:45 +0000 (15:19 +0000)]
Merge "No QS hotspot unless supported" into nyc-dev

8 years agoMerge "Set lock screen to be in public mode if one of its profile is secure" into...
Tony Mak [Tue, 19 Apr 2016 15:15:20 +0000 (15:15 +0000)]
Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev

8 years agoMerge "Make surfaceRedrawNeeded forgiving" into nyc-dev
John Reck [Tue, 19 Apr 2016 14:53:30 +0000 (14:53 +0000)]
Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev
am: 28e284b

* commit '28e284bd0678a7044b1d23879ef32018b1ca7384':
  Make surfaceRedrawNeeded forgiving

Change-Id: I78dee0cdb4cb8d867c4209834226a1b7d1ab1a54

8 years agoMerge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev
John Reck [Tue, 19 Apr 2016 14:53:28 +0000 (14:53 +0000)]
Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev
am: 9110429

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: I7f0f0e0a5d01991f0bce38ded4a5f2430499a07e

8 years agoMerge "Make surfaceRedrawNeeded forgiving" into nyc-dev
John Reck [Tue, 19 Apr 2016 14:45:31 +0000 (14:45 +0000)]
Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev

8 years agoMerge "Don't reuse LOST_SURFACE for stopped" into nyc-dev
John Reck [Tue, 19 Apr 2016 14:45:14 +0000 (14:45 +0000)]
Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev

8 years agoUse adjusted popup window position when calculating best-fit
Alan Viverette [Tue, 19 Apr 2016 14:17:00 +0000 (10:17 -0400)]
Use adjusted popup window position when calculating best-fit

Bug: 28194522
Bug: 28175404
Change-Id: I5685b397908f64559d0ec5fea5820bdea69f422c

8 years agoNo QS hotspot unless supported
Jason Monk [Tue, 19 Apr 2016 13:31:20 +0000 (09:31 -0400)]
No QS hotspot unless supported

Fixes: 27438917
Change-Id: Iadeee5a87ebb9b881e04ac706547004e186215ea

8 years agoMerge "update string "Work profile" to "All work apps"" into nyc-dev
Eric Tang [Tue, 19 Apr 2016 13:42:11 +0000 (13:42 +0000)]
Merge "update string "Work profile" to "All work apps"" into nyc-dev
am: 2f87f1d

* commit '2f87f1d1c57bd423d6928f9ff46accbea51e8645':
  update string "Work profile" to "All work apps"

Change-Id: I937afe6e6bb414c9f1589e51a6a9f1870991c82b

8 years agoMerge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 13:42:09 +0000 (13:42 +0000)]
Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev
am: 8940a5b

* commit '8940a5b286295b164ccdd7fd5b1b04171e62e6d1':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: I24fee978d8f9277031eb3e3f41ab3f490b81e787

8 years agoMerge "update string "Work profile" to "All work apps"" into nyc-dev
Eric Tang [Tue, 19 Apr 2016 13:38:05 +0000 (13:38 +0000)]
Merge "update string "Work profile" to "All work apps"" into nyc-dev

8 years agoMerge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev
Alan Viverette [Tue, 19 Apr 2016 13:36:24 +0000 (13:36 +0000)]
Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev

8 years agoCall OnTimeChangedListener on AM/PM change in clock-style TimePicker
Alan Viverette [Tue, 19 Apr 2016 13:29:20 +0000 (09:29 -0400)]
Call OnTimeChangedListener on AM/PM change in clock-style TimePicker

Bug: 28257554
Change-Id: I25aabac783ea2b6e68be4b6c60f0d55a4c37af26

8 years agoSet lock screen to be in public mode if one of its profile is secure
Tony Mak [Tue, 19 Apr 2016 13:02:44 +0000 (14:02 +0100)]
Set lock screen to be in public mode if one of its profile is secure

Change-Id: I7d819c7d4a52ff45705b1a1b9e215faf0957cccb
Fix: 27118634

8 years agoMerge changes I01afb5e9,I90d1adaf into nyc-dev
Julia Reynolds [Tue, 19 Apr 2016 12:55:51 +0000 (12:55 +0000)]
Merge changes I01afb5e9,I90d1adaf into nyc-dev
am: 3da3d7f4

* commit '3da3d7f455761b73309bf5a02bef5eba816df5cd':
  Add content intent to autogroup summary.
  Logging for ranker bundling.

Change-Id: Iaa904aedcb852e1e4b41f60e40d56da3d42afbd5

8 years agoMerge changes I01afb5e9,I90d1adaf into nyc-dev
Julia Reynolds [Tue, 19 Apr 2016 12:50:32 +0000 (12:50 +0000)]
Merge changes I01afb5e9,I90d1adaf into nyc-dev

* changes:
  Add content intent to autogroup summary.
  Logging for ranker bundling.

8 years agoMerge "User action should only stop lock task mode if it is in pinned mode" into...
Tony Mak [Tue, 19 Apr 2016 10:37:54 +0000 (10:37 +0000)]
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev
am: 882a080

* commit '882a0802a7f7268750b15adb8747dd3904f935b0':
  User action should only stop lock task mode if it is in pinned mode

Change-Id: Id2a1e5cfc512c352aaeb93f570a8f6c288a4ee3b

8 years agoMerge "User action should only stop lock task mode if it is in pinned mode" into...
Tony Mak [Tue, 19 Apr 2016 10:32:29 +0000 (10:32 +0000)]
Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev

8 years agoMerge "Keyboard shortcuts: UI polish 2" into nyc-dev
Andrei Stingaceanu [Tue, 19 Apr 2016 10:04:53 +0000 (10:04 +0000)]
Merge "Keyboard shortcuts: UI polish 2" into nyc-dev
am: bf8207e

* commit 'bf8207e270b1af908278b7a58c33a3e16d425cac':
  Keyboard shortcuts: UI polish 2

Change-Id: Ib29a196f93f25cecf744623678f888b010032a21

8 years agoMerge "Keyboard shortcuts: UI polish 2" into nyc-dev
Andrei Stingaceanu [Tue, 19 Apr 2016 09:59:51 +0000 (09:59 +0000)]
Merge "Keyboard shortcuts: UI polish 2" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Apr 2016 08:37:35 +0000 (01:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: I4de249a3fbf0c6d3faad2b3bb233be596c5ca815
Auto-generated-cl: translation import

8 years agoMerge "Separate measure so it can only run inflate if needed" into nyc-dev
Diego Perez [Tue, 19 Apr 2016 07:38:40 +0000 (07:38 +0000)]
Merge "Separate measure so it can only run inflate if needed" into nyc-dev
am: 3874597

* commit '38745971c266f5fca692ef284e1e3b4d38af1a41':
  Separate measure so it can only run inflate if needed

Change-Id: Ie986d0631c55552248c1c7d5ae9bdbe59b9d3b1d

8 years agoMerge "Separate measure so it can only run inflate if needed" into nyc-dev
Diego Perez [Tue, 19 Apr 2016 07:34:16 +0000 (07:34 +0000)]
Merge "Separate measure so it can only run inflate if needed" into nyc-dev

8 years agoMerge "Remove unused DHCP timeout event tag." into nyc-dev
Hugo Benichi [Tue, 19 Apr 2016 07:12:27 +0000 (07:12 +0000)]
Merge "Remove unused DHCP timeout event tag." into nyc-dev
am: 6e1d1db

* commit '6e1d1dbdd4d48e7997eb0998128ccaa9f8eeee5b':
  Remove unused DHCP timeout event tag.

Change-Id: I642b7095c950406d75079e3a55b4c06a520e467d

8 years agoMerge "Remove unused DHCP timeout event tag." into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 07:08:03 +0000 (07:08 +0000)]
Merge "Remove unused DHCP timeout event tag." into nyc-dev

8 years agoMerge "Optimize some binder calls when recents configuration changes" into nyc-dev
Jorim Jaggi [Tue, 19 Apr 2016 06:16:15 +0000 (06:16 +0000)]
Merge "Optimize some binder calls when recents configuration changes" into nyc-dev
am: 6783384

* commit '6783384eb1abebaa349a6e8b4d774e394f08adb2':
  Optimize some binder calls when recents configuration changes

Change-Id: I0c8941365a7b91c4e5a267d712e6c98042228c38

8 years agoMerge "Optimize some binder calls when recents configuration changes" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 06:09:36 +0000 (06:09 +0000)]
Merge "Optimize some binder calls when recents configuration changes" into nyc-dev

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Apr 2016 05:35:40 +0000 (22:35 -0700)]
Import translations. DO NOT MERGE

Change-Id: I25911f2c3a9ae2ea463f096e187350f96983310f
Auto-generated-cl: translation import

8 years agoRemove unused DHCP timeout event tag.
Hugo Benichi [Tue, 19 Apr 2016 02:53:43 +0000 (11:53 +0900)]
Remove unused DHCP timeout event tag.

DHCP timeouts should not be logged at DHCPClient level but as a timeout
event in IpManager.

Bug: 28204408
Change-Id: Ia12619e3bf71102cf289cbbcdec53fd5e7e8efff

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Apr 2016 05:09:26 +0000 (22:09 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1cba5a5c47981751f6134338855f3bd2cbdd9eb1
Auto-generated-cl: translation import

8 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 19 Apr 2016 05:03:13 +0000 (22:03 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2388d59a03f62e7e4617b64e85a552f49001a208
Auto-generated-cl: translation import

8 years agoOptimize some binder calls when recents configuration changes
Jorim Jaggi [Mon, 18 Apr 2016 23:03:36 +0000 (16:03 -0700)]
Optimize some binder calls when recents configuration changes

Bug: 28122871
Change-Id: I54249428792c3ad4b3b6d3dcc0f405675b3b23b4

8 years agoMerge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:17:43 +0000 (04:17 +0000)]
Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev
am: c81b726

* commit 'c81b726ed1faf195d81d64a1af2e747d58a453df':
  Define equals and hashCode for InputDeviceIdentifier.

Change-Id: I91872ea38d0d7b04d23f3f61a8a0312065199494

8 years agoMerge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev
Keisuke Kuroyanagi [Tue, 19 Apr 2016 04:11:15 +0000 (04:11 +0000)]
Merge "Define equals and hashCode for InputDeviceIdentifier." into nyc-dev

8 years agoRecreate activity with correct configuration
Andrii Kulian [Tue, 19 Apr 2016 03:54:20 +0000 (20:54 -0700)]
Recreate activity with correct configuration

Dialer recreates activity inside onConfigurationChange
when configuration changes significantly. Recreated
activity in this case was initialised with old base version
which resulted in incorrect configuration in split-screen.

This CL updates configuration when activity is created from
override config.

Bug: 27976063
Change-Id: I0ac002a5661154ec25f2d5aba3d44070b683ba2f

8 years agoMerge changes Id1aab629,Idb24dbd4 into nyc-dev
Selim Cinek [Tue, 19 Apr 2016 02:58:39 +0000 (02:58 +0000)]
Merge changes Id1aab629,Idb24dbd4 into nyc-dev
am: 1ed0c12

* commit '1ed0c12a657eb3f569cfcc5329ef4532e83d0f87':
  Fixed a few issues when adapting the dpi
  Fixed a few issues with status bar density changes

Change-Id: Iba70347a8fa9ea1f22e236e9c1f1d388e1c4d772

8 years agoMerge "Fixed a crash when changing density with HUN visible" into nyc-dev
Selim Cinek [Tue, 19 Apr 2016 02:58:36 +0000 (02:58 +0000)]
Merge "Fixed a crash when changing density with HUN visible" into nyc-dev
am: 3af18ca

* commit '3af18caf8e31afe87ee82bb2710876bdcc1d9a06':
  Fixed a crash when changing density with HUN visible

Change-Id: I1d231c00a65ec911c6c04755caf1135da1c6feca

8 years agoMerge changes Id1aab629,Idb24dbd4 into nyc-dev
Selim Cinek [Tue, 19 Apr 2016 02:54:46 +0000 (02:54 +0000)]
Merge changes Id1aab629,Idb24dbd4 into nyc-dev

* changes:
  Fixed a few issues when adapting the dpi
  Fixed a few issues with status bar density changes

8 years agoMerge "Fixed a crash when changing density with HUN visible" into nyc-dev
Selim Cinek [Tue, 19 Apr 2016 02:53:01 +0000 (02:53 +0000)]
Merge "Fixed a crash when changing density with HUN visible" into nyc-dev

8 years agoMerge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than =="...
Chris Thornton [Tue, 19 Apr 2016 02:36:11 +0000 (02:36 +0000)]
Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev
am: 7d5c695

* commit '7d5c6955208e82157e6e5ba42ba1d5f1507c6eb6':
  Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==

Change-Id: I3a34b43b8e69fcb99fe88558a705d2a6435179a1

8 years agoMerge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than =="...
TreeHugger Robot [Tue, 19 Apr 2016 02:29:05 +0000 (02:29 +0000)]
Merge "Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==" into nyc-dev

8 years agoMerge "Added extra validation for invalid paths." into nyc-dev
Felipe Leme [Tue, 19 Apr 2016 02:14:48 +0000 (02:14 +0000)]
Merge "Added extra validation for invalid paths." into nyc-dev
am: 40297c1a9c

* commit '40297c1a9ce076797d2576e96fbd2f0d76eef1d5':
  Added extra validation for invalid paths.

Change-Id: Ic0bfe4e1aa967b7b3b4a8a4c32dcb85813f9c551

8 years agoMerge "Added extra validation for invalid paths." into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 02:09:33 +0000 (02:09 +0000)]
Merge "Added extra validation for invalid paths." into nyc-dev

8 years agoMerge changes Ibec23fdb,Id7be5129,I25af8fad,Idbabfe39,I86b10805, ... into nyc-dev
Winson [Tue, 19 Apr 2016 01:43:56 +0000 (01:43 +0000)]
Merge changes Ibec23fdb,Id7be5129,I25af8fad,Idbabfe39,I86b10805, ... into nyc-dev
am: 87574b7b1a

* commit '87574b7b1a26ca1c26a26016ff1cee286404d84c':
  Hiding clear-all button on drag start.
  Adding hint text for drop targets.
  Fixing animation spec animation problem.
  Making the dismiss animation feel smoother.
  Fixing issue with gap between task views.
  Adding desired undocking animation.

Change-Id: Ie5f454617fb4a3e0f4fa23fc2dc96c5cfb5f659b

8 years agoMerge changes Ibec23fdb,Id7be5129,I25af8fad,Idbabfe39,I86b10805, ... into nyc-dev
Winson Chung [Tue, 19 Apr 2016 01:32:36 +0000 (01:32 +0000)]
Merge changes Ibec23fdb,Id7be5129,I25af8fad,Idbabfe39,I86b10805, ... into nyc-dev

* changes:
  Hiding clear-all button on drag start.
  Adding hint text for drop targets.
  Fixing animation spec animation problem.
  Making the dismiss animation feel smoother.
  Fixing issue with gap between task views.
  Adding desired undocking animation.

8 years agoHiding clear-all button on drag start.
Winson [Mon, 18 Apr 2016 23:58:33 +0000 (16:58 -0700)]
Hiding clear-all button on drag start.

Bug: 27702186
Change-Id: Ibec23fdb1ce4853f52a449cbe6d8c6454f0b027c

8 years agoAdding hint text for drop targets.
Winson [Mon, 18 Apr 2016 23:57:27 +0000 (16:57 -0700)]
Adding hint text for drop targets.

Bug: 28192178
Change-Id: Id7be5129488622b56082d2dfa328b751311cabd7

8 years agoFixing animation spec animation problem.
Winson [Mon, 18 Apr 2016 19:57:56 +0000 (12:57 -0700)]
Fixing animation spec animation problem.

- We were always using the stack layout to get the task transforms, but
  when we are animating to a given task position (ie. hitting recents
  while the home->recents transition is happening), we would start the
  animation with the final task rect, instead of the current task rect.
  Instead, use the current transform of the task view, and transform
  that to screen coordinates and use it.

Bug: 27154882
Change-Id: I25af8fad97ee78669c952dd81708e6cee5dfab05

8 years agoMaking the dismiss animation feel smoother.
Winson [Sat, 16 Apr 2016 02:06:54 +0000 (19:06 -0700)]
Making the dismiss animation feel smoother.

Bug: 27154882
Change-Id: Idbabfe396bc75b598861fd12b78c846f08243a90

8 years agoFixing issue with gap between task views.
Winson [Sat, 16 Apr 2016 00:54:52 +0000 (17:54 -0700)]
Fixing issue with gap between task views.

- Now that we changed the way the landscape tasks clipped, we no longer
  have to worry about the aspect ratio scaled height.

Bug: 27921659
Change-Id: I86b10805e92decb9995caa3790649f9f7d211784

8 years agoAdding desired undocking animation.
Winson [Fri, 15 Apr 2016 18:19:07 +0000 (11:19 -0700)]
Adding desired undocking animation.

- Separating task binding from task data updating
- Removing unused parameters

Bug: 27154882
Change-Id: Ia970597d57857a74b5d008e91a93703d8fb70c1e

8 years agoUse .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==
Chris Thornton [Mon, 18 Apr 2016 23:51:08 +0000 (16:51 -0700)]
Use .equals() to compare two UUIDs in SoundTriggerHelper, rather than ==

Also refactors ModelData::clearState to clear a bit more of the state.

Bug:28251543
Change-Id: I18d7ccd90a6a9ee8bc8743d9a92c48f17d87c842

8 years agoMerge "Properly resume paused activity when docked stack in maximized" into nyc-dev
Wale Ogunwale [Tue, 19 Apr 2016 00:51:14 +0000 (00:51 +0000)]
Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev
am: 84f0b791e2

* commit '84f0b791e2eb0170c6b797929235c98d44f12d47':
  Properly resume paused activity when docked stack in maximized

Change-Id: I62c0afa5fc227b543dc2f2ee9c77ac6ed1a33138

8 years agoMerge "Properly resume paused activity when docked stack in maximized" into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 00:47:27 +0000 (00:47 +0000)]
Merge "Properly resume paused activity when docked stack in maximized" into nyc-dev

8 years agoMerge "Checks for existence of vr components before trying to disable them." into...
Craig Donner [Tue, 19 Apr 2016 00:17:17 +0000 (00:17 +0000)]
Merge "Checks for existence of vr components before trying to disable them." into nyc-dev
am: 3e38e6a

* commit '3e38e6accf5586d350581a301e1ecfcadaf03b93':
  Checks for existence of vr components before trying to disable them.

Change-Id: I8ef723826494b230f747f94a3d5149bd1d7fac69

8 years agoMerge "Checks for existence of vr components before trying to disable them." into...
Craig Donner [Tue, 19 Apr 2016 00:10:53 +0000 (00:10 +0000)]
Merge "Checks for existence of vr components before trying to disable them." into nyc-dev

8 years agoMerge "Use right starting window resource in multi-window mode." into nyc-dev
Wale Ogunwale [Tue, 19 Apr 2016 00:10:50 +0000 (00:10 +0000)]
Merge "Use right starting window resource in multi-window mode." into nyc-dev
am: 3eefb4c

* commit '3eefb4c313d0269f7e8bd226bdcc2d039f9e5608':
  Use right starting window resource in multi-window mode.

Change-Id: If799a1a7c93de62e0a954af70c5f244f02688a16

8 years agoMerge "Use right starting window resource in multi-window mode." into nyc-dev
TreeHugger Robot [Tue, 19 Apr 2016 00:03:59 +0000 (00:03 +0000)]
Merge "Use right starting window resource in multi-window mode." into nyc-dev

8 years agoMerge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev
Adam Powell [Mon, 18 Apr 2016 23:50:47 +0000 (23:50 +0000)]
Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev
am: de7b2ed

* commit 'de7b2ed881d75cb7f21ae2199b9af68ae019becf':
  Be bug-compatible with Fragment#setUserVisibleHint < N

Change-Id: Id9374c29e6f241e377b75acd4ae7b11c8324c54f

8 years agoMerge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev
Adam Powell [Mon, 18 Apr 2016 23:41:39 +0000 (23:41 +0000)]
Merge "Be bug-compatible with Fragment#setUserVisibleHint < N" into nyc-dev

8 years agoBe bug-compatible with Fragment#setUserVisibleHint < N
Adam Powell [Mon, 18 Apr 2016 18:01:55 +0000 (11:01 -0700)]
Be bug-compatible with Fragment#setUserVisibleHint < N

Prior to Android N we were simply checking if a fragment had a
FragmentManager set before we would trigger a deferred
start. Unfortunately this also gets set before a fragment transaction
is committed, so if setUserVisibleHint was called before a transaction
commit, we would start the fragment way too
early. FragmentPagerAdapter triggers this situation.

Unfortunately some apps relied on this timing in overrides of
setUserVisibleHint on their own fragments, and expected, however
erroneously, that after a call to super.setUserVisibleHint their
onStart methods had been run.

Bug 28184671

Change-Id: Ie40d5f6963d312c2fad4a48fb4f992d33e65c83b

8 years agoMerge "Fixed ScriptGroup finalizer for old API" into nyc-dev
Yang Ni [Mon, 18 Apr 2016 23:38:10 +0000 (23:38 +0000)]
Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev
am: ecf094a

* commit 'ecf094ae9d715ac3cff6213fae4c904f9dd791e8':
  Fixed ScriptGroup finalizer for old API

Change-Id: Icd420a0023b7c614d7dd2104a38acfb62f66d450

8 years agoMerge "BatteryStats: Introduce Async external stats requests" into nyc-dev
Adam Lesinski [Mon, 18 Apr 2016 23:38:08 +0000 (23:38 +0000)]
Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev
am: 0d47f4b

* commit '0d47f4b6463077074abd6bed489a5f9243615c64':
  BatteryStats: Introduce Async external stats requests

Change-Id: I5fbb54546528942e36293e1fbcbb03290a037823

8 years agoMerge "Fixed ScriptGroup finalizer for old API" into nyc-dev
Yang Ni [Mon, 18 Apr 2016 23:34:04 +0000 (23:34 +0000)]
Merge "Fixed ScriptGroup finalizer for old API" into nyc-dev

8 years agoChecks for existence of vr components before trying to disable them.
Craig Donner [Mon, 18 Apr 2016 22:50:57 +0000 (15:50 -0700)]
Checks for existence of vr components before trying to disable them.

Fixes: 28249296
Change-Id: I98506c263387c9deb05ae6bc997e92e0000b71ad

8 years agoMerge "Make getFrameNumber lazy" into nyc-dev
John Reck [Mon, 18 Apr 2016 23:27:46 +0000 (23:27 +0000)]
Merge "Make getFrameNumber lazy" into nyc-dev
am: 8cddce3

* commit '8cddce3f8f503b2aa8b993fef6406645c3e80da6':
  Make getFrameNumber lazy

Change-Id: I7f8ad99ed9b28d25a98e5c9040b8d3a38c21f747

8 years agoMerge "BatteryStats: Introduce Async external stats requests" into nyc-dev
Adam Lesinski [Mon, 18 Apr 2016 23:27:08 +0000 (23:27 +0000)]
Merge "BatteryStats: Introduce Async external stats requests" into nyc-dev

8 years agoMerge "Make getFrameNumber lazy" into nyc-dev
John Reck [Mon, 18 Apr 2016 23:20:37 +0000 (23:20 +0000)]
Merge "Make getFrameNumber lazy" into nyc-dev

8 years agoProperly resume paused activity when docked stack in maximized
Wale Ogunwale [Mon, 18 Apr 2016 23:14:18 +0000 (16:14 -0700)]
Properly resume paused activity when docked stack in maximized

Force focus to the fullscreen stack so that its activity is resumed
regardless of it current state when moving all tasks from the docked
stack to the fullscreen stack and the fullscreen stack should be on
top.

Bug: 28247643
Bug: 28196862
Change-Id: Ic60c3794db765e9ee31b0facbbc4f461d65f30c2

8 years agoMerge "[Call Timing] Add constants for call timing extras" into nyc-dev
Sailesh Nepal [Mon, 18 Apr 2016 22:43:01 +0000 (22:43 +0000)]
Merge "[Call Timing] Add constants for call timing extras" into nyc-dev
am: b05e485

* commit 'b05e4851d01473432e841e757f2c96fd60ab300e':
  [Call Timing] Add constants for call timing extras

Change-Id: Ic2c8f68f29c2ed628baa83a0316ce9a7e9564078

8 years agoMerge "[Call Timing] Add constants for call timing extras" into nyc-dev
Sailesh Nepal [Mon, 18 Apr 2016 22:36:38 +0000 (22:36 +0000)]
Merge "[Call Timing] Add constants for call timing extras" into nyc-dev

8 years agoMerge "Optimize ResTable::getLocales() to improve bindApplication performance" into...
Adam Lesinski [Mon, 18 Apr 2016 22:35:24 +0000 (22:35 +0000)]
Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev
am: bfdc202

* commit 'bfdc2020b94d6368a7a8cf97bf545d28c757e0fd':
  Optimize ResTable::getLocales() to improve bindApplication performance

Change-Id: I494a2829ee71b98c707c8e5768ca2415c98dce23

8 years agoMerge "Use Activity resources in DecorContext" into nyc-dev
Adam Lesinski [Mon, 18 Apr 2016 22:35:22 +0000 (22:35 +0000)]
Merge "Use Activity resources in DecorContext" into nyc-dev
am: 6cc3199

* commit '6cc31990fc1952b9533cf9b695dd287b87a93e82':
  Use Activity resources in DecorContext

Change-Id: Ie30b91a0c926c8ac84f2364a3267b5e0f22c30e7

8 years agoMerge "Optimize ResTable::getLocales() to improve bindApplication performance" into...
Adam Lesinski [Mon, 18 Apr 2016 22:24:07 +0000 (22:24 +0000)]
Merge "Optimize ResTable::getLocales() to improve bindApplication performance" into nyc-dev

8 years agoMerge "Use Activity resources in DecorContext" into nyc-dev
Adam Lesinski [Mon, 18 Apr 2016 22:23:42 +0000 (22:23 +0000)]
Merge "Use Activity resources in DecorContext" into nyc-dev