OSDN Git Service

android-x86/frameworks-base.git
7 years agoMerge "Restore padding." into nyc-mr1-dev
Julia Reynolds [Mon, 8 Aug 2016 20:12:30 +0000 (20:12 +0000)]
Merge "Restore padding." into nyc-mr1-dev
am: 67abc837af

Change-Id: Ib58f6c77e6211c73df7190c02483352fb4deb56a

7 years agoRestore padding.
Julia Reynolds [Mon, 8 Aug 2016 20:12:26 +0000 (20:12 +0000)]
Restore padding.
am: eded2fcf7a

Change-Id: I4f708fc0eb26ecf4844f4d48b9d87a979fb0d61a

7 years agoMerge "Restore padding." into nyc-mr1-dev
Julia Reynolds [Mon, 8 Aug 2016 20:05:52 +0000 (20:05 +0000)]
Merge "Restore padding." into nyc-mr1-dev

7 years agoMerge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
Dianne Hackborn [Mon, 8 Aug 2016 20:04:00 +0000 (20:04 +0000)]
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
am: 154cc8237b

Change-Id: I1cc2b46355a5eb8aa03744e704b3393b2750ba25

7 years agoHave BatteryStats track and report the running wakelocks.
Joe Onorato [Mon, 8 Aug 2016 20:03:57 +0000 (20:03 +0000)]
Have BatteryStats track and report the running wakelocks.
am: adbee556a9

Change-Id: I02de7ade40163257d6d424b0ae37dba65d43a565

7 years agoMerge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev
Dianne Hackborn [Mon, 8 Aug 2016 19:58:55 +0000 (19:58 +0000)]
Merge "Have BatteryStats track and report the running wakelocks." into nyc-mr1-dev

7 years agoRestore padding.
Julia Reynolds [Mon, 8 Aug 2016 19:41:43 +0000 (15:41 -0400)]
Restore padding.

Change-Id: I532e5007c2a9152554b8f5130196a2f0cb3c8f1e
Fixes: 30738806

7 years agoMerge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev
Selim Cinek [Mon, 8 Aug 2016 19:32:35 +0000 (19:32 +0000)]
Merge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev
am: 5a3e33a82a

Change-Id: Ie39a818c2fa48b2d66b221767d25d4ce5078711d

7 years agoImproved the transition when clicking on the last notification
Selim Cinek [Mon, 8 Aug 2016 19:32:32 +0000 (19:32 +0000)]
Improved the transition when clicking on the last notification
am: 61b350cca6

Change-Id: If43c38458af01728b37bbdc7efb16bb4f7c22682

7 years agoFixed a bug that could lead to an empty notification
Selim Cinek [Mon, 8 Aug 2016 19:32:03 +0000 (19:32 +0000)]
Fixed a bug that could lead to an empty notification
am: aa3901a5ee

Change-Id: Ib24b5ee706e09eb87203bf9d23119defe416712c

7 years agoRemoved contentDescriptions that hindered accessibility usability
Selim Cinek [Mon, 8 Aug 2016 19:31:28 +0000 (19:31 +0000)]
Removed contentDescriptions that hindered accessibility usability
am: d871f95f49

Change-Id: I53bc3cfc98f749d0675b6893e2ccf247cc7cbdad

7 years agoFixes a bug where setting a null bigLargeIcon would not clear it
Selim Cinek [Mon, 8 Aug 2016 19:30:21 +0000 (19:30 +0000)]
Fixes a bug where setting a null bigLargeIcon would not clear it
am: e99acb29db

Change-Id: Ib5f175bc50d8110f708c3541b3f0c0e715c41b87

7 years agoFixed the transition of the background of the notifications
Selim Cinek [Mon, 8 Aug 2016 19:29:52 +0000 (19:29 +0000)]
Fixed the transition of the background of the notifications
am: d393d5c1e5

Change-Id: I4dd36a87199063bb3eae39da037d917785e91032

7 years agoFixed a bug where the notification would fade out in a ugly way
Selim Cinek [Mon, 8 Aug 2016 19:29:23 +0000 (19:29 +0000)]
Fixed a bug where the notification would fade out in a ugly way
am: a981d083f9

Change-Id: I736cfbbaec37e28817e3e40d0d09133dc4070acd

7 years agoMerge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev
Selim Cinek [Mon, 8 Aug 2016 19:18:32 +0000 (19:18 +0000)]
Merge changes Idc4c2c14,Ibea016c6,I49ab58c3,Id911d405,I0f17dc5f, ... into nyc-mr1-dev

* changes:
  Improved the transition when clicking on the last notification
  Fixed a bug that could lead to an empty notification
  Removed contentDescriptions that hindered accessibility usability
  Fixes a bug where setting a null bigLargeIcon would not clear it
  Fixed the transition of the background of the notifications
  Fixed a bug where the notification would fade out in a ugly way

7 years agoMerge "Don't ensure configuration for activity we are resuming." into nyc-mr1-dev
Wale Ogunwale [Mon, 8 Aug 2016 18:36:36 +0000 (18:36 +0000)]
Merge "Don't ensure configuration for activity we are resuming." into nyc-mr1-dev
am: c830bd1071

Change-Id: Id6afa206c509faf3c142cd48f26919e90edf6f77

7 years agoDon't ensure configuration for activity we are resuming.
Wale Ogunwale [Mon, 8 Aug 2016 18:36:34 +0000 (18:36 +0000)]
Don't ensure configuration for activity we are resuming.
am: 950faffd02

Change-Id: I7dace9abe731ea85d6429a3b07666ec138789891

7 years agoMerge "Don't ensure configuration for activity we are resuming." into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 18:27:00 +0000 (18:27 +0000)]
Merge "Don't ensure configuration for activity we are resuming." into nyc-mr1-dev

7 years agoMerge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev
Muyuan Li [Mon, 8 Aug 2016 17:54:59 +0000 (17:54 +0000)]
Merge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev
am: a6b1a9485c

Change-Id: Ia176be1937adbd115acfece5979c3d61e1111d7d

7 years agoPrevents screenshot layer from dismissing IME.
Muyuan Li [Mon, 8 Aug 2016 17:54:57 +0000 (17:54 +0000)]
Prevents screenshot layer from dismissing IME.
am: 36ca72c6c2

Change-Id: I0eb890d51edf58ac4e18d26af5331429a305c4f2

7 years agoMerge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev
Muyuan Li [Mon, 8 Aug 2016 17:43:10 +0000 (17:43 +0000)]
Merge "Prevents screenshot layer from dismissing IME." into nyc-mr1-dev

7 years agoMerge "Add colours for disabled state for switch in SwitchPreference for watch device...
Michael Kwan [Mon, 8 Aug 2016 17:08:25 +0000 (17:08 +0000)]
Merge "Add colours for disabled state for switch in SwitchPreference for watch devices." into cw-f-dev

7 years agoDon't ensure configuration for activity we are resuming.
Wale Ogunwale [Mon, 8 Aug 2016 16:51:04 +0000 (09:51 -0700)]
Don't ensure configuration for activity we are resuming.

Regression introduced in ag/865988 when ASS.ensureActivitiesVisibleLocked()
was added to the end of AS.completePauseLocked() without specifing the
starting/resuming activity. If the starting/resuming activity isn't specified
the resuming activity can be relaunched with the current configuration which
might be different from the configuration the activity will end up in if it has
fixed orientation.
We now pass in the starting/resuming activity to avoid this.

Bug: 30509213
Change-Id: Idd0be84745bad83a1924e850b9b4020b927a78d8

7 years agoMerge "Fixing NPE in device policy tests" into cw-f-dev
Ashley Smith [Mon, 8 Aug 2016 16:22:38 +0000 (16:22 +0000)]
Merge "Fixing NPE in device policy tests" into cw-f-dev

7 years agoMerge "QS: Tweak animation paths when few icons" into nyc-mr1-dev
Jason Monk [Mon, 8 Aug 2016 15:39:58 +0000 (15:39 +0000)]
Merge "QS: Tweak animation paths when few icons" into nyc-mr1-dev
am: c1aac02a37

Change-Id: I83acd8ac5778d2879dd71d459a1b7288fa0b898b

7 years agoQS: Tweak animation paths when few icons
Jason Monk [Mon, 8 Aug 2016 15:39:55 +0000 (15:39 +0000)]
QS: Tweak animation paths when few icons
am: 08a79197da

Change-Id: I102725783d456fe18560e60a2e3371bc16f52065

7 years agoMerge "QS: Fix expanding on closing detail" into nyc-mr1-dev
Jason Monk [Mon, 8 Aug 2016 15:39:51 +0000 (15:39 +0000)]
Merge "QS: Fix expanding on closing detail" into nyc-mr1-dev
am: a6ab28d3c9

Change-Id: I9027fd2f9c1cb262cd089961d15c381420d63e1b

7 years agoQS: Fix expanding on closing detail
Jason Monk [Mon, 8 Aug 2016 15:39:49 +0000 (15:39 +0000)]
QS: Fix expanding on closing detail
am: dfb851c6cf

Change-Id: I6467a5456782360276157ed9e776837411806d63

7 years agoMerge "QS: Tweak animation paths when few icons" into nyc-mr1-dev
Jason Monk [Mon, 8 Aug 2016 15:32:46 +0000 (15:32 +0000)]
Merge "QS: Tweak animation paths when few icons" into nyc-mr1-dev

7 years agoMerge "QS: Fix expanding on closing detail" into nyc-mr1-dev
Jason Monk [Mon, 8 Aug 2016 15:32:23 +0000 (15:32 +0000)]
Merge "QS: Fix expanding on closing detail" into nyc-mr1-dev

7 years agoMerge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 15:00:18 +0000 (15:00 +0000)]
Merge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev
am: 295d81c360

Change-Id: Ica2b189d6e98cf0231adec70897ae23bfa0a27a0

7 years agoEnsure Dequeue/Queue duration is always set
John Reck [Mon, 8 Aug 2016 15:00:15 +0000 (15:00 +0000)]
Ensure Dequeue/Queue duration is always set
am: 70e89c9c37

Change-Id: I4d4543d0f65d5d2826518e7975934ce7a5d7232d

7 years agoMerge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 14:52:04 +0000 (14:52 +0000)]
Merge "Ensure Dequeue/Queue duration is always set" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 8 Aug 2016 13:55:46 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 867f6d5dd5  -s ours

Change-Id: I598c9552fe3c0a044ae336d662de97dcd385ba78

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 13:55:45 +0000 (13:55 +0000)]
Import translations. DO NOT MERGE
am: 15b3229561  -s ours

Change-Id: I25c671bf7dec35b7c0a8aa52c131d2145f6757ce

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Bill Yi [Mon, 8 Aug 2016 13:55:43 +0000 (13:55 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 96707c53cc  -s ours

Change-Id: I26ce216345d4e820038dabd413a0bbcb787c3a9e

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 13:55:42 +0000 (13:55 +0000)]
Import translations. DO NOT MERGE
am: 8d7bd6b735  -s ours

Change-Id: I900c7f6fdf464f052e0396dc663200d95ecdeda4

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 13:55:40 +0000 (13:55 +0000)]
Import translations. DO NOT MERGE
am: b046cefd8a  -s ours

Change-Id: I9439d1c81f7ebb38c72b2e80acbc20be2787a6cd

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 13:42:34 +0000 (13:42 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoMerge "Import translations. DO NOT MERGE" into cw-f-dev
TreeHugger Robot [Mon, 8 Aug 2016 13:41:55 +0000 (13:41 +0000)]
Merge "Import translations. DO NOT MERGE" into cw-f-dev

7 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 13:40:43 +0000 (13:40 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 11:16:48 +0000 (04:16 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 11:01:55 +0000 (04:01 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 06:09:28 +0000 (23:09 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 05:54:04 +0000 (22:54 -0700)]
Import translations. DO NOT MERGE

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

7 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 8 Aug 2016 04:46:38 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE

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

7 years agoMerge "Add Connection Event for wifi handover failures." into nyc-mr1-dev
Tyler Gunn [Mon, 8 Aug 2016 00:45:39 +0000 (00:45 +0000)]
Merge "Add Connection Event for wifi handover failures." into nyc-mr1-dev
am: aa1e49c168

Change-Id: I7dcee129daab9b1e8c4476a97adef04764f1f8d3

7 years agoAdd Connection Event for wifi handover failures.
Tyler Gunn [Mon, 8 Aug 2016 00:45:32 +0000 (00:45 +0000)]
Add Connection Event for wifi handover failures.
am: 920f79411c

Change-Id: I583bbbcc1bfd32ca19eecf69a88973451d7599ec

7 years agoMerge "Add Connection Event for wifi handover failures." into nyc-mr1-dev
Tyler Gunn [Mon, 8 Aug 2016 00:33:43 +0000 (00:33 +0000)]
Merge "Add Connection Event for wifi handover failures." into nyc-mr1-dev

7 years agoPrevents screenshot layer from dismissing IME.
Muyuan Li [Sun, 7 Aug 2016 03:24:06 +0000 (20:24 -0700)]
Prevents screenshot layer from dismissing IME.

Add code to adjustWindowLw to force the flag
FLAG_NOT_FOCUSABLE to be set for layer type
TYPE_SCREENSHOT.

Bug: 30485483
Change-Id: I11725eb89fda59b6d50fa1700845cdfe9ffb930b

7 years agoAdd colours for disabled state for switch in SwitchPreference for watch devices.
Michael Kwan [Thu, 4 Aug 2016 04:54:59 +0000 (21:54 -0700)]
Add colours for disabled state for switch in SwitchPreference for watch devices.

Bug: 30578046
Change-Id: I692f6375a73c9d334d576d3eca7f9721af120e30

7 years agoMerge "Make sure IME focus is synced to View focus" into nyc-mr1-dev
Yohei Yukawa [Sat, 6 Aug 2016 18:26:21 +0000 (18:26 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev
am: 04828df84e

Change-Id: Ia8727393cdf93e857d26ba75d33ebef0625884de

7 years agoMake sure IME focus is synced to View focus
Yohei Yukawa [Sat, 6 Aug 2016 18:26:19 +0000 (18:26 +0000)]
Make sure IME focus is synced to View focus
am: dd228fbb4d

Change-Id: Ic1bd5be0bb52dc4692ef5dedce90d0b71c1ab013

7 years agoMerge "Make sure IME focus is synced to View focus" into nyc-mr1-dev
TreeHugger Robot [Sat, 6 Aug 2016 18:18:55 +0000 (18:18 +0000)]
Merge "Make sure IME focus is synced to View focus" into nyc-mr1-dev

7 years agoMerge "Remove animation value change from push staging" into nyc-mr1-dev
Doris Liu [Sat, 6 Aug 2016 01:15:49 +0000 (01:15 +0000)]
Merge "Remove animation value change from push staging" into nyc-mr1-dev
am: 7ae119ebff

Change-Id: I247d28bea45383dfac5ea170fca18d4d63e43e79

7 years agoRemove animation value change from push staging
Doris Liu [Sat, 6 Aug 2016 01:15:48 +0000 (01:15 +0000)]
Remove animation value change from push staging
am: 6725d581eb

Change-Id: I53988f1d269c9691a098693a978e1d6e0b275cd6

7 years agoMerge "Support repeatMode = reverse in AVD" into nyc-mr1-dev
Doris Liu [Sat, 6 Aug 2016 01:10:07 +0000 (01:10 +0000)]
Merge "Support repeatMode = reverse in AVD" into nyc-mr1-dev
am: 26d4ab07d5

Change-Id: Id69bbcfa33c7a3b30b850cceb87425b9e43dcbc0

7 years agoSupport repeatMode = reverse in AVD
Doris Liu [Sat, 6 Aug 2016 01:10:05 +0000 (01:10 +0000)]
Support repeatMode = reverse in AVD
am: f7167e8f28

Change-Id: I893ad395c53a79cae6a51612f0bc67dca3cbbda2

7 years agoMerge "Remove animation value change from push staging" into nyc-mr1-dev
Doris Liu [Sat, 6 Aug 2016 01:07:14 +0000 (01:07 +0000)]
Merge "Remove animation value change from push staging" into nyc-mr1-dev

7 years agoMerge "Support repeatMode = reverse in AVD" into nyc-mr1-dev
Doris Liu [Sat, 6 Aug 2016 00:47:02 +0000 (00:47 +0000)]
Merge "Support repeatMode = reverse in AVD" into nyc-mr1-dev

7 years agoMerge "Improve handling of crashing a11y services." into nyc-mr1-dev
Phil Weaver [Fri, 5 Aug 2016 23:44:43 +0000 (23:44 +0000)]
Merge "Improve handling of crashing a11y services." into nyc-mr1-dev
am: f861b916e4

Change-Id: I014ddc40f121e602635cc0436926810ca918da13

7 years agoImprove handling of crashing a11y services.
Phil Weaver [Fri, 5 Aug 2016 23:44:40 +0000 (23:44 +0000)]
Improve handling of crashing a11y services.
am: a8cfb3733d

Change-Id: I303d1dfdb328b787b4315d846dfb4d9bbc747b75

7 years agoMerge "Improve handling of crashing a11y services." into nyc-mr1-dev
Phil Weaver [Fri, 5 Aug 2016 23:28:46 +0000 (23:28 +0000)]
Merge "Improve handling of crashing a11y services." into nyc-mr1-dev

7 years agoMerge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev
Christopher Tate [Fri, 5 Aug 2016 23:17:56 +0000 (23:17 +0000)]
Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev
am: 1b72661e45

Change-Id: I1e5c9f1a1432ea3105ed22571b97a255eaed6017

7 years agoReschedule date-change alarm whenever the time is set
Christopher Tate [Fri, 5 Aug 2016 23:17:53 +0000 (23:17 +0000)]
Reschedule date-change alarm whenever the time is set
am: cf02471cde

Change-Id: Iae07d6838e877e105ee31a7138303573c257511f

7 years agoMerge "Not trying to remove admins already being removed" into nyc-mr1-dev
Suprabh Shukla [Fri, 5 Aug 2016 23:17:50 +0000 (23:17 +0000)]
Merge "Not trying to remove admins already being removed" into nyc-mr1-dev
am: cefcb979ae

Change-Id: I93496d1302c19d2b54fd53d4e87a36c59a1d811c

7 years agoNot trying to remove admins already being removed
Suprabh Shukla [Fri, 5 Aug 2016 23:17:47 +0000 (23:17 +0000)]
Not trying to remove admins already being removed
am: 9704e409df

Change-Id: I79141f4a94ddb10a7124c7fcd6dfeb14337553d8

7 years agoHave BatteryStats track and report the running wakelocks.
Joe Onorato [Mon, 25 Jul 2016 18:18:42 +0000 (11:18 -0700)]
Have BatteryStats track and report the running wakelocks.

The times reported are in the screen off / on battery time base.

Bug: 29546924
Change-Id: I025b2959becb256a26cf531e944786d4e9a59149

7 years agoMerge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev
Chris Tate [Fri, 5 Aug 2016 22:48:56 +0000 (22:48 +0000)]
Merge "Reschedule date-change alarm whenever the time is set" into nyc-mr1-dev

7 years agoMake sure IME focus is synced to View focus
Yohei Yukawa [Fri, 5 Aug 2016 22:38:55 +0000 (15:38 -0700)]
Make sure IME focus is synced to View focus

This CL fixes an edge case that my previous CL [1] forgot to handle.

The goal of my previous CL was to avoid InputMethodManager from getting
confused by a false focus-in event from temporarily detached Views.
However, my CL forgot to take care of the case where the temporarily
detached View is still focused even after the temporary detach mode is
done.

The bad news is that such a situation is relatively easy to trigger by
having a ListView that has EditText as follows, which seems to be
known to be a common technique in Android developer community to put an
EditText in a ListView.
  ListView#listView.addHeaderView(new EditText(context), null, true);

If the ListView is initialized as above, and the EditText has input
focus, View focus and IME focus start to disagree immediatelly after the
ListView's layout is re-evaluated.  This is really easy to trigger, for
example just by dismissing the IME window.

In summary, the root cause is that InputMethodManager#focusIn(View) is
now always ignored as long as the View is temporarily detached, under an
assumption that IMM#focusIn(View) will be called back again with a View
that is not temporarily detached when everything is stable.  Hence the
fix is to do so by hooking up View#dispatchFinishTemporaryDetach() to
call IMM#focusIn(View) again when the View is actually focused in the
final state.

 [1]: Ia79bbd8468f768d546354382b47b39dd31ef7bb5
      a4ed0cfcb6885beeb52f701bfc64c393b668f7ba

Bug: 30022872
Bug: 30578745
Bug: 30706985
Change-Id: Iecbdb00dcef8c72e4f7b31035c9bf0f4a40a578f

7 years agoMerge "Not trying to remove admins already being removed" into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 22:38:20 +0000 (22:38 +0000)]
Merge "Not trying to remove admins already being removed" into nyc-mr1-dev

7 years agoImproved the transition when clicking on the last notification
Selim Cinek [Fri, 5 Aug 2016 21:26:51 +0000 (14:26 -0700)]
Improved the transition when clicking on the last notification

In the locked shade, we were returning to the lockscreen when
the last notification was clicked and removed due to autocancel.
We're now not going back there anymore if we're closing.

Change-Id: Idc4c2c145fb2ca308f236b99408cc6096dd02302
Fixes: 30642902

7 years agoReschedule date-change alarm whenever the time is set
Christopher Tate [Fri, 5 Aug 2016 20:21:45 +0000 (13:21 -0700)]
Reschedule date-change alarm whenever the time is set

Bug 30628519

Change-Id: Ic4180b9f3c822f3dfb7e35199f3d058938acf778

7 years agoMerge "Switch volume animation to Scene." into nyc-mr1-dev
Julia Reynolds [Fri, 5 Aug 2016 20:57:13 +0000 (20:57 +0000)]
Merge "Switch volume animation to Scene." into nyc-mr1-dev
am: ba8f3d03ac

Change-Id: I50f8e255809f68385b839d3b8f9caaa7e61e3d6e

7 years agoSwitch volume animation to Scene.
Julia Reynolds [Fri, 5 Aug 2016 20:57:11 +0000 (20:57 +0000)]
Switch volume animation to Scene.
am: 568585b47c

Change-Id: I9060dbf5e8cd60492623c999ee399f42b620b341

7 years agoMerge "Switch volume animation to Scene." into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 20:50:45 +0000 (20:50 +0000)]
Merge "Switch volume animation to Scene." into nyc-mr1-dev

7 years agoMerge "Fix WM missing stack/task when activity is force stopped and restarted" into...
Chong Zhang [Fri, 5 Aug 2016 20:09:34 +0000 (20:09 +0000)]
Merge "Fix WM missing stack/task when activity is force stopped and restarted" into nyc-mr1-dev
am: 82c5197d86

Change-Id: I42e649ee3a8362a5634ef57abf2463621ccd06ec

7 years agoFix WM missing stack/task when activity is force stopped and restarted
Chong Zhang [Fri, 5 Aug 2016 20:09:28 +0000 (20:09 +0000)]
Fix WM missing stack/task when activity is force stopped and restarted
am: d9d35bdfcf

Change-Id: I7f1c5c33cc90c06b0870241e09b96e47e2b58c28

7 years agoMerge "Fix WM missing stack/task when activity is force stopped and restarted" into...
Chong Zhang [Fri, 5 Aug 2016 20:04:54 +0000 (20:04 +0000)]
Merge "Fix WM missing stack/task when activity is force stopped and restarted" into nyc-mr1-dev

7 years agoMerge "Correctly initialize rotation animation hint." into nyc-mr1-dev
Robert Carr [Fri, 5 Aug 2016 19:38:36 +0000 (19:38 +0000)]
Merge "Correctly initialize rotation animation hint." into nyc-mr1-dev
am: 9d90b758c9

Change-Id: I68cdbcafa5b523964a8febc074fb5b2d6c51be0f

7 years agoCorrectly initialize rotation animation hint.
Robert Carr [Fri, 5 Aug 2016 19:38:34 +0000 (19:38 +0000)]
Correctly initialize rotation animation hint.
am: d226512433

Change-Id: I4d17344fba3a55696f0c23d6a03f2dd56b3d2e9e

7 years agoMerge "Correctly initialize rotation animation hint." into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 19:32:48 +0000 (19:32 +0000)]
Merge "Correctly initialize rotation animation hint." into nyc-mr1-dev

7 years agoSwitch volume animation to Scene.
Julia Reynolds [Mon, 25 Jul 2016 12:55:15 +0000 (08:55 -0400)]
Switch volume animation to Scene.

animateLayoutChanges is too janky.

Bug: 30070005
Change-Id: I88bb94c2de18a8ebc14f0f0aed48877a8b328d8a

7 years agoFix WM missing stack/task when activity is force stopped and restarted
Chong Zhang [Fri, 5 Aug 2016 00:55:21 +0000 (17:55 -0700)]
Fix WM missing stack/task when activity is force stopped and restarted

When activity process is force-stopped (like in the case we need to stop
it to allow debugger), activity record is removed and a new instance is
added. Depending on timing, adding of new record could happen before
or after old record is removed. If it added after old record is removed,
then the removal could cause AM to also remove the task AND the stack
(if the activity is the last one).

On WM side however, the task/stack removal could be delayed due to
animation. So when AM attaches a new stack, we end up with two stacks
with the same stack id in the DisplayContent. Also, AM reuses the last
used taskId after it's deleted. So WM is confused and didn't add a new
task record. Then when the delayed stack removal fires everything is gone.

We need to use a different task id when creating a new task record, even
if the last created task is already deleted. Also when attaching a new
stack to WM, first check if we already have such a stack in DisplayContent,
if so, reattach it and don't create a duplicate.

bug: 30465601
Change-Id: Ic399a32c54f6acdcbb9a0c6155599331d55df232

7 years agoMerge "Update setting pickers to use default theme for watches." into cw-f-dev
Michael Kwan [Fri, 5 Aug 2016 19:01:49 +0000 (19:01 +0000)]
Merge "Update setting pickers to use default theme for watches." into cw-f-dev

7 years agoMerge changes from topic 'smooth_unlock' into nyc-mr1-dev
Adrian Roos [Fri, 5 Aug 2016 18:46:23 +0000 (18:46 +0000)]
Merge changes from topic 'smooth_unlock' into nyc-mr1-dev
am: c49dfaf4d6

Change-Id: I7685cacba8cbe6b7e3d42485e0e9b32d9984651b

7 years agoKeyguard: Improve trusted unlock while occluded
Adrian Roos [Fri, 5 Aug 2016 18:46:15 +0000 (18:46 +0000)]
Keyguard: Improve trusted unlock while occluded
am: ddcdecc952

Change-Id: I090d266a7a48e85eee669f13ff595407565d18ff

7 years agoKeyguard: Refactoring for improving trusted unlock while occluded
Adrian Roos [Fri, 5 Aug 2016 18:45:41 +0000 (18:45 +0000)]
Keyguard: Refactoring for improving trusted unlock while occluded
am: d88eb2693b

Change-Id: I91f6bfe7a0573ad31785c5a3d1bff03a24d1107c

7 years agoFixed a bug that could lead to an empty notification
Selim Cinek [Fri, 5 Aug 2016 18:04:37 +0000 (11:04 -0700)]
Fixed a bug that could lead to an empty notification

With sensitive notifications, notification groups could
become empty.

Change-Id: Ibea016c64287d1952db136e038372b778d8febc2
Fixes: 30641080

7 years agoMerge changes from topic 'smooth_unlock' into nyc-mr1-dev
Adrian Roos [Fri, 5 Aug 2016 18:37:27 +0000 (18:37 +0000)]
Merge changes from topic 'smooth_unlock' into nyc-mr1-dev

* changes:
  Keyguard: Improve trusted unlock while occluded
  Keyguard: Refactoring for improving trusted unlock while occluded

7 years agoAdd Connection Event for wifi handover failures.
Tyler Gunn [Fri, 5 Aug 2016 18:22:34 +0000 (11:22 -0700)]
Add Connection Event for wifi handover failures.

Adding a new connection event which Telephony can use to inform upper
layers of a failure to handover to WIFI.

Bug: 30697460
Change-Id: I75da2f956a6b70a9bf4cf7128f29968e08172dc3

7 years agoMerge "Fix "adb backup -shared"" into nyc-mr1-dev
Christopher Tate [Fri, 5 Aug 2016 18:10:35 +0000 (18:10 +0000)]
Merge "Fix "adb backup -shared"" into nyc-mr1-dev
am: b3690ccf2c

Change-Id: I699b5cdf5019390d5be5810fb70d49db6cf36de2

7 years agoFix "adb backup -shared"
Christopher Tate [Fri, 5 Aug 2016 18:10:33 +0000 (18:10 +0000)]
Fix "adb backup -shared"
am: 60af594c3e

Change-Id: I47df84d251e67bc54a5f5c40cfaab65813f170a5

7 years agoMerge "Fix "adb backup -shared"" into nyc-mr1-dev
Chris Tate [Fri, 5 Aug 2016 18:04:23 +0000 (18:04 +0000)]
Merge "Fix "adb backup -shared"" into nyc-mr1-dev

7 years agoCorrectly initialize rotation animation hint.
Robert Carr [Fri, 5 Aug 2016 17:25:21 +0000 (10:25 -0700)]
Correctly initialize rotation animation hint.

In the case of no activity options we won't initialize
it again later, and so we will override the apps request
with a hint of 0 (ROTATION_ANIMATION_ROTATE).

Bug: 30683604
Change-Id: I5eed12adfbb241859503bcd40f15ee82141436d8

7 years agoEnsure Dequeue/Queue duration is always set
John Reck [Fri, 5 Aug 2016 17:50:36 +0000 (10:50 -0700)]
Ensure Dequeue/Queue duration is always set

Bug: 30662749
Change-Id: I35a4c26ce78536fc7a506ec2f92a8b9eecb12ec2

7 years agoMerge "Move EphemeralResolverService" into nyc-mr1-dev
Todd Kennedy [Fri, 5 Aug 2016 17:47:19 +0000 (17:47 +0000)]
Merge "Move EphemeralResolverService" into nyc-mr1-dev
am: 9d9621f472

Change-Id: I561eb0bf4865b6dc8c7d43e0b076c6edbce8eb64

7 years agoMove EphemeralResolverService
Todd Kennedy [Fri, 5 Aug 2016 17:47:17 +0000 (17:47 +0000)]
Move EphemeralResolverService
am: 31b95e0265

Change-Id: I16533b342433fc1042e0d78e1be8e43a431031a6

7 years agoMerge "Move EphemeralResolverService" into nyc-mr1-dev
TreeHugger Robot [Fri, 5 Aug 2016 17:37:34 +0000 (17:37 +0000)]
Merge "Move EphemeralResolverService" into nyc-mr1-dev

7 years agoMerge "Add missing null check to AppErrors#handleAppCrashLocked" into cw-f-dev
TreeHugger Robot [Fri, 5 Aug 2016 17:23:13 +0000 (17:23 +0000)]
Merge "Add missing null check to AppErrors#handleAppCrashLocked" into cw-f-dev