OSDN Git Service

android-x86/frameworks-base.git
9 years agoRefactor LockSettingsService into storage and logic
Adrian Roos [Wed, 29 Oct 2014 13:42:38 +0000 (14:42 +0100)]
Refactor LockSettingsService into storage and logic

Creates a new LockSettingsStorage class to handle
stroring and retreiving data.

Bug: 18163444
Change-Id: Ia3bc4ad679c5e1217756ae6b3b80cfce3599baed

9 years agoMerge "Update QS tile states after unlocking" into lmp-mr1-dev
Jorim Jaggi [Tue, 4 Nov 2014 14:31:44 +0000 (14:31 +0000)]
Merge "Update QS tile states after unlocking" into lmp-mr1-dev

9 years agoMerge "Always update quick settings header translation in onLayout" into lmp-mr1-dev
Jorim Jaggi [Tue, 4 Nov 2014 14:27:49 +0000 (14:27 +0000)]
Merge "Always update quick settings header translation in onLayout" into lmp-mr1-dev

9 years agoFix a keyguard charging status
Adrian Roos [Thu, 30 Oct 2014 17:29:38 +0000 (18:29 +0100)]
Fix a keyguard charging status

Fixes a bug where the keyguard was showing
a charging state even though the device was
not plugged in.

Bug: 18166083
Change-Id: I85a2cda674ffdafb37df70598f4028414a639def

9 years agoFix low profile bar mode for Material themed apps
Adrian Roos [Tue, 28 Oct 2014 15:39:56 +0000 (16:39 +0100)]
Fix low profile bar mode for Material themed apps

Bug: 17691219
Change-Id: I1b1fb2e831e5d4c41073bb4db0793bf66468c4c4

9 years agoMerge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev
John Spurlock [Tue, 4 Nov 2014 12:15:08 +0000 (12:15 +0000)]
Merge "QS: New rotation-lock tile icon, using AVDs." into lmp-mr1-dev

9 years agoMerge "An intent forwarded from a chooser intent will be a chooser too." into lmp...
Nicolas Prevot [Tue, 4 Nov 2014 11:08:17 +0000 (11:08 +0000)]
Merge "An intent forwarded from a chooser intent will be a chooser too." into lmp-mr1-dev

9 years agoMerge "Do not fix uris inside the system." into lmp-mr1-dev
Nicolas Prevot [Tue, 4 Nov 2014 10:47:24 +0000 (10:47 +0000)]
Merge "Do not fix uris inside the system." into lmp-mr1-dev

9 years agoMerge "Show message when intent is forwarded across profiles." into lmp-mr1-dev
Sander Alewijnse [Tue, 4 Nov 2014 10:24:26 +0000 (10:24 +0000)]
Merge "Show message when intent is forwarded across profiles." into lmp-mr1-dev

9 years agoMerge "Remove deprecated DateFormat APIs." into lmp-mr1-dev
Narayan Kamath [Tue, 4 Nov 2014 09:48:17 +0000 (09:48 +0000)]
Merge "Remove deprecated DateFormat APIs." into lmp-mr1-dev

9 years agoam 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one...
Mark Renouf [Tue, 4 Nov 2014 07:22:48 +0000 (07:22 +0000)]
am 2750e9ff: am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740  -s ours automerge: 01afc37  -s ours

* commit '2750e9ffe1df82fa9f81b9a8fdd311ceb2deacae':

9 years agoam 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWin...
Mark Renouf [Tue, 4 Nov 2014 07:22:44 +0000 (07:22 +0000)]
am 2faa0c53: am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da  -s ours automerge: ff2e718  -s ours

* commit '2faa0c532c38cd171b9fa4843cb9ef43621f9f4e':

9 years agoam eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceede...
kmccormick [Tue, 4 Nov 2014 07:22:41 +0000 (07:22 +0000)]
am eac757a8: am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190

* commit 'eac757a8a26ed4839aca716845fdec1d6ad0842f':

9 years agoam 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE...
Mark Renouf [Tue, 4 Nov 2014 07:18:31 +0000 (07:18 +0000)]
am 4cc7ae80: If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740  -s ours automerge: 01afc37  -s ours

* commit '4cc7ae80387df1556cd4f2a0db75cf91057f7609':

9 years agoam 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets...
Mark Renouf [Tue, 4 Nov 2014 07:18:28 +0000 (07:18 +0000)]
am 066f97e7: Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da  -s ours automerge: ff2e718  -s ours

* commit '066f97e79bce5ac6722f44dcb411f9642c40026c':

9 years agoam b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes...
kmccormick [Tue, 4 Nov 2014 07:18:24 +0000 (07:18 +0000)]
am b2dfaf0e: am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a automerge: 5298190

* commit 'b2dfaf0ee621642190598b32b5ead861402b32ec':

9 years agoIf no display settings are matched, return the first one. DO NOT MERGE automerge...
Mark Renouf [Tue, 4 Nov 2014 07:15:18 +0000 (07:15 +0000)]
If no display settings are matched, return the first one. DO NOT MERGE automerge: cf0f740  -s ours
automerge: 01afc37  -s ours

* commit '01afc37403a244e75fbfa385b197d76e476213e8':

9 years agoMerge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE...
Mark Renouf [Tue, 4 Nov 2014 07:14:17 +0000 (07:14 +0000)]
Merge "Preserve explicit consumed state in replaceSystemWindowInsets DO NOT MERGE" into klp-modular-dev automerge: 7be03da  -s ours
automerge: ff2e718  -s ours

* commit 'ff2e71830cafe063e876e5a56db0d33a8a5ba679':

9 years agoam 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp...
kmccormick [Tue, 4 Nov 2014 07:13:11 +0000 (07:13 +0000)]
am 1867f2cf: Merge "Doc update: deliv receipt, rate exceeded, bug fixes." into klp-modular-docs automerge: 3e92c4a
automerge: 5298190

* commit '5298190a30288d29cb9107d89b00411def3e469b':

9 years agoMerge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev
Dongwon Kang [Tue, 4 Nov 2014 02:41:52 +0000 (02:41 +0000)]
Merge "TIF: Fix a typo and remove an unused method in TvInputService" into lmp-mr1-dev

9 years agoMerge "AudioService: fix cross deadlock" into lmp-mr1-dev
Eric Laurent [Tue, 4 Nov 2014 02:00:32 +0000 (02:00 +0000)]
Merge "AudioService: fix cross deadlock" into lmp-mr1-dev

9 years agoam e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properl...
David Friedman [Tue, 4 Nov 2014 01:34:05 +0000 (01:34 +0000)]
am e20e2b9a: am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

* commit 'e20e2b9a4863144633bb5ba9d7bedf7d0948c760':
  Fixed ADB documentation to work properly on Windows Bug: 17192985

9 years agoAudioService: fix cross deadlock
Eric Laurent [Thu, 30 Oct 2014 21:13:03 +0000 (14:13 -0700)]
AudioService: fix cross deadlock

Fix cross deadlock between VolumeStreamState.class and
VolumeStreamState instance synchronization.

Do not synchronize on VolumeStreamState instance anymore.

Also document the locking order for synchronization objects
related to volume management.

Bug: 18159081.
Change-Id: Ibfe0759215cdac778408b95191cf0fd96bf46312

9 years agoMerge "Clean up public API of SubInfoRecord." into lmp-mr1-dev
Stuart Scott [Tue, 4 Nov 2014 01:28:59 +0000 (01:28 +0000)]
Merge "Clean up public API of SubInfoRecord." into lmp-mr1-dev

9 years agoam 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge...
Deepanshu Gupta [Tue, 4 Nov 2014 01:08:43 +0000 (01:08 +0000)]
am 0a2e42d4: Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev automerge: 9b64954

* commit '0a2e42d4afe9aa81cc41674102dfc999496db845':
  Fix BridgeContext.get*ResourceValue()

9 years agoam 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge...
Deepanshu Gupta [Tue, 4 Nov 2014 01:08:39 +0000 (01:08 +0000)]
am 33996b98: Merge "Support framework menus in ActionBar" into lmp-dev automerge: c23487a

* commit '33996b98787c4625f9cd4a8e38e6a88458773276':
  Support framework menus in ActionBar

9 years agoam cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev...
Deepanshu Gupta [Tue, 4 Nov 2014 01:08:23 +0000 (01:08 +0000)]
am cd5f3bab: Merge "Use the right layout for inflating Action Bar." into lmp-dev automerge: 84a89ed

* commit 'cd5f3bab37ef1dc041489f53f565416d295916d9':
  Use the right layout for inflating Action Bar.

9 years agoam 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows...
David Friedman [Tue, 4 Nov 2014 01:06:41 +0000 (01:06 +0000)]
am 5a416a49: am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

* commit '5a416a4905ba2f347a9837c1f578327c239f5910':
  Fixed ADB documentation to work properly on Windows Bug: 17192985

9 years agoam a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985...
David Friedman [Tue, 4 Nov 2014 00:59:31 +0000 (00:59 +0000)]
am a827de4e: Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

* commit 'a827de4e8bcd8d90987387b1acf8d8856104e21c':
  Fixed ADB documentation to work properly on Windows Bug: 17192985

9 years agoam aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521 -s ours
Baligh Uddin [Tue, 4 Nov 2014 00:56:16 +0000 (00:56 +0000)]
am aa816de4: (-s ours) Import translations. DO NOT MERGE automerge: 07dd521  -s ours

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

9 years agoMerge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
Deepanshu Gupta [Tue, 4 Nov 2014 00:51:51 +0000 (00:51 +0000)]
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
automerge: 9b64954

* commit '9b64954cb5b30b03abaae0b24132e1b1876f8af1':
  Fix BridgeContext.get*ResourceValue()

9 years agoMerge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev
Nancy Chen [Tue, 4 Nov 2014 00:51:28 +0000 (00:51 +0000)]
Merge "Adn queries for multi-SIM. (2/3)" into lmp-mr1-dev

9 years agoMerge "Support framework menus in ActionBar" into lmp-dev
Deepanshu Gupta [Tue, 4 Nov 2014 00:50:48 +0000 (00:50 +0000)]
Merge "Support framework menus in ActionBar" into lmp-dev
automerge: c23487a

* commit 'c23487aa18a9882cb9c8c800c7c44ccb93ce60b9':
  Support framework menus in ActionBar

9 years agoMerge "Use the right layout for inflating Action Bar." into lmp-dev
Deepanshu Gupta [Tue, 4 Nov 2014 00:49:43 +0000 (00:49 +0000)]
Merge "Use the right layout for inflating Action Bar." into lmp-dev
automerge: 84a89ed

* commit '84a89ed0f56d4c35cde5a1451a22a6edb59db06a':
  Use the right layout for inflating Action Bar.

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 4 Nov 2014 00:48:44 +0000 (00:48 +0000)]
Import translations. DO NOT MERGE
automerge: 07dd521  -s ours

* commit '07dd52188ccafac3cec01122b132666f2bd8e32e':
  Import translations. DO NOT MERGE

9 years agoMerge "Few more small meminfo improvements." into lmp-mr1-dev
Dianne Hackborn [Tue, 4 Nov 2014 00:41:53 +0000 (00:41 +0000)]
Merge "Few more small meminfo improvements." into lmp-mr1-dev

9 years agoMerge "[Theater Mode] Add framework support for screen double tapping out of theater...
Bryce Lee [Tue, 4 Nov 2014 00:23:50 +0000 (00:23 +0000)]
Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev
automerge: abf33e4

* commit 'abf33e48baff1ffc14562a499ec3eabc09a5dbb5':
  [Theater Mode] Add framework support for screen double tapping out of theater mode.

9 years agoam 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.
Dirk Dougherty [Tue, 4 Nov 2014 00:21:53 +0000 (00:21 +0000)]
am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.
automerge: 45729a1

* commit '45729a10495ed828749a706066b69051512bf4f0':
  Doc change: Tv doc updates for publishing in Google Play.

9 years agoQS: New rotation-lock tile icon, using AVDs.
John Spurlock [Thu, 30 Oct 2014 17:25:21 +0000 (13:25 -0400)]
QS: New rotation-lock tile icon, using AVDs.

Also:
 - Better icon change detection, unify tile.icon vs tile.iconId.
 - Fix regression in touch feedback by fixing a11y string calculation.

Bug: 17426910
Change-Id: I14772f4e9b3be127bc39106ae9146ed46488fa48

9 years agoMerge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp...
David Friedman [Tue, 4 Nov 2014 00:05:51 +0000 (00:05 +0000)]
Merge "Fixed ADB documentation to work properly on Windows Bug: 17192985" into lmp-docs

9 years agoMerge "Build the split-select tool without C++11 support" into lmp-mr1-dev
Adam Lesinski [Mon, 3 Nov 2014 23:38:55 +0000 (23:38 +0000)]
Merge "Build the split-select tool without C++11 support" into lmp-mr1-dev

9 years agoMerge "Fix issues that will be present in C++11" into lmp-mr1-dev
Adam Lesinski [Mon, 3 Nov 2014 23:38:42 +0000 (23:38 +0000)]
Merge "Fix issues that will be present in C++11" into lmp-mr1-dev

9 years agoMerge "Fix BridgeContext.get*ResourceValue()" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:15:01 +0000 (23:15 +0000)]
Merge "Fix BridgeContext.get*ResourceValue()" into lmp-dev

9 years agoMerge "Support framework menus in ActionBar" into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:14:44 +0000 (23:14 +0000)]
Merge "Support framework menus in ActionBar" into lmp-dev

9 years agoMerge "Use the right layout for inflating Action Bar." into lmp-dev
Deepanshu Gupta [Mon, 3 Nov 2014 23:13:13 +0000 (23:13 +0000)]
Merge "Use the right layout for inflating Action Bar." into lmp-dev

9 years agoMerge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev
Jorim Jaggi [Mon, 3 Nov 2014 22:38:32 +0000 (22:38 +0000)]
Merge "Only hide sensitive content when Keyguard is showing" into lmp-mr1-dev

9 years agoMerge "[Theater Mode] Add framework support for screen double tapping out of theater...
Bryce Lee [Mon, 3 Nov 2014 21:59:26 +0000 (21:59 +0000)]
Merge "[Theater Mode] Add framework support for screen double tapping out of theater mode." into lmp-sprout-dev

9 years agoFew more small meminfo improvements.
Dianne Hackborn [Mon, 3 Nov 2014 21:58:11 +0000 (13:58 -0800)]
Few more small meminfo improvements.

- Add in category for graphics driver, and knowledge about it
  for N5 (more devices will be added later).
- Renaming the labels for the .oat and .art files to be just
  that, so it is clear what they are talking about.

Change-Id: I663ca8bd2febce41fcdde74b0d3a96ef9325edf1

9 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 3 Nov 2014 21:56:10 +0000 (13:56 -0800)]
Import translations. DO NOT MERGE

Bug: 18218486
Change-Id: I929129a2c443e4db78e0ad4e78e653a7cd603855
Auto-generated-cl: translation import

9 years agoam 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into...
Luan Nguyen [Mon, 3 Nov 2014 21:22:12 +0000 (21:22 +0000)]
am 9b1bad22: am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391

* commit '9b1bad22a2cc6ff4d996d40c7c1cbbd56200ec38':

9 years agoam f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Previ...
Joe Fernandez [Mon, 3 Nov 2014 21:22:02 +0000 (21:22 +0000)]
am f05f8a30: am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a

* commit 'f05f8a3036730389ced119ee9f4a44f2af96e06e':

9 years agoam 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automer...
Natalie Masse [Mon, 3 Nov 2014 21:21:52 +0000 (21:21 +0000)]
am 471a354c: am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58

* commit '471a354c870ea02c2742c92c7b819ca1b1567f6f':

9 years agoam f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetai...
Scott Rowe [Mon, 3 Nov 2014 21:21:48 +0000 (21:21 +0000)]
am f6768bac: am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd

* commit 'f6768bac864cdf9ed99b088dc88da6b38df6911e':

9 years agoam 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.
Dirk Dougherty [Mon, 3 Nov 2014 21:21:11 +0000 (21:21 +0000)]
am 550465ba: am e1970f12: Doc change: Tv doc updates for publishing in Google Play.

* commit '550465ba444a860eddfbf673ad09c07519d262d2':
  Doc change: Tv doc updates for publishing in Google Play.

9 years agoam 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp...
Joe Fernandez [Mon, 3 Nov 2014 21:17:18 +0000 (21:17 +0000)]
am 2fb449e9: am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575

* commit '2fb449e9190abe7b3181d623091df378bc682a7b':

9 years agoam 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp...
Prashant Malani [Mon, 3 Nov 2014 21:17:14 +0000 (21:17 +0000)]
am 80c26ce0: am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017  -s ours automerge: a8f4b8a  -s ours

* commit '80c26ce0f6893b2c97b88800467332b69d793e4c':

9 years agoam b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861...
Ricardo Cervera [Mon, 3 Nov 2014 21:17:11 +0000 (21:17 +0000)]
am b50fd5d5: am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473

* commit 'b50fd5d569d03292fa0b4c4306077efbab87f70e':

9 years agoam 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into...
Luan Nguyen [Mon, 3 Nov 2014 21:17:07 +0000 (21:17 +0000)]
am 879b948e: am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367

* commit '879b948e2bfed25877ff89ac316885394139cc11':

9 years agoam dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular...
Luan Nguyen [Mon, 3 Nov 2014 21:15:58 +0000 (21:15 +0000)]
am dcea6fa9: am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97 automerge: 4182391

* commit 'dcea6fa9ad14e2b1ba4cce5c1f6acd08219494c5':

9 years agoam cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page"...
Joe Fernandez [Mon, 3 Nov 2014 21:15:54 +0000 (21:15 +0000)]
am cbabe576: am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e automerge: 3d76f6a

* commit 'cbabe5761296d60bd26a76dff710c00b86d55f69':

9 years agoam 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58
Natalie Masse [Mon, 3 Nov 2014 21:15:51 +0000 (21:15 +0000)]
am 7d3bd06d: am 1e5bb861: Link and typo fixed automerge: bcf9ced automerge: 9f6ea58

* commit '7d3bd06d2928942c6eedbcf5e9437b43a1268a6d':

9 years agoam c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance...
Scott Rowe [Mon, 3 Nov 2014 21:15:47 +0000 (21:15 +0000)]
am c51276ec: am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063 automerge: e0da6dd

* commit 'c51276ec1fddf67c7d31b35bdc0632098233fbb6':

9 years agoam e1970f12: Doc change: Tv doc updates for publishing in Google Play.
Dirk Dougherty [Mon, 3 Nov 2014 21:13:25 +0000 (21:13 +0000)]
am e1970f12: Doc change: Tv doc updates for publishing in Google Play.

* commit 'e1970f12583120613bc94e15841f6a7cc7919f68':
  Doc change: Tv doc updates for publishing in Google Play.

9 years agoam afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview...
smain@google.com [Mon, 3 Nov 2014 21:11:38 +0000 (21:11 +0000)]
am afa68731: am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb

* commit 'afa68731cf249f19a293c42fafd4daf074fe20bd':

9 years agoam 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use...
smain@google.com [Mon, 3 Nov 2014 21:11:34 +0000 (21:11 +0000)]
am 6df786d3: am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8

* commit '6df786d3b6a86cf6d43bf5b9f431fcc070711dd7':

9 years agoam 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked...
Ricardo Cervera-Navarro [Mon, 3 Nov 2014 21:11:30 +0000 (21:11 +0000)]
am 521f964a: am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757

* commit '521f964a6e79aa913e42f2449dab9d2fe58cf7cb':

9 years agoam ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note...
Rich Slogar [Mon, 3 Nov 2014 21:11:23 +0000 (21:11 +0000)]
am ec4bc006: am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b

* commit 'ec4bc00674168c78a0adbd6f48e8733e16486558':

9 years agoam e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp...
Eric Gilmore [Mon, 3 Nov 2014 21:11:14 +0000 (21:11 +0000)]
am e9324d0f: am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36

* commit 'e9324d0f8204a82db45cd86cc7cd3fb3025f9681':

9 years agoam 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge...
Luan Nguyen [Mon, 3 Nov 2014 21:10:02 +0000 (21:10 +0000)]
am 049db36a: Merge "docs: fixed typo/grammar issues." into klp-modular-docs automerge: aec7c97
automerge: 4182391

* commit '418239190b0d0e6921ee0e1e498a34bb7cddc392':

9 years agoam 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular...
Joe Fernandez [Mon, 3 Nov 2014 21:08:45 +0000 (21:08 +0000)]
am 0e893eb7: Merge "docs:Added 64-bit image note from Preview page" into klp-modular-docs automerge: 90f734e
automerge: 3d76f6a

* commit '3d76f6a9578302e4c6c0de694ec7e0923f3cabe2':

9 years agoam 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs...
Joe Fernandez [Mon, 3 Nov 2014 21:08:40 +0000 (21:08 +0000)]
am 031a0863: am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27 automerge: d6ed575

* commit '031a08631900b7863b3ea228db50062633a2decd':

9 years agoam ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev...
Prashant Malani [Mon, 3 Nov 2014 21:08:37 +0000 (21:08 +0000)]
am ee2802eb: Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017  -s ours automerge: a8f4b8a  -s ours

* commit 'ee2802ebedf920b43bd199b807b4d413c8c8cf0a':

9 years agoam 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp...
Ricardo Cervera [Mon, 3 Nov 2014 21:08:34 +0000 (21:08 +0000)]
am 764e61ad: am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308 automerge: 884b473

* commit '764e61ad3ffecb0bcde4d1d5569757f9674f0849':

9 years agoam acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular...
Luan Nguyen [Mon, 3 Nov 2014 21:08:30 +0000 (21:08 +0000)]
am acbfd20d: am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288 automerge: cc8b367

* commit 'acbfd20d53b4caeb6e1bb1fc564fe795cde3a5bc':

9 years agoOnly hide sensitive content when Keyguard is showing
Jorim Jaggi [Mon, 3 Nov 2014 21:08:05 +0000 (22:08 +0100)]
Only hide sensitive content when Keyguard is showing

isOccluded is set delayed when unlocking the phone from a
notification, so updatePublicMode used a stale state. Now, only
the fact whether the Keyguard is showing (no matter if occluded or
not) is used to determine the public mode, which is set in a
synchronous manner.

Bug: 18026898
Change-Id: I3e4988f3e806cf15616ee5aa452f81f19d4aa716

9 years agoam 1e5bb861: Link and typo fixed automerge: bcf9ced
Natalie Masse [Mon, 3 Nov 2014 21:07:41 +0000 (21:07 +0000)]
am 1e5bb861: Link and typo fixed automerge: bcf9ced
automerge: 9f6ea58

* commit '9f6ea5841c139bf061bc8b212b6f3183558235a1':

9 years agoam 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishin...
Joe Fernandez [Mon, 3 Nov 2014 21:06:16 +0000 (21:06 +0000)]
am 194d2026: am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e

* commit '194d2026a3fc685a0ed9afc8080060155a983c95':

9 years agoam eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for...
Fred Fettinger [Mon, 3 Nov 2014 21:06:12 +0000 (21:06 +0000)]
am eeeebfff: am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1  -s ours

* commit 'eeeebfff30ef1bcd916ed5bbb82c78f7216c0a7d':

9 years agoam ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modula...
Scott Rowe [Mon, 3 Nov 2014 21:05:48 +0000 (21:05 +0000)]
am ab64919c: Merge "docs: update reference to FragmentRetainInstance" into klp-modular-docs automerge: a1e3063
automerge: e0da6dd

* commit 'e0da6ddc08ff014bf2e5cd619451d95f5ac5663b':

9 years agoam 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27
Joe Fernandez [Mon, 3 Nov 2014 21:04:37 +0000 (21:04 +0000)]
am 58c64870: Merge "Typo fixed in sample code" into klp-modular-docs automerge: 2f9ea27
automerge: d6ed575

* commit 'd6ed5752da2c741b43d7c4d4d33da955c4fc72b9':

9 years agoMerge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e0...
Prashant Malani [Mon, 3 Nov 2014 21:03:23 +0000 (21:03 +0000)]
Merge "DO NOT MERGE Add empty ArrayList check." into klp-modular-dev automerge: 645e017  -s ours
automerge: a8f4b8a  -s ours

* commit 'a8f4b8a26055055cc5efa3a33862db6f5ca572a5':

9 years agoam 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs...
Ricardo Cervera [Mon, 3 Nov 2014 21:02:22 +0000 (21:02 +0000)]
am 8a7ba4c6: Merge "docs: Fixing notify link. Bug: 17571861" into klp-modular-docs automerge: dc1f308
automerge: 884b473

* commit '884b473ad8bccfef4e379de9034278ffa2113780':

9 years agoam 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page...
smain@google.com [Mon, 3 Nov 2014 21:02:16 +0000 (21:02 +0000)]
am 841b7a21: am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a automerge: 870afdb

* commit '841b7a21f164f8fd9bf3c870e635d48861738751':

9 years agoam 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script...
smain@google.com [Mon, 3 Nov 2014 21:02:12 +0000 (21:02 +0000)]
am 87c4d66d: am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299 automerge: 469c8c8

* commit '87c4d66ddd45829559f70eb921d0dbea66ca9982':

9 years agoam e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for...
Ricardo Cervera-Navarro [Mon, 3 Nov 2014 21:02:07 +0000 (21:02 +0000)]
am e3e6193e: am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b automerge: 4687757

* commit 'e3e6193ea040a25691b68a780f16ebed3f685d0e':

9 years agoam 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular...
Rich Slogar [Mon, 3 Nov 2014 21:01:59 +0000 (21:01 +0000)]
am 4f8a41cc: am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad automerge: d84910b

* commit '4f8a41cccdd7d7c8070d925decf4893b397cb7bc':

9 years agoam 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36
Eric Gilmore [Mon, 3 Nov 2014 21:01:54 +0000 (21:01 +0000)]
am 7ecb0a3e: Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp automerge: 068cb36

* commit '7ecb0a3e5c50837d1b9ea6d952805a9b3795448e':

9 years agoam 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overl...
smain@google.com [Mon, 3 Nov 2014 21:00:56 +0000 (21:00 +0000)]
am 16bc5859: am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02

* commit '16bc5859b728d3fb74a538679920cf3846505616':

9 years agoam 0323f8a6: am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6...
Quddus Chong [Mon, 3 Nov 2014 21:00:52 +0000 (21:00 +0000)]
am 0323f8a6: am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b

* commit '0323f8a685f25cb8f2d95b73fa098d9641005adb':

9 years agoam 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge...
Luan Nguyen [Mon, 3 Nov 2014 20:59:12 +0000 (20:59 +0000)]
am 2a364235: Merge "docs: Android Wear Design fixes" into klp-modular-docs automerge: c07a288
automerge: cc8b367

* commit 'cc8b36706cd976d8313ba35c238920079005578e':

9 years agoam 075531ae: add the butterbar for L announce to Preview landing page automerge:...
smain@google.com [Mon, 3 Nov 2014 20:58:03 +0000 (20:58 +0000)]
am 075531ae: add the butterbar for L announce to Preview landing page automerge: e43bb6a
automerge: 870afdb

* commit '870afdb39abdb308aee8d035f5e72251059f7af4':

9 years agoam 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirement...
Joe Fernandez [Mon, 3 Nov 2014 20:57:20 +0000 (20:57 +0000)]
am 7d35425b: am a63f81ec: am e15773be: Merge "docs: Android TV publishing requirements" into klp-modular-docs automerge: a9d803e

* commit '7d35425b98d7228f1b6fc58e96a2b3b9333318c2':

9 years agoam b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D...
Fred Fettinger [Mon, 3 Nov 2014 20:57:15 +0000 (20:57 +0000)]
am b33ca4f3: am b4093c12: hwui: Caches: use mBoundTextures only for GL_TEXTURE_2D - DO NOT MERGE automerge: 7565da1  -s ours

* commit 'b33ca4f38c6b2a804fda7dad4cb488134b485130':

9 years agoam d8d20f52: update analytics event tracking calls to use new script bug: 16331906...
smain@google.com [Mon, 3 Nov 2014 20:56:59 +0000 (20:56 +0000)]
am d8d20f52: update analytics event tracking calls to use new script bug: 16331906 automerge: 6fbe299
automerge: 469c8c8

* commit '469c8c898389368b7fb9f34c302d810565e29326':

9 years agoam 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that...
Ricardo Cervera-Navarro [Mon, 3 Nov 2014 20:55:52 +0000 (20:55 +0000)]
am 7668aa27: am aa7bcf14: Merge "Revert "docs: Watermarked images for codes that weren\'t found."" into klp-docs automerge: c93723b
automerge: 4687757

* commit '46877572906d932d27bc39f0a347d17607411282':

9 years agoam a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automer...
Rich Slogar [Mon, 3 Nov 2014 20:54:50 +0000 (20:54 +0000)]
am a3287768: Merge "docs:SDK tools 23.0.5 Release Note" into klp-modular-docs automerge: 858cfad
automerge: d84910b

* commit 'd84910b06b8d8af7de04f975e58a77e65f888374':

9 years agoMerge commit \'a4eb81b\' into klp-modular-dev-plus-aosp
Eric Gilmore [Mon, 3 Nov 2014 20:53:40 +0000 (20:53 +0000)]
Merge commit \'a4eb81b\' into klp-modular-dev-plus-aosp
automerge: 068cb36

* commit '068cb36877144dc337766c1113250f5ebc2cbf6f':

9 years agoam a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offse...
smain@google.com [Mon, 3 Nov 2014 20:52:11 +0000 (20:52 +0000)]
am a77da17e: am 63cd4977: am 770c3c5e: fix unclickable link due to overlay from offset dev below automerge: 3f0cf02

* commit 'a77da17ecc64f6125c954892c6d2dabf1a317be5':

9 years agoam 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego)...
Quddus Chong [Mon, 3 Nov 2014 20:52:07 +0000 (20:52 +0000)]
am 68f8326e: am 9df3d67b: am 7f567e4a: docs: Changed date of GMS v6.1 (Manchego) release to October 2014. automerge: 581d03b

* commit '68f8326eb4c7e7b56130979dc366c0aba32aa9f8':

9 years agoam 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge...
Deepanshu Gupta [Mon, 3 Nov 2014 20:51:40 +0000 (20:51 +0000)]
am 3eff8312: am ac875484: am 4f133894: Exclude KXmlParser from LayoutLib. automerge: adb14af

* commit '3eff8312c9c742cc75086d006ecdf36695327f93':