OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:42 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev am: 87c2ed97b8
am: 70f8ca8dff

Change-Id: I8259ec45647b0ac035255ca8e3539fd4d1fe96c5

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:34 +0000 (23:57 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev
am: fc9f55873a

Change-Id: Ifeca3dd4f1a3bfb9f77639c4ee02e0115888bedf

8 years agodocs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
Kevin Hufnagle [Mon, 8 Aug 2016 23:57:31 +0000 (23:57 +0000)]
docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb
am: 7a13b16dcf

Change-Id: I484b8dba5b6dee2a15aa9dfad09b300761b1766e

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Chris Craik [Mon, 8 Aug 2016 23:57:24 +0000 (23:57 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
am: a9bef43149

Change-Id: Ie5049628f5e2f6f1e5baec0db92be30d3b1e2855

8 years agoPrevent EndLayerOps when Begin was rejected
Chris Craik [Mon, 8 Aug 2016 23:57:22 +0000 (23:57 +0000)]
Prevent EndLayerOps when Begin was rejected
am: 3c53ec51ef

Change-Id: I075b68a1b7bdee4cbebd734748dd485ff6cd67b3

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb...
Android Build Merger (Role) [Mon, 8 Aug 2016 23:49:18 +0000 (23:49 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page. am: d4197234bb" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:52 +0000 (23:48 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
am: 87c2ed97b8

Change-Id: I48f91ef763f6591e16751d9ae8fd9d86be277111

8 years agodocs: Revised "Optimizing Content for the Assistant" page.
Kevin Hufnagle [Mon, 8 Aug 2016 23:48:50 +0000 (23:48 +0000)]
docs: Revised "Optimizing Content for the Assistant" page.
am: d4197234bb

Change-Id: Ie85273ed977c06e9b82a77d66a7333e9eca86e10

8 years agoMerge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev
Chris Craik [Mon, 8 Aug 2016 23:44:07 +0000 (23:44 +0000)]
Merge "Prevent EndLayerOps when Begin was rejected" into nyc-mr1-dev

8 years agoMerge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev
Kevin Hufnagle [Mon, 8 Aug 2016 23:35:25 +0000 (23:35 +0000)]
Merge "docs: Revised "Optimizing Content for the Assistant" page." into nyc-dev

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev
Makoto Onuki [Mon, 8 Aug 2016 23:20:45 +0000 (23:20 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev
am: 369c6ebf02

Change-Id: I58aa77cec332d449ec763681e871a79af27e4597

8 years agoShortcutManager improve app udpate check
Makoto Onuki [Mon, 8 Aug 2016 23:20:44 +0000 (23:20 +0000)]
ShortcutManager improve app udpate check
am: 64183d5188

Change-Id: I0d5325d861ad52b186f2c7c9c106f485200fb826

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
Mark Lu [Mon, 8 Aug 2016 23:12:13 +0000 (23:12 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be am: 7f703bde72
am: 66847abba6

Change-Id: If061ef027bb10d651e1b90294b1cdd116fe7b05b

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
Jim Miller [Mon, 8 Aug 2016 23:12:08 +0000 (23:12 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev
am: 6cb5152e9f

Change-Id: Iae245cedd050379b6aad1f807e3d9b71dca221c3

8 years agoFix bug where foreground activity fails to cancel auth/enrollment
Jim Miller [Mon, 8 Aug 2016 23:12:03 +0000 (23:12 +0000)]
Fix bug where foreground activity fails to cancel auth/enrollment
am: 37979c9db0

Change-Id: I486f40d728e2b4bd359c617f31a9032efc6e022b

8 years agoMerge "ShortcutManager improve app udpate check" into nyc-mr1-dev
TreeHugger Robot [Mon, 8 Aug 2016 23:01:42 +0000 (23:01 +0000)]
Merge "ShortcutManager improve app udpate check" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
Mark Lu [Mon, 8 Aug 2016 23:00:15 +0000 (23:00 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev am: a6ee9c1848
am: 325399bfb9

Change-Id: I5105164ff30ea9a285e4e22325ef5c2baa433eeb

8 years agodocs: add info to SharedPreferences.Editor.putString am: fb48521f41
Mark Lu [Mon, 8 Aug 2016 23:00:12 +0000 (23:00 +0000)]
docs: add info to SharedPreferences.Editor.putString am: fb48521f41
am: 9bc63b9bf0

Change-Id: I59a010b5d4d2859ed64cf1ef0684b92ebb9d60d6

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev
Winson Chung [Mon, 8 Aug 2016 23:00:10 +0000 (23:00 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev
am: d983386c31

Change-Id: Idd7551d5e95ad542edcc2c6c310163ca6c20d74c

8 years agodocs: fixed generics in data binding code samples am: b1b5efd3be
Mark Lu [Mon, 8 Aug 2016 23:00:09 +0000 (23:00 +0000)]
docs: fixed generics in data binding code samples am: b1b5efd3be
am: 7f703bde72

Change-Id: Ibc12639849de4edcbcfdaa1c0f543d6f2eb868f8

8 years agoReverting ag/1288123
Winson [Mon, 8 Aug 2016 23:00:07 +0000 (23:00 +0000)]
Reverting ag/1288123
am: 08deff0a67

Change-Id: I13bdc80c790dc1563f6839a98d6dbfce283a2baa

8 years agoMerge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc...
TreeHugger Robot [Mon, 8 Aug 2016 22:55:04 +0000 (22:55 +0000)]
Merge "Fix bug where foreground activity fails to cancel auth/enrollment" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:49:11 +0000 (22:49 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
am: a6ee9c1848

Change-Id: Ief38c0b6b1b61e8fcc060224c298fb3a4711cc94

8 years agodocs: add info to SharedPreferences.Editor.putString
Mark Lu [Mon, 8 Aug 2016 22:49:08 +0000 (22:49 +0000)]
docs: add info to SharedPreferences.Editor.putString
am: fb48521f41

Change-Id: I948c8091a70180e29a601d6cba40d7fb0cf2d76a

8 years agodocs: fixed generics in data binding code samples
Mark Lu [Mon, 8 Aug 2016 22:37:19 +0000 (22:37 +0000)]
docs: fixed generics in data binding code samples
am: b1b5efd3be

Change-Id: Iecafea06866a4579824435467c5dd31859c0dbd4

8 years agoMerge "Reverting ag/1288123" into nyc-mr1-dev
Winson Chung [Mon, 8 Aug 2016 22:33:58 +0000 (22:33 +0000)]
Merge "Reverting ag/1288123" into nyc-mr1-dev

8 years agoMerge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev
Mark Lu [Mon, 8 Aug 2016 22:26:34 +0000 (22:26 +0000)]
Merge "docs: add info to SharedPreferences.Editor.putString" into nyc-dev

8 years agoPrevent EndLayerOps when Begin was rejected
Chris Craik [Mon, 8 Aug 2016 22:15:57 +0000 (15:15 -0700)]
Prevent EndLayerOps when Begin was rejected

bug:30537130

BeginLayerOps were being rejected in a way that allowed the associated
EndLayerOps to still be recorded. This was a violation of DisplayList
content expectations, and caused crashes in FrameBuilder when trying to
play these DisplayLists back.

Change-Id: I531b840aa5c4ffb1ee458da3f4b366978eaeafbe

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 22:04:50 +0000 (22:04 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
am: 8bcd5bc5b0

Change-Id: I660aa6ba9a73788f65fcc9655fdc48cb1b0ef2b5

8 years agoFix currentAnimationTimeMillis to use vsync time
John Reck [Mon, 8 Aug 2016 22:04:48 +0000 (22:04 +0000)]
Fix currentAnimationTimeMillis to use vsync time
am: a2acb4f077

Change-Id: Id70516e3444441ed16afbf658e8a446333eb32ff

8 years agoMerge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev
John Reck [Mon, 8 Aug 2016 21:49:03 +0000 (21:49 +0000)]
Merge "Fix currentAnimationTimeMillis to use vsync time" into nyc-mr1-dev

8 years agoShortcutManager improve app udpate check
Makoto Onuki [Mon, 8 Aug 2016 21:11:34 +0000 (14:11 -0700)]
ShortcutManager improve app udpate check

- Don't use lastUpdateTime for system apps since it's not reliable.

- Scan downgraded apps too.

Bug 30708050
Bug 30734178
Change-Id: I98253f4c635466197548385275ab08c5e3a1a10b

8 years agoMerge "Fix infinite AVD not running" into nyc-mr1-dev
Doris Liu [Mon, 8 Aug 2016 21:23:13 +0000 (21:23 +0000)]
Merge "Fix infinite AVD not running" into nyc-mr1-dev
am: a5dc817c75

Change-Id: Idf7c5b89ea14f53336dd51973845500726552dce

8 years agoFix infinite AVD not running
Doris Liu [Mon, 8 Aug 2016 21:23:10 +0000 (21:23 +0000)]
Fix infinite AVD not running
am: 18e08a0170

Change-Id: I104389d9264c88999e02a5a7547e3f8c382ce0a9

8 years agoMerge "Fix infinite AVD not running" into nyc-mr1-dev
Doris Liu [Mon, 8 Aug 2016 21:03:51 +0000 (21:03 +0000)]
Merge "Fix infinite AVD not running" into nyc-mr1-dev

8 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

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

Change-Id: I4f708fc0eb26ecf4844f4d48b9d87a979fb0d61a

8 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

8 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

8 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

8 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

8 years agoFix infinite AVD not running
Doris Liu [Mon, 8 Aug 2016 19:47:20 +0000 (12:47 -0700)]
Fix infinite AVD not running

This CL fixed an integer overflow error caused by using integer literal
when it should be a float literal that defines a double.

BUG:30739855
Change-Id: If2bdb0eb7a2e93d28434bfe72ec11e8f1f2a1eda

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

Change-Id: I532e5007c2a9152554b8f5130196a2f0cb3c8f1e
Fixes: 30738806

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 years agoFix bug where foreground activity fails to cancel auth/enrollment
Jim Miller [Sat, 6 Aug 2016 01:54:58 +0000 (18:54 -0700)]
Fix bug where foreground activity fails to cancel auth/enrollment

This fixes a bug where the currently authenticating application
can't cancel itself in onPause(). The problem is that some applications
can set FLAG_RESUME_WHILE_PAUSING (like the home screen), which changes
the life cycle of IMPORTANCE_FOREGROUND to be removed before onPause()
completes.  The result is the currently authenticating activity
can't cancel fingerprint authentication or enrollment.

The fix is to allow apps to always cancel themselves.

Fixes bug 30380234

Change-Id: If65c2028014da8d5129506d0b45cc6c1e25f7860

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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

8 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