git.osdn.net Git - android-x86/frameworks-base.git/log

Adrian Roos [Thu, 21 Aug 2014 00:57:17 +0000 (00:57 +0000)]

am 6e0891fd: am 4e399ae7: am e0f85cb7: Only show face unlock indication if it applies

* commit '6e0891fd0d335e2f2feb376ce6fb5e93d5bf7608':
Only show face unlock indication if it applies

commit | commitdiff | tree

Christian Robertson [Thu, 21 Aug 2014 00:57:12 +0000 (00:57 +0000)]

am f6134a72: am e3f4e333: am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

* commit 'f6134a72113066c35bfc42b476bfea7710f54bc1':
Updated set of geometric navigation bar icon assets

commit | commitdiff | tree

RoboErik [Thu, 21 Aug 2014 00:57:08 +0000 (00:57 +0000)]

am 666360cb: am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

* commit '666360cbe70a3c482b16a0fd438a3f10d0fcf643':
Api updates to MediaSession components

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:51:09 +0000 (00:51 +0000)]

am bc3bd0a4: am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'bc3bd0a4e67a00bcde97f297e6d8743bcac7f2df':
Clean up ExceptionOccurred.

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:51:05 +0000 (00:51 +0000)]

am a13e69f1: am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."

* commit 'a13e69f1ab0f03bb9afbe0578d1599d25d04aaf2':
Remove unnecessary explicit GC in ZygoteInit.

commit | commitdiff | tree

Adrian Roos [Thu, 21 Aug 2014 00:44:16 +0000 (00:44 +0000)]

am 4e399ae7: am e0f85cb7: Only show face unlock indication if it applies

* commit '4e399ae720008acb61efdc52e3fd9b591e3e2220':
Only show face unlock indication if it applies

commit | commitdiff | tree

Christian Robertson [Thu, 21 Aug 2014 00:44:09 +0000 (00:44 +0000)]

am e3f4e333: am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

* commit 'e3f4e333af46a903459023e471982455b17f60dd':
Updated set of geometric navigation bar icon assets

commit | commitdiff | tree

RoboErik [Thu, 21 Aug 2014 00:44:03 +0000 (00:44 +0000)]

am 8961b5d5: am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

* commit '8961b5d5ac341ca7ae239569e962f7ff3437f312':
Api updates to MediaSession components

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:02:38 +0000 (00:02 +0000)]

am be39e991: am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit 'be39e99187eec88222722e9ec4c91f1744731cf4':
Clean up ExceptionOccurred.

commit | commitdiff | tree

Mathieu Chartier [Thu, 21 Aug 2014 00:02:12 +0000 (00:02 +0000)]

am 554bd893: am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."

* commit '554bd8937b60e8f015f1f46b939dff92c2259790':
Remove unnecessary explicit GC in ZygoteInit.

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:49:56 +0000 (23:49 +0000)]

am 977c4a5b: Merge "Clean up ExceptionOccurred."

* commit '977c4a5b81317cdf6537e58f82a5edcd0641ca50':
Clean up ExceptionOccurred.

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:49:12 +0000 (23:49 +0000)]

am 8f9ebc8a: Merge "Remove unnecessary explicit GC in ZygoteInit."

* commit '8f9ebc8a7c0238ce85104d2f20d0ddad1e4d8696':
Remove unnecessary explicit GC in ZygoteInit.

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:31:38 +0000 (23:31 +0000)]

Merge "Clean up ExceptionOccurred."

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 17:04:08 +0000 (10:04 -0700)]

Clean up ExceptionOccurred.

Use ExceptionCheck before ExceptionOccurred since ExceptionCheck
doesn't acquire any locks and is faster.

Change-Id: Ibd87fd1e33b339bd2a6effa1d20d3253c8a61bdc

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 23:17:06 +0000 (23:17 +0000)]

Merge "Remove unnecessary explicit GC in ZygoteInit."

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 20:07:27 +0000 (20:07 +0000)]

am e0f85cb7: Only show face unlock indication if it applies

* commit 'e0f85cb7ab0431f627f5c14f7b85db38903a44ae':
Only show face unlock indication if it applies

commit | commitdiff | tree

Christian Robertson [Wed, 20 Aug 2014 19:57:13 +0000 (19:57 +0000)]

am 8f1b2a4a: Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

* commit '8f1b2a4adacbd8abea097bd1797d9d7ec1bb6bed':
Updated set of geometric navigation bar icon assets

commit | commitdiff | tree

RoboErik [Wed, 20 Aug 2014 19:57:08 +0000 (19:57 +0000)]

am 7a754ab3: Merge "Api updates to MediaSession components" into lmp-dev

* commit '7a754ab331d6832034b5188584c51139f44bf629':
Api updates to MediaSession components

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 15:41:44 +0000 (17:41 +0200)]

Only show face unlock indication if it applies

When trust is not managed or the indication is set for
a different than the current user, don't show it on the
lock screen.

Bug: 17034124
Change-Id: Ia470520d6bd05db8417b3b0bb1f55894f791554e

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:33:36 +0000 (19:33 +0000)]

am e0eba745: (-s ours) am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit 'e0eba7457c680585aec754a516981d713109649e':
remove passpoint, except ANQP - DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 19:33:32 +0000 (19:33 +0000)]

am 4f6d1458: am cb640c62: am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit '4f6d1458e280ce1be3a82e09c5e4cb174d9c58c3':
Implement trust managed visuals

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Aug 2014 19:33:23 +0000 (19:33 +0000)]

am 5066ef8a: am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '5066ef8a448a74619fa0083caf89eb3f925021cf':
Fix crash when launching Activities in 'android' package

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 19:33:19 +0000 (19:33 +0000)]

am 2cb54809: am c3dbfd16: am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev

* commit '2cb54809de3d673c5f221f2472c9fdcf9b040470':
Remove battery color when in power save

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 19:33:10 +0000 (19:33 +0000)]

am 0b972d9d: am d59026ba: am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev

* commit '0b972d9df92b88adb4b62b8c521142f3919e2235':
Announcing quick settings changes now via talkback

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:26:13 +0000 (19:26 +0000)]

am 3a7bbbff: am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit '3a7bbbff1e526dce660fc1d08113167134402b75':
remove passpoint, except ANQP - DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 19:26:08 +0000 (19:26 +0000)]

am cb640c62: am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit 'cb640c625d063a757b5deb9b15a971745aacb8d6':
Implement trust managed visuals

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Aug 2014 19:26:03 +0000 (19:26 +0000)]

am 7224e1b2: am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '7224e1b20c3f0be88ea8fc2daa9144cf68f091d9':
Fix crash when launching Activities in 'android' package

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 19:25:58 +0000 (19:25 +0000)]

am c3dbfd16: am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev

* commit 'c3dbfd1673ef88bf43c7fd23d421ca6155c30217':
Remove battery color when in power save

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 19:25:53 +0000 (19:25 +0000)]

am d59026ba: am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev

* commit 'd59026baf0b1aa94f02e6f38672bce653b994a4f':
Announcing quick settings changes now via talkback

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:13:26 +0000 (19:13 +0000)]

am 14aa17a2: Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

* commit '14aa17a230d141c9a1f4478f4fc85d5263080c47':
remove passpoint, except ANQP - DO NOT MERGE

commit | commitdiff | tree

Adrian Roos [Wed, 20 Aug 2014 19:13:21 +0000 (19:13 +0000)]

am 68d3e6c7: Merge "Implement trust managed visuals" into lmp-dev

* commit '68d3e6c797efa43fa0852ae7583c554463938059':
Implement trust managed visuals

commit | commitdiff | tree

Adam Lesinski [Wed, 20 Aug 2014 19:13:17 +0000 (19:13 +0000)]

am 7d98d0a0: Merge "Fix crash when launching Activities in \'android\' package" into lmp-dev

* commit '7d98d0a0c57232d5c00b823cf8ff4fa6ff643e06':
Fix crash when launching Activities in 'android' package

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 19:13:12 +0000 (19:13 +0000)]

am f28c44b9: Merge "Remove battery color when in power save" into lmp-dev

* commit 'f28c44b963d09d0f3f8a7515644e48144b214ac2':
Remove battery color when in power save

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 19:13:07 +0000 (19:13 +0000)]

am ffb5acc3: Merge "Announcing quick settings changes now via talkback" into lmp-dev

* commit 'ffb5acc3d82c67fa8ced8a7d2b699620241ec6d2':
Announcing quick settings changes now via talkback

commit | commitdiff | tree

Christian Robertson [Wed, 20 Aug 2014 19:54:16 +0000 (19:54 +0000)]

Merge "Updated set of geometric navigation bar icon assets" into lmp-dev

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 18:08:20 +0000 (18:08 +0000)]

am d2affeca: am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev

* commit 'd2affecab253cd4e96a7b4c67fa2e38bc89df122':
Add outlineProvider attribute

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 18:08:15 +0000 (18:08 +0000)]

am 807659ea: am 5edc6c50: am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev

* commit '807659ea9447402cba1975d0960ae22334c52e26':
Make getOutline account for gravity BitmapDrawable

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:59:56 +0000 (17:59 +0000)]

am c8028af9: am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev

* commit 'c8028af9f90268db55547b56fd0dc242bb7d9053':
Add outlineProvider attribute

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:59:52 +0000 (17:59 +0000)]

am 5edc6c50: am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev

* commit '5edc6c500490bbb9d36b6122106ccb291e1cfe78':
Make getOutline account for gravity BitmapDrawable

commit | commitdiff | tree

Mathieu Chartier [Wed, 20 Aug 2014 17:24:11 +0000 (10:24 -0700)]

Remove unnecessary explicit GC in ZygoteInit.

Removes > 1s of GC time and hundreds of GC during device boot.

Zygote size before: 8388608
Zygote size after: 8388608

No increase in zygote space size due to zygote compaction.

Bug: 16398684

Change-Id: I3c6f5a0b26a207ab39bb0a952400d7488e42f00c

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:47:00 +0000 (17:47 +0000)]

am 1ada8566: Merge "Add outlineProvider attribute" into lmp-dev

* commit '1ada856628fb56518b438a45d0b66693d7eef185':
Add outlineProvider attribute

commit | commitdiff | tree

Chris Craik [Wed, 20 Aug 2014 17:46:55 +0000 (17:46 +0000)]

am 4fe137c7: Merge "Make getOutline account for gravity BitmapDrawable" into lmp-dev

* commit '4fe137c71378711bf1cb09286341f90c2a5d59e2':
Make getOutline account for gravity BitmapDrawable

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 17:21:47 +0000 (17:21 +0000)]

am f367ca32: am 87aa9654: am b055471f: Merge "Make alarm invisible when going to detail in QS" into lmp-dev

* commit 'f367ca32dd2eaa13562cba031913f0adf7699a70':
Make alarm invisible when going to detail in QS

commit | commitdiff | tree

Nicolas Prevot [Wed, 20 Aug 2014 17:21:42 +0000 (17:21 +0000)]

am 965857ec: am 7270d1f3: am 5d6c6120: Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev

* commit '965857ecb7c7ef41bfbbca676d9103909865b3b4':
Allow the system in other users to call startActivityAsCaller.

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 17:12:31 +0000 (17:12 +0000)]

am 87aa9654: am b055471f: Merge "Make alarm invisible when going to detail in QS" into lmp-dev

* commit '87aa965447505c2981871871e89110d4398e2460':
Make alarm invisible when going to detail in QS

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 17:12:29 +0000 (17:12 +0000)]

am 8b4286de: am c58697ad: am b79e1367: Merge "Copy framework internal resources for indeterminate anim." into lmp-dev

* commit '8b4286de024df898fce34468c9ca9a6271424bc2':
Copy framework internal resources for indeterminate anim.

commit | commitdiff | tree

Nicolas Prevot [Wed, 20 Aug 2014 17:12:26 +0000 (17:12 +0000)]

am 7270d1f3: am 5d6c6120: Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev

* commit '7270d1f33272398613e8dffcd780ccab450f5133':
Allow the system in other users to call startActivityAsCaller.

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 17:03:07 +0000 (17:03 +0000)]

am c58697ad: am b79e1367: Merge "Copy framework internal resources for indeterminate anim." into lmp-dev

* commit 'c58697ad299e106fa7de0b597f77416205ed1610':
Copy framework internal resources for indeterminate anim.

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 17:02:42 +0000 (17:02 +0000)]

am b055471f: Merge "Make alarm invisible when going to detail in QS" into lmp-dev

* commit 'b055471f10a7c705328ad8a5f6e5e82e3da90ffb':
Make alarm invisible when going to detail in QS

commit | commitdiff | tree

Nicolas Prevot [Wed, 20 Aug 2014 17:02:39 +0000 (17:02 +0000)]

am 5d6c6120: Merge "Allow the system in other users to call startActivityAsCaller." into lmp-dev

* commit '5d6c612084f2c2dc002b61c8fbf7c23ff9a2ce1c':
Allow the system in other users to call startActivityAsCaller.

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 16:54:45 +0000 (16:54 +0000)]

am b79e1367: Merge "Copy framework internal resources for indeterminate anim." into lmp-dev

* commit 'b79e13674193193bbf82a02759c3a9636b385c1d':
Copy framework internal resources for indeterminate anim.

commit | commitdiff | tree

Santos Cordon [Wed, 20 Aug 2014 16:31:17 +0000 (16:31 +0000)]

am f86dcf80: am 13de398d: am 3715de8f: Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev

* commit 'f86dcf808f2f774a572c008520c7749a87d89f0d':
Made all classes required for an InCallService @SystemApi

commit | commitdiff | tree

Justin Koh [Wed, 20 Aug 2014 16:31:12 +0000 (16:31 +0000)]

am 30925aab: am c88da6d5: am e6a59a4c: Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev

* commit '30925aab2022ee962aee6a445bcf521b1816e93e':
Add check to allow notification listener packages to post >50 notifications

commit | commitdiff | tree

Santos Cordon [Wed, 20 Aug 2014 16:24:37 +0000 (16:24 +0000)]

am 13de398d: am 3715de8f: Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev

* commit '13de398dc86d8b52a1f56a95601ee073cd564039':
Made all classes required for an InCallService @SystemApi

commit | commitdiff | tree

Justin Koh [Wed, 20 Aug 2014 16:24:33 +0000 (16:24 +0000)]

am c88da6d5: am e6a59a4c: Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev

* commit 'c88da6d5c5cbf0ef68cb932d8cb877ae6b0b53af':
Add check to allow notification listener packages to post >50 notifications

commit | commitdiff | tree

Jason Monk [Wed, 20 Aug 2014 16:16:07 +0000 (16:16 +0000)]

am 3ea52e3a: am 202b67f0: am abd834f3: Merge "Add hotspot tile to defaults" into lmp-dev

* commit '3ea52e3a26297eeb98b7dc9e5e46462ca7403f09':
Add hotspot tile to defaults

commit | commitdiff | tree

John Reck [Wed, 20 Aug 2014 16:16:02 +0000 (16:16 +0000)]

am ed0296bd: am 7d6636fa: am 0d0dbcb0: Merge "Don\'t use Animator:reverse()" into lmp-dev

* commit 'ed0296bdee4a4fba2668a407021a48fc2a58df36':
Don't use Animator:reverse()

commit | commitdiff | tree

Santos Cordon [Wed, 20 Aug 2014 16:14:19 +0000 (16:14 +0000)]

am 3715de8f: Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev

* commit '3715de8f0e969c892f8a153627110f092e5527fb':
Made all classes required for an InCallService @SystemApi

commit | commitdiff | tree

Justin Koh [Wed, 20 Aug 2014 16:14:14 +0000 (16:14 +0000)]

am e6a59a4c: Merge "Add check to allow notification listener packages to post >50 notifications" into lmp-dev

* commit 'e6a59a4c42c4c9e60a69abef966202024640f867':
Add check to allow notification listener packages to post >50 notifications

commit | commitdiff | tree

Jason Monk [Wed, 20 Aug 2014 16:06:28 +0000 (16:06 +0000)]

am 202b67f0: am abd834f3: Merge "Add hotspot tile to defaults" into lmp-dev

* commit '202b67f0326fe022fed56b92c9b2675c4ea50bbd':
Add hotspot tile to defaults

commit | commitdiff | tree

vandwalle [Wed, 20 Aug 2014 19:07:07 +0000 (19:07 +0000)]

Merge "remove passpoint, except ANQP - DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

John Reck [Wed, 20 Aug 2014 16:06:23 +0000 (16:06 +0000)]

am 7d6636fa: am 0d0dbcb0: Merge "Don\'t use Animator:reverse()" into lmp-dev

* commit '7d6636fa60f5b63c983c80cf19d3bd1ff6245b28':
Don't use Animator:reverse()

commit | commitdiff | tree

Jason Monk [Wed, 20 Aug 2014 15:59:01 +0000 (15:59 +0000)]

am abd834f3: Merge "Add hotspot tile to defaults" into lmp-dev

* commit 'abd834f3d31c2b222decbf484818be1bef9cc4ef':
Add hotspot tile to defaults

commit | commitdiff | tree

John Reck [Wed, 20 Aug 2014 15:58:56 +0000 (15:58 +0000)]

am 0d0dbcb0: Merge "Don\'t use Animator:reverse()" into lmp-dev

* commit '0d0dbcb012596d063d52749298e84bd50c591b7b':
Don't use Animator:reverse()

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 15:56:30 +0000 (15:56 +0000)]

am de0ac909: am 8cf86b66: am 7fda5cd7: Merge "Fix crash when reset() gets called during an animation" into lmp-dev

* commit 'de0ac909e2dee751865c821db486cdb37e49c7bf':
Fix crash when reset() gets called during an animation

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 15:48:24 +0000 (15:48 +0000)]

am 10c11997: am 6d0ec4c0: am 69213844: Merge "Fix QS expansion weirdness #2" into lmp-dev

* commit '10c119978b2163a09449ce26e65b21b5662a3d4f':
Fix QS expansion weirdness #2

commit | commitdiff | tree

Jason Monk [Wed, 20 Aug 2014 15:48:19 +0000 (15:48 +0000)]

am 7f529ddc: am 7c088477: am 98a04b1a: Merge "Update the QS footer from UI thread" into lmp-dev

* commit '7f529ddc2103bcd29903f50f0c04cea6e7b9a810':
Update the QS footer from UI thread

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:48:14 +0000 (15:48 +0000)]

am 88a7300f: am 9d55c074: am 3422f40e: Merge "PowerUI: Remove the fallback dialogs." into lmp-dev

* commit '88a7300f5e0ff04cf053b9299990f1d068380195':
PowerUI: Remove the fallback dialogs.

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:48:09 +0000 (15:48 +0000)]

am 6a940f11: am 778af39a: am 6c162ab4: Merge "Remove logspam from GlobalActions." into lmp-dev

* commit '6a940f112e5d9b5685d83b10e78e7b66e16e80fd':
Remove logspam from GlobalActions.

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 15:46:24 +0000 (15:46 +0000)]

am 8cf86b66: am 7fda5cd7: Merge "Fix crash when reset() gets called during an animation" into lmp-dev

* commit '8cf86b663a385215eaeaf1f0d152e777c85926ea':
Fix crash when reset() gets called during an animation

commit | commitdiff | tree

Amith Yamasani [Wed, 20 Aug 2014 15:41:02 +0000 (08:41 -0700)]

resolved conflicts for merge of 83726dfc to master

Change-Id: Ie5613bf53bd0f097d371fcf21b980a114bbd8c98

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 15:38:17 +0000 (15:38 +0000)]

am 7fda5cd7: Merge "Fix crash when reset() gets called during an animation" into lmp-dev

* commit '7fda5cd78b340b4edf6072a9c749c3cff64e89f6':
Fix crash when reset() gets called during an animation

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 15:38:06 +0000 (15:38 +0000)]

am 6d0ec4c0: am 69213844: Merge "Fix QS expansion weirdness #2" into lmp-dev

* commit '6d0ec4c0564fc66d89c1f024ac09c04ec2312cea':
Fix QS expansion weirdness #2

commit | commitdiff | tree

Jason Monk [Wed, 20 Aug 2014 15:38:01 +0000 (15:38 +0000)]

am 7c088477: am 98a04b1a: Merge "Update the QS footer from UI thread" into lmp-dev

* commit '7c0884775e85bf8f6908d5a80acb91630b9a4e44':
Update the QS footer from UI thread

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:37:57 +0000 (15:37 +0000)]

am 9d55c074: am 3422f40e: Merge "PowerUI: Remove the fallback dialogs." into lmp-dev

* commit '9d55c074e6e7bac353bd735be6e67ba53a1d90da':
PowerUI: Remove the fallback dialogs.

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:37:52 +0000 (15:37 +0000)]

am 778af39a: am 6c162ab4: Merge "Remove logspam from GlobalActions." into lmp-dev

* commit '778af39a6da32b5274980abc258d8437b01dbb15':
Remove logspam from GlobalActions.

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 15:30:28 +0000 (15:30 +0000)]

am 69213844: Merge "Fix QS expansion weirdness #2" into lmp-dev

* commit '69213844a5162e1ff9376a3f83d4ea8a73d172ad':
Fix QS expansion weirdness #2

commit | commitdiff | tree

Jason Monk [Wed, 20 Aug 2014 15:30:23 +0000 (15:30 +0000)]

am 98a04b1a: Merge "Update the QS footer from UI thread" into lmp-dev

* commit '98a04b1a6903606631b4288b6f62b68a5a188505':
Update the QS footer from UI thread

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:30:19 +0000 (15:30 +0000)]

am 3422f40e: Merge "PowerUI: Remove the fallback dialogs." into lmp-dev

* commit '3422f40e3df21f94fea33f59bc9e1aeecc836423':
PowerUI: Remove the fallback dialogs.

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:30:14 +0000 (15:30 +0000)]

am 6c162ab4: Merge "Remove logspam from GlobalActions." into lmp-dev

* commit '6c162ab4e1e09c31426c22aacb20729a00567c3e':
Remove logspam from GlobalActions.

commit | commitdiff | tree

Amith Yamasani [Wed, 20 Aug 2014 15:22:40 +0000 (15:22 +0000)]

am c233686a: am ed084f44: Merge "Rename restrictions API class and method" into lmp-dev

* commit 'c233686adbcebbd51d06b5efeeb8192567b48597':
Rename restrictions API class and method

commit | commitdiff | tree

Amith Yamasani [Wed, 20 Aug 2014 15:13:50 +0000 (15:13 +0000)]

am ed084f44: Merge "Rename restrictions API class and method" into lmp-dev

* commit 'ed084f44c971244239f4cfa55183510d2c4fec15':
Rename restrictions API class and method

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 14:21:15 +0000 (14:21 +0000)]

am b4f7ef12: am d8c6b3fb: am da351d0d: Merge "Don\'t allow to scroll to QS if not provisioned" into lmp-dev

* commit 'b4f7ef12758b64282e31bcc2cb2ecb1734823d4f':
Don't allow to scroll to QS if not provisioned

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 14:15:02 +0000 (14:15 +0000)]

am d8c6b3fb: am da351d0d: Merge "Don\'t allow to scroll to QS if not provisioned" into lmp-dev

* commit 'd8c6b3fbf8ffb9412a89c6114fe915152482cb74':
Don't allow to scroll to QS if not provisioned

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 14:06:07 +0000 (14:06 +0000)]

am da351d0d: Merge "Don\'t allow to scroll to QS if not provisioned" into lmp-dev

* commit 'da351d0d95b2782ccebcd1eb22ea7b7562e3ab04':
Don't allow to scroll to QS if not provisioned

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 13:59:19 +0000 (13:59 +0000)]

am acddddb2: am 2b6cddf1: am a4665f30: Merge "Fix accessibility actions for navigation bar" into lmp-dev

* commit 'acddddb298b1b07b1e6815b33a8a77f769b233bb':
Fix accessibility actions for navigation bar

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 13:59:14 +0000 (13:59 +0000)]

am 65dbc328: am 53006cab: am cc19946d: Added notification color to all system notifications

* commit '65dbc32814ed265a0c1adcd4100f80029402ef40':
Added notification color to all system notifications

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 13:52:19 +0000 (13:52 +0000)]

am 2b6cddf1: am a4665f30: Merge "Fix accessibility actions for navigation bar" into lmp-dev

* commit '2b6cddf15e6f2f086ff78d3d2e6aca3369a821e7':
Fix accessibility actions for navigation bar

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 13:52:14 +0000 (13:52 +0000)]

am 53006cab: am cc19946d: Added notification color to all system notifications

* commit '53006cab63fed5d176c5d97d4fc1807192ae9c4d':
Added notification color to all system notifications

commit | commitdiff | tree

Jorim Jaggi [Wed, 20 Aug 2014 13:44:45 +0000 (13:44 +0000)]

am a4665f30: Merge "Fix accessibility actions for navigation bar" into lmp-dev

* commit 'a4665f302431bbd38faf524927889b3a92160fa8':
Fix accessibility actions for navigation bar

commit | commitdiff | tree

Selim Cinek [Wed, 20 Aug 2014 13:44:39 +0000 (13:44 +0000)]

am cc19946d: Added notification color to all system notifications

* commit 'cc19946d947cf553ee9fd23778a3c811c18ae633':
Added notification color to all system notifications

commit | commitdiff | tree

Christian Robertson [Mon, 18 Aug 2014 20:33:37 +0000 (13:33 -0700)]

Updated set of geometric navigation bar icon assets

Bug: 15981688
Change-Id: Id56cafc17aaf86cd3ce1cc125197fa0ce86ab56b

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 16:49:48 +0000 (16:49 +0000)]

Merge "Copy framework internal resources for indeterminate anim." into lmp-dev

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:36:57 +0000 (11:36 -0400)]

Copy framework internal resources for indeterminate anim.

Bug:14622065
Change-Id: Icfe4df5b01f342b7d3dc792e03391dc764abd59b

commit | commitdiff | tree

Santos Cordon [Wed, 20 Aug 2014 16:09:42 +0000 (16:09 +0000)]

Merge "Made all classes required for an InCallService @SystemApi" into lmp-dev

commit | commitdiff | tree

Gabriel Peal [Tue, 19 Aug 2014 21:24:18 +0000 (14:24 -0700)]

Made all classes required for an InCallService @SystemApi

Bug: 17153048
Change-Id: I6b46969e976a47fd814022939a99b823fcb7b2bd

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:24:24 +0000 (15:24 +0000)]

Merge "PowerUI: Remove the fallback dialogs." into lmp-dev

commit | commitdiff | tree

John Spurlock [Tue, 19 Aug 2014 17:37:44 +0000 (13:37 -0400)]

PowerUI: Remove the fallback dialogs.

- Low battery notifications are now always notifications, even
if not HUNs.
- Remove obsolete dialogs used only as HUN fallbacks.
- Extend the default HUN timeout to 10 seconds and remove the
ongoing hack for the warning notification.

Bug:17070231
Change-Id: I29069c3d90dcca6f9bce512e5a0ccbd983704de5

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 15:23:27 +0000 (15:23 +0000)]

Merge "Remove logspam from GlobalActions." into lmp-dev

commit | commitdiff | tree

John Spurlock [Wed, 20 Aug 2014 14:36:33 +0000 (10:36 -0400)]

Remove logspam from GlobalActions.

Bug:17128889
Change-Id: I7343820c1b6f174ec66c28ee7c94b6b9fb0ad1b1