OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage...
Yi Kong [Fri, 24 Jun 2016 17:01:06 +0000 (17:01 +0000)]
Merge \\"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\\" into stage-aosp-master am: a725dbd6c7
am: 79f65e5d67

Change-Id: I02446be0c5ce1840dcb21b4019b7a02cf0bee3f5

8 years agoMerge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage...
Yi Kong [Fri, 24 Jun 2016 16:55:38 +0000 (16:55 +0000)]
Merge \"Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259\" into stage-aosp-master
am: a725dbd6c7

Change-Id: I06af085c2dad7d63539f66b8049d14a73e49c7cc

8 years agoMerge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage...
Yi Kong [Fri, 24 Jun 2016 16:47:30 +0000 (16:47 +0000)]
Merge "Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259" into stage-aosp-master

8 years agoMerge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
Suprabh Shukla [Fri, 24 Jun 2016 16:36:55 +0000 (16:36 +0000)]
Merge \"Resetting some settings on starting a new demo session\" into nyc-mr1-dev
am: bb1fb395ca

Change-Id: Ic7b7520d4fa3cbfc79be49ded8a4ffd133d2b037

8 years agoMerge "Resetting some settings on starting a new demo session" into nyc-mr1-dev
Amith Yamasani [Fri, 24 Jun 2016 16:08:02 +0000 (16:08 +0000)]
Merge "Resetting some settings on starting a new demo session" into nyc-mr1-dev

8 years agoMerge "Always reapply strings. am: 9c0c3d8d8b am: 630cc3017a" into nyc-mr1-dev-plus...
Android Build Merger (Role) [Fri, 24 Jun 2016 15:22:23 +0000 (15:22 +0000)]
Merge "Always reapply strings. am: 9c0c3d8d8b am: 630cc3017a" into nyc-mr1-dev-plus-aosp

8 years agoAlways reapply strings. am: 9c0c3d8d8b
Julia Reynolds [Fri, 24 Jun 2016 15:21:53 +0000 (15:21 +0000)]
Always reapply strings. am: 9c0c3d8d8b
am: 630cc3017a

Change-Id: I40820f34ff51a4ad690d0fe37c912ac84df5deb9

8 years agoAlways reapply strings. am: 9c0c3d8d8b
Julia Reynolds [Fri, 24 Jun 2016 15:21:51 +0000 (15:21 +0000)]
Always reapply strings. am: 9c0c3d8d8b
am: 6a030524d8

Change-Id: Ic941db9999d8098ab8608dd136822da6e65b36db

8 years agoAlways reapply strings.
Julia Reynolds [Fri, 24 Jun 2016 15:16:36 +0000 (15:16 +0000)]
Always reapply strings.
am: 9c0c3d8d8b

Change-Id: I8e553022cf6f877c3f7394fd365cb4051df2953f

8 years agoAlways reapply strings.
Julia Reynolds [Fri, 24 Jun 2016 15:16:35 +0000 (15:16 +0000)]
Always reapply strings.
am: 9c0c3d8d8b

Change-Id: I20ad505b3cb75319cc81a3dfb6ecfd0fae9ac24a

8 years agoMerge \"Show volume row headers by default.\" into nyc-mr1-dev
Julia Reynolds [Fri, 24 Jun 2016 15:03:02 +0000 (15:03 +0000)]
Merge \"Show volume row headers by default.\" into nyc-mr1-dev
am: 459f594bb1

Change-Id: Ie39c93bec6afa7084ddfe3bca68384f42eaae152

8 years agoMerge "Show volume row headers by default." into nyc-mr1-dev
TreeHugger Robot [Fri, 24 Jun 2016 14:52:39 +0000 (14:52 +0000)]
Merge "Show volume row headers by default." into nyc-mr1-dev

8 years agoShow volume row headers by default.
Julia Reynolds [Wed, 15 Jun 2016 16:53:31 +0000 (12:53 -0400)]
Show volume row headers by default.

Bug: 28269951
Change-Id: I26acfb26064e7f44e4b1897d940228247b45d7b1

8 years agoAlways reapply strings.
Julia Reynolds [Fri, 24 Jun 2016 12:44:57 +0000 (08:44 -0400)]
Always reapply strings.

Change-Id: Icc66d1e23048d2676b5776c3eec76345963228d0
Fixes: 29620816

8 years agoTrack libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:58:07 +0000 (11:58 +0000)]
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a am: ab3d167f06
am: 3606de0fb4

Change-Id: I65867f77e21821fdcd62247bf242def4807f09dd

8 years agoTrack libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:53:57 +0000 (11:53 +0000)]
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
am: ab3d167f06

Change-Id: Ie65f8c8d85ea689c210a40b3ee6373c146488cd1

8 years agoMerge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce0...
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:38:01 +0000 (11:38 +0000)]
Merge \\\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\\" am: 36ce097dbb am: 12bb15c1d3
am: 387191bc64

Change-Id: I4bede82fd01c3a80a67dadf545e9ffdc1ab7c8e0

8 years agoMerge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:33:42 +0000 (11:33 +0000)]
Merge \\"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\\" am: 36ce097dbb
am: 12bb15c1d3

Change-Id: I5a44a8a58c0f90396c95755e919c05fdd500a3cd

8 years agoTrack libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
Przemyslaw Szczepaniak [Wed, 22 Jun 2016 15:51:48 +0000 (16:51 +0100)]
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a

version with test-current.txt

Bug: 28666126
Change-Id: Ib97b5124e0cf28370b0deee81306e761c9bf9059

8 years agoMerge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:23:01 +0000 (11:23 +0000)]
Merge \"Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a\"
am: 36ce097dbb

Change-Id: Ida8dcbbd72df17bbcc49bbccc0cec562d4a6a0e7

8 years agoMerge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"
Przemyslaw Szczepaniak [Fri, 24 Jun 2016 11:16:20 +0000 (11:16 +0000)]
Merge "Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a"

8 years agoTrack libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a
Przemyslaw Szczepaniak [Mon, 20 Jun 2016 16:49:43 +0000 (17:49 +0100)]
Track libcore change 694e617f54a7bfbdad24913ce96f5d56f1a1960a

This change reverts previous fix for b/27582395 and makes
AbstractStringBuffer an Appendable.

Bug: 28666126
Bug: 27582395
Change-Id: I4b1b554fb47f45459eec24801af4ec798fc3039b

8 years agoTrack libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259
Yi Kong [Wed, 22 Jun 2016 13:17:55 +0000 (14:17 +0100)]
Track libcore change fec24735b29faf2a81dbbc35a3a5f9630a597259

Bug: 29067535
Change-Id: Ib0049db9ad5f6dfcdb04598ba288a1d94c32a31c
(cherry picked from commit fdbf33126ee9d4972ccde4e4ac23cf7074b5b3ed)

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f1dc57ea63 -s ours
Bill Yi [Fri, 24 Jun 2016 06:02:31 +0000 (06:02 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f1dc57ea63  -s ours
am: f0101fd5cb  -s ours

Change-Id: I68b6a3c5efc104bcff05b5b52b618102b54b05ac

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad -s ours
Bill Yi [Fri, 24 Jun 2016 06:02:26 +0000 (06:02 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad  -s ours
am: 3e9917dc91  -s ours

Change-Id: I10946d0fa4e33dfedb60c9f3a37318fd4adbd991

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f1dc57ea63 -s ours
Bill Yi [Fri, 24 Jun 2016 05:57:51 +0000 (05:57 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: f1dc57ea63  -s ours
am: 7b07bb374b  -s ours

Change-Id: Id0464b5911357d2fc7e57f3fbcc5649c5bf2652e

8 years agoMerge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad -s ours
Bill Yi [Fri, 24 Jun 2016 05:57:49 +0000 (05:57 +0000)]
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 2bc13bcdad  -s ours
am: b8f7854c9a  -s ours

Change-Id: I71b65664e5aaa02b36d752a9b57c17281225f115

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Fri, 24 Jun 2016 05:53:23 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 97da29c710  -s ours

Change-Id: I42bed2974bc84494f2fa917d91011948fda9c773

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Fri, 24 Jun 2016 05:53:19 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f1dc57ea63  -s ours

Change-Id: I9bf852b6f99959a8bd9f50395115c5d1c4b0850e

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
Bill Yi [Fri, 24 Jun 2016 05:53:19 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 282bf31a0b  -s ours

Change-Id: I1e2e10f46463fc20765fb5c85814b81cf153afba

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Fri, 24 Jun 2016 05:53:16 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 2bc13bcdad  -s ours

Change-Id: I2ff90e0c847b2c99099509802e0b5be4eaa04cff

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Fri, 24 Jun 2016 05:53:11 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: f1dc57ea63  -s ours

Change-Id: Ie112f5004629cdd2fd0216eaa9b94bf4e45c6928

8 years agoMerge \"Import translations. DO NOT MERGE\" into nyc-dev
Bill Yi [Fri, 24 Jun 2016 05:53:08 +0000 (05:53 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 2bc13bcdad  -s ours

Change-Id: Ibaab32fdbf118c13beec0ba8999404492ec9b2e8

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:44:41 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:44:25 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:44:09 +0000 (05:44 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev

8 years agoMerge "Import translations. DO NOT MERGE" into nyc-mr1-dev
TreeHugger Robot [Fri, 24 Jun 2016 05:43:20 +0000 (05:43 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev

8 years agoMerge \\"Improve ANR dropbox reports\\" into nyc-dev am: 594c9cb356
Adrian Roos [Fri, 24 Jun 2016 02:12:40 +0000 (02:12 +0000)]
Merge \\"Improve ANR dropbox reports\\" into nyc-dev am: 594c9cb356
am: ffc89988d2

Change-Id: I55a7d1234befb0df4a767a6410b796cf0a325d9c

8 years agoMerge \\"Improve ANR dropbox reports\\" into nyc-dev am: 594c9cb356
Adrian Roos [Fri, 24 Jun 2016 02:09:22 +0000 (02:09 +0000)]
Merge \\"Improve ANR dropbox reports\\" into nyc-dev am: 594c9cb356
am: fe45e68667

Change-Id: I067c42ea4ec354713ad546c4673fd8e275aa3feb

8 years agoMerge \"Improve ANR dropbox reports\" into nyc-dev
Adrian Roos [Fri, 24 Jun 2016 02:05:26 +0000 (02:05 +0000)]
Merge \"Improve ANR dropbox reports\" into nyc-dev
am: 594c9cb356

Change-Id: Ic3c8b1c5fc1c1b9c2c5e5d8df48d072269a92cc6

8 years agoMerge \"Improve ANR dropbox reports\" into nyc-dev
Adrian Roos [Fri, 24 Jun 2016 02:05:16 +0000 (02:05 +0000)]
Merge \"Improve ANR dropbox reports\" into nyc-dev
am: 594c9cb356

Change-Id: I39fc6a0a96a2df6b6653c802a4c4d5bd769faf84

8 years agoMerge "Improve ANR dropbox reports" into nyc-dev
Adrian Roos [Fri, 24 Jun 2016 01:57:42 +0000 (01:57 +0000)]
Merge "Improve ANR dropbox reports" into nyc-dev

8 years agoMerge "Merge \"Access internal ringer mode to properly vibrate in DND am: dcbdc0df43...
Android Build Merger (Role) [Fri, 24 Jun 2016 01:33:38 +0000 (01:33 +0000)]
Merge "Merge \"Access internal ringer mode to properly vibrate in DND am: dcbdc0df43\" into nyc-mr1-dev am: 15bfd442c2" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev am: e3f410cd59" into...
Android Build Merger (Role) [Fri, 24 Jun 2016 01:33:29 +0000 (01:33 +0000)]
Merge "Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev am: e3f410cd59" into nyc-mr1-dev-plus-aosp

8 years agoMerge \"Access internal ringer mode to properly vibrate in DND am: dcbdc0df43\" into...
Brad Ebinger [Fri, 24 Jun 2016 01:32:59 +0000 (01:32 +0000)]
Merge \"Access internal ringer mode to properly vibrate in DND am: dcbdc0df43\" into nyc-mr1-dev
am: 15bfd442c2

Change-Id: If800b9da1b29f7e72b1110395fc8d6fec5ed03ee

8 years agoMerge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
Jorim Jaggi [Fri, 24 Jun 2016 01:32:49 +0000 (01:32 +0000)]
Merge \"Fix WallpaperInfo API review\" into nyc-mr1-dev
am: e3f410cd59

Change-Id: Id4486196793d8cc82ee6b4a230bf357785a7842f

8 years agoAccess internal ringer mode to properly vibrate in DND am: dcbdc0df43
Brad Ebinger [Fri, 24 Jun 2016 01:32:04 +0000 (01:32 +0000)]
Access internal ringer mode to properly vibrate in DND am: dcbdc0df43
am: bc26a90b51

Change-Id: I5dc1ba9038d4f536397d5ac76f83b5925e1b087c

8 years agoImprove ANR dropbox reports
Adrian Roos [Thu, 23 Jun 2016 23:38:06 +0000 (16:38 -0700)]
Improve ANR dropbox reports

Work towards better diagnosing b/29501073. Adds logic to ensure that the dropbox
entry generated for ANRs fits at least some part of the logcat before the MAX_DROPBOX_SIZE
mark. Also reduces the MAX_DROPBOX_SIZE to be better match size restrictions.

Bug: 29501073
Change-Id: Ice5599582cbb536b7d81aa0c0340ff753ca86ebf

8 years agoMerge "Access internal ringer mode to properly vibrate in DND am: dcbdc0df43" into...
Android Build Merger (Role) [Fri, 24 Jun 2016 01:24:11 +0000 (01:24 +0000)]
Merge "Access internal ringer mode to properly vibrate in DND am: dcbdc0df43" into nyc-mr1-dev

8 years agoMerge "Fix WallpaperInfo API review" into nyc-mr1-dev
TreeHugger Robot [Fri, 24 Jun 2016 01:24:00 +0000 (01:24 +0000)]
Merge "Fix WallpaperInfo API review" into nyc-mr1-dev

8 years agoAccess internal ringer mode to properly vibrate in DND
Brad Ebinger [Fri, 24 Jun 2016 01:23:50 +0000 (01:23 +0000)]
Access internal ringer mode to properly vibrate in DND
am: dcbdc0df43

Change-Id: I70dded64d23290716de5fd7b01ff15b0731daa2f

8 years agoAccess internal ringer mode to properly vibrate in DND
Brad Ebinger [Fri, 24 Jun 2016 01:22:53 +0000 (01:22 +0000)]
Access internal ringer mode to properly vibrate in DND
am: dcbdc0df43

Change-Id: Iaa104e6356b2d78702bf6ee31ddebf0ee2d5772f

8 years agoAccess internal ringer mode to properly vibrate in DND
Brad Ebinger [Fri, 24 Jun 2016 00:42:30 +0000 (17:42 -0700)]
Access internal ringer mode to properly vibrate in DND

Currently, an incoming call will not vibrate properly in certain cases
in DND mode. Specifically, if Priority Only mode is set, but Calls from
anyone are allowed. We now get the internal ringer mode to detect if the
incoming call is ringing while in DND mode.

Bug: 29184073
Change-Id: I1e0e7cf384a2bc1df1378043cd3f7e9dec57a94c

8 years agoResetting some settings on starting a new demo session
Suprabh Shukla [Wed, 15 Jun 2016 20:19:28 +0000 (13:19 -0700)]
Resetting some settings on starting a new demo session

Muting ringer and media volume and turning off the flashlight
before starting a new session. Also, resetting the configuration of any
new demo user to the configuration of user 0 on the device. Moved
RetailDemoModeService and RetailDemoModeServiceInternal to more
appropriate new packages

Bug: 29519612
Change-Id: Ib65f89ce61afab2d2f1b2dd0c761f5d35a466181

8 years agoMerge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
Dmitri Plotnikov [Fri, 24 Jun 2016 00:32:44 +0000 (00:32 +0000)]
Merge \"Unhiding DEVICE_NAME\" into nyc-mr1-dev
am: b1ca092db8

Change-Id: Icdb1cef5802c4d2b22292874ab3139a132fe7bd0

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 24 Jun 2016 00:26:51 +0000 (17:26 -0700)]
Import translations. DO NOT MERGE

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

8 years agoMerge "Unhiding DEVICE_NAME" into nyc-mr1-dev
Dmitri Plotnikov [Fri, 24 Jun 2016 00:23:12 +0000 (00:23 +0000)]
Merge "Unhiding DEVICE_NAME" into nyc-mr1-dev

8 years agoImport translations. DO NOT MERGE
Bill Yi [Fri, 24 Jun 2016 00:07:49 +0000 (17:07 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 23 Jun 2016 23:57:49 +0000 (16:57 -0700)]
Import translations. DO NOT MERGE

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

8 years agoImport translations. DO NOT MERGE
Bill Yi [Thu, 23 Jun 2016 23:34:21 +0000 (16:34 -0700)]
Import translations. DO NOT MERGE

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

8 years agoFix WallpaperInfo API review
Jorim Jaggi [Thu, 23 Jun 2016 23:25:52 +0000 (16:25 -0700)]
Fix WallpaperInfo API review

Change-Id: I395b9617038450e6fa7a2f25bb55d6ae5f761015
Fixes: 29514598

8 years agoMerge \"Adding a warning dialog before restarting demo session\" into nyc-mr1-dev
Suprabh Shukla [Thu, 23 Jun 2016 23:21:18 +0000 (23:21 +0000)]
Merge \"Adding a warning dialog before restarting demo session\" into nyc-mr1-dev
am: 33657640ec

Change-Id: I7c3242f4fce4b4b29d4bfac4ea04fbd92e013bb1

8 years agoDocs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e am: 391e0808d6
Hemal Patel [Thu, 23 Jun 2016 23:14:59 +0000 (23:14 +0000)]
Docs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e am: 391e0808d6
am: 631a8dcb5d

Change-Id: Ia9fc00074a340e8fe9eb6fa35190d55ab1732adf

8 years agoMerge "Adding a warning dialog before restarting demo session" into nyc-mr1-dev
Suprabh Shukla [Thu, 23 Jun 2016 23:11:47 +0000 (23:11 +0000)]
Merge "Adding a warning dialog before restarting demo session" into nyc-mr1-dev

8 years agoDocs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e am: 391e0808d6
Hemal Patel [Thu, 23 Jun 2016 23:10:47 +0000 (23:10 +0000)]
Docs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e am: 391e0808d6
am: 10756802ba

Change-Id: I358f19c1fc8823e27f1035fe04063f0c8cec6b8f

8 years agoMerge \"fix last modified time\" into nyc-mr1-dev
Todd Kennedy [Thu, 23 Jun 2016 23:07:56 +0000 (23:07 +0000)]
Merge \"fix last modified time\" into nyc-mr1-dev
am: d73d2a3a3d

Change-Id: I683eb8fd08ed35d2e2d99e2b70ae635873d1943e

8 years agoDocs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e
Hemal Patel [Thu, 23 Jun 2016 23:06:35 +0000 (23:06 +0000)]
Docs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e
am: 391e0808d6

Change-Id: I3128cc76cd0355a9cf0649b00003c158ebddb25b

8 years agoDocs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e
Hemal Patel [Thu, 23 Jun 2016 23:06:28 +0000 (23:06 +0000)]
Docs: Fixed wrong link text am: 9e9d2c7fba am: 1727bb369e
am: 391e0808d6

Change-Id: Ibf5bd96b2b2832b20fbf0d352aa3dc5602d40b9c

8 years agoMerge "fix last modified time" into nyc-mr1-dev
Todd Kennedy [Thu, 23 Jun 2016 23:02:34 +0000 (23:02 +0000)]
Merge "fix last modified time" into nyc-mr1-dev

8 years agoDocs: Fixed wrong link text am: 9e9d2c7fba
Hemal Patel [Thu, 23 Jun 2016 22:59:38 +0000 (22:59 +0000)]
Docs: Fixed wrong link text am: 9e9d2c7fba
am: 1727bb369e

Change-Id: I655d77ccdc8586b348bd61309cd8cfba012113b8

8 years agoDocs: Fixed wrong link text
Hemal Patel [Thu, 23 Jun 2016 22:54:30 +0000 (22:54 +0000)]
Docs: Fixed wrong link text
am: 9e9d2c7fba

Change-Id: I0d66075bb75a2f4cc809d2df698c4acec5234187

8 years agoMerge \\"fix bad contrast in table links by switching to normal table cells instead...
Scott Main [Thu, 23 Jun 2016 22:19:09 +0000 (22:19 +0000)]
Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379
am: b8516f1029

Change-Id: Id654ecb19af760a198e7e709b1de7e9efb7e3acd

8 years agoMerge "Merge \\"fix bad contrast in table links by switching to normal table cells...
Android Build Merger (Role) [Thu, 23 Jun 2016 22:10:48 +0000 (22:10 +0000)]
Merge "Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379 am: 8c9bd9cb28" into nyc-mr1-dev-plus-aosp

8 years agoMerge \\"fix bad contrast in table links by switching to normal table cells instead...
Scott Main [Thu, 23 Jun 2016 22:10:29 +0000 (22:10 +0000)]
Merge \\"fix bad contrast in table links by switching to normal table cells instead of headings.\\" into nyc-dev am: fd0eeb0379
am: 8c9bd9cb28

Change-Id: I557f9300ab69486a26f30bed5a244baee43319e7

8 years agoMerge \"Revert \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE...
Roozbeh Pournader [Thu, 23 Jun 2016 22:09:03 +0000 (22:09 +0000)]
Merge \"Revert \"Revert \"Mark Serbian in Latin script as non-localized [DO NOT MERGE]\"\"\" into nyc-mr1-dev
am: 60882f517d

Change-Id: Ic0efed4a1c500fe021ee4244708bcda99f91f68e

8 years agoMerge \"fix bad contrast in table links by switching to normal table cells instead...
smain@google.com [Thu, 23 Jun 2016 22:06:07 +0000 (22:06 +0000)]
Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I68b578ac0bb343dff66bcbc5bd5c652c93e9864f

8 years agoMerge \"fix bad contrast in table links by switching to normal table cells instead...
smain@google.com [Thu, 23 Jun 2016 22:05:07 +0000 (22:05 +0000)]
Merge \"fix bad contrast in table links by switching to normal table cells instead of headings.\" into nyc-dev
am: fd0eeb0379

Change-Id: I3662c41848c20bfde90dcd453917e67f93693e74

8 years agoMerge "Merge \"Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea39160...
Android Build Merger (Role) [Thu, 23 Jun 2016 21:59:26 +0000 (21:59 +0000)]
Merge "Merge \"Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063\" into nyc-mr1-dev am: 1ecbced5cb" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Merge \"Print names of observers causing timeout\" into nyc-mr1-dev am: 38d789...
Android Build Merger (Role) [Thu, 23 Jun 2016 21:59:19 +0000 (21:59 +0000)]
Merge "Merge \"Print names of observers causing timeout\" into nyc-mr1-dev am: 38d7897690" into nyc-mr1-dev-plus-aosp

8 years agoMerge "Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE...
Roozbeh Pournader [Thu, 23 Jun 2016 21:58:56 +0000 (21:58 +0000)]
Merge "Revert "Revert "Mark Serbian in Latin script as non-localized [DO NOT MERGE]""" into nyc-mr1-dev

8 years agoMerge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063
Min Yun [Thu, 23 Jun 2016 21:58:54 +0000 (21:58 +0000)]
Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063
am: 09190840e0

Change-Id: I298d4f7b684aaa2e0b967fbbadcb72e37fa41ce3

8 years agoMerge \"Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063...
Min Yun [Thu, 23 Jun 2016 21:58:43 +0000 (21:58 +0000)]
Merge \"Merge \\"Fix guts are not bound properly.\\" into nyc-dev am: 9ea3916063\" into nyc-mr1-dev
am: 1ecbced5cb

Change-Id: If62b270ca54aeca613115ea90b88d32a048bdd95

8 years agoMerge \"Print names of observers causing timeout\" into nyc-mr1-dev
Fyodor Kupolov [Thu, 23 Jun 2016 21:58:36 +0000 (21:58 +0000)]
Merge \"Print names of observers causing timeout\" into nyc-mr1-dev
am: 38d7897690

Change-Id: I45f06a2167e11733829c660c7baaae3996d8c7eb

8 years agoMerge "fix bad contrast in table links by switching to normal table cells instead...
Scott Main [Thu, 23 Jun 2016 21:57:51 +0000 (21:57 +0000)]
Merge "fix bad contrast in table links by switching to normal table cells instead of headings." into nyc-dev

8 years agoAdding a warning dialog before restarting demo session
Suprabh Shukla [Tue, 14 Jun 2016 23:28:23 +0000 (16:28 -0700)]
Adding a warning dialog before restarting demo session

Instead of immediately restarting the demo after user inactivity timeout,
now the system shows a warning dialog that counts down for 6 seconds,
during which the user can choose to continue the current session or
restart the session immediately.

Bug: 29520255
Change-Id: I060f700dcbbb6f64ae5fe95e3f3027bc3c33b38d

8 years agoMerge \"Fix guts are not bound properly.\" into nyc-dev
Min Yun [Thu, 23 Jun 2016 21:53:12 +0000 (21:53 +0000)]
Merge \"Fix guts are not bound properly.\" into nyc-dev
am: 9ea3916063

Change-Id: I4335a5f347e4cbac21e34b64435fda4421235d31

8 years agoMerge "Merge \"Fix guts are not bound properly.\" into nyc-dev am: 9ea3916063" into...
Android Build Merger (Role) [Thu, 23 Jun 2016 21:50:14 +0000 (21:50 +0000)]
Merge "Merge \"Fix guts are not bound properly.\" into nyc-dev am: 9ea3916063" into nyc-mr1-dev

8 years agoMerge \"Fix guts are not bound properly.\" into nyc-dev
Min Yun [Thu, 23 Jun 2016 21:49:55 +0000 (21:49 +0000)]
Merge \"Fix guts are not bound properly.\" into nyc-dev
am: 9ea3916063

Change-Id: I3adc7f367792e30bdf61067ea367436a22ef5842

8 years agoMerge "Print names of observers causing timeout" into nyc-mr1-dev
Fyodor Kupolov [Thu, 23 Jun 2016 21:49:04 +0000 (21:49 +0000)]
Merge "Print names of observers causing timeout" into nyc-mr1-dev

8 years agoMerge "Fix guts are not bound properly." into nyc-dev
TreeHugger Robot [Thu, 23 Jun 2016 21:45:58 +0000 (21:45 +0000)]
Merge "Fix guts are not bound properly." into nyc-dev

8 years agoMerge \"Merge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev...
Adrian Roos [Thu, 23 Jun 2016 21:41:20 +0000 (21:41 +0000)]
Merge \"Merge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev am: cdd43d7270\" into nyc-mr1-dev
am: 0cacb14c4e

Change-Id: I66281c7bd349cbff3b0bb4bda6859744a5e2cbb4

8 years agoMerge \"Merge \\"media: update getAchievableFrameRatesFor javadoc\\" into nyc-dev...
Lajos Molnar [Thu, 23 Jun 2016 21:41:17 +0000 (21:41 +0000)]
Merge \"Merge \\"media: update getAchievableFrameRatesFor javadoc\\" into nyc-dev am: 8fe82686ef\" into nyc-mr1-dev
am: 5bebba2124

Change-Id: I8cc3ede6d87db8625ae8d0a3aa4ffb657c53e700

8 years agoMerge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev
Chong Zhang [Thu, 23 Jun 2016 21:41:12 +0000 (21:41 +0000)]
Merge \"Do not send unhandled system config changes to app\" into nyc-mr1-dev
am: 568507abf5

Change-Id: I4a711464f49c44f329e51d781dbe0eb4886d9c98

8 years agoMerge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev am: cdd43d7270
Adrian Roos [Thu, 23 Jun 2016 21:37:23 +0000 (21:37 +0000)]
Merge \\"HUN: Close RemoteInputView when Home is pressed\\" into nyc-dev am: cdd43d7270
am: 1a215e8f9b

Change-Id: I568001fbd23283f5cbf3a120a61dae570377b94a

8 years agoMerge \\"media: update getAchievableFrameRatesFor javadoc\\" into nyc-dev am: 8fe82686ef
Lajos Molnar [Thu, 23 Jun 2016 21:37:21 +0000 (21:37 +0000)]
Merge \\"media: update getAchievableFrameRatesFor javadoc\\" into nyc-dev am: 8fe82686ef
am: a4b5454f73

Change-Id: I7956d4b3124da0ee9a5f9c176f1b44b877fe162f

8 years agoMerge "Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev am...
Android Build Merger (Role) [Thu, 23 Jun 2016 21:34:38 +0000 (21:34 +0000)]
Merge "Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev am: cdd43d7270" into nyc-mr1-dev

8 years agoMerge "Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev am...
Android Build Merger (Role) [Thu, 23 Jun 2016 21:34:30 +0000 (21:34 +0000)]
Merge "Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev am: 8fe82686ef" into nyc-mr1-dev

8 years agoMerge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev
Adrian Roos [Thu, 23 Jun 2016 21:34:03 +0000 (21:34 +0000)]
Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev
am: cdd43d7270

Change-Id: Id463ad12a2e302e869e504a95664d1dab89f793f

8 years agoMerge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev
Lajos Molnar [Thu, 23 Jun 2016 21:34:00 +0000 (21:34 +0000)]
Merge \"media: update getAchievableFrameRatesFor javadoc\" into nyc-dev
am: 8fe82686ef

Change-Id: I5c30373ad5d6eed29e953a81e89d60a6c649089b

8 years agoMerge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev
Adrian Roos [Thu, 23 Jun 2016 21:33:55 +0000 (21:33 +0000)]
Merge \"HUN: Close RemoteInputView when Home is pressed\" into nyc-dev
am: cdd43d7270

Change-Id: I8b937034ffcf5e9c7d4caf30ba8325e882cf6564