OSDN Git Service

android-x86/frameworks-base.git
9 years agoam 996458b7: Fix ParserFactory not initialized error.
Deepanshu Gupta [Sat, 30 May 2015 01:29:10 +0000 (01:29 +0000)]
am 996458b7: Fix ParserFactory not initialized error.

* commit '996458b76c944f78eee26d7bd8cb4d39303b9119':
  Fix ParserFactory not initialized error.

9 years agoam e14e97a3: am 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version...
Joe Fernandez [Sat, 30 May 2015 01:29:06 +0000 (01:29 +0000)]
am e14e97a3: am 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs

* commit 'e14e97a32cf94c70f8555019d4df6753e4d43611':
  docs: supportlib 22.2.0 design version update

9 years agoFix ParserFactory not initialized error.
Deepanshu Gupta [Sat, 30 May 2015 00:00:34 +0000 (17:00 -0700)]
Fix ParserFactory not initialized error.

Bug: http://b.android.com/175129
Change-Id: I2111673767e0f62ee910560022b559a177d55abd

9 years agoam 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into...
Joe Fernandez [Sat, 30 May 2015 01:12:55 +0000 (01:12 +0000)]
am 4a97fb5d: am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs

* commit '4a97fb5d290388371049436910f97fbf900b1bcf':
  docs: supportlib 22.2.0 design version update

9 years agoam 512234f1: Merge "Close input session when the view is detached from the window...
Yohei Yukawa [Sat, 30 May 2015 01:00:23 +0000 (01:00 +0000)]
am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev

* commit '512234f1961bd98df8087e1f94f1361e280cc28a':
  Close input session when the view is detached from the window.

9 years agoam 3d7e0d8e: Adjust key/value backup scheduling
Christopher Tate [Sat, 30 May 2015 01:00:18 +0000 (01:00 +0000)]
am 3d7e0d8e: Adjust key/value backup scheduling

* commit '3d7e0d8e21e2ba706573fc43f8a7e5654814fb11':
  Adjust key/value backup scheduling

9 years agoam 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview...
Joe Fernandez [Sat, 30 May 2015 00:59:41 +0000 (00:59 +0000)]
am 6fdb83a9: Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs

* commit '6fdb83a914ddb27d4fbf727834431d33bec0d314':
  docs: supportlib 22.2.0 design version update

9 years agoMerge "Close input session when the view is detached from the window." into mnc-dev
Yohei Yukawa [Sat, 30 May 2015 00:52:29 +0000 (00:52 +0000)]
Merge "Close input session when the view is detached from the window." into mnc-dev

9 years agoAdjust key/value backup scheduling
Christopher Tate [Wed, 13 May 2015 00:06:33 +0000 (17:06 -0700)]
Adjust key/value backup scheduling

We now try to perform key/value backups only while charging, proceeding
off-charger only after we've waited a full day for the device to be
plugged in.

Bug 21076663

Change-Id: Ib32c9f8bfaf8a310f5f388907e38a28d3c54bd8e

9 years agoam cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes...
Jeff Brown [Sat, 30 May 2015 00:46:24 +0000 (00:46 +0000)]
am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev

* commit 'cb81d183672a3d9858ade10a997990c5d66a1be3':
  Tell PhoneWindowManager when we start/finish interactive changes.

9 years agoam 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
Doris Liu [Sat, 30 May 2015 00:46:19 +0000 (00:46 +0000)]
am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev

* commit '1501da4bae9b50be885de4480d0f318b7e8da27d':
  Fix calls to Rect.intersect() in package android.view

9 years agoam 67f0df07: am 0e124520: am 8c11025e: Fix a date, adjust permissions language.
Dirk Dougherty [Sat, 30 May 2015 00:46:15 +0000 (00:46 +0000)]
am 67f0df07: am 0e124520: am 8c11025e: Fix a date, adjust permissions language.

* commit '67f0df07381a08cc4a733e7fae58d3156da12bea':
  Fix a date, adjust permissions language.

9 years agoClose input session when the view is detached from the window.
Yohei Yukawa [Sat, 30 May 2015 00:09:14 +0000 (17:09 -0700)]
Close input session when the view is detached from the window.

This is the 3rd trial to fix Bug 20820914.

In followig CLs, we have tried to address a input session
leak when the focused view is detached from the focused
window by relying on IMM#focusOut() but failed because of
regressions like Bug 21508503.
- Ib4bd70ce0305a6bde6a929bcc6ad20a2b8402a97
- I219394178e4172bc47864297f1418e677dba25e5
- Id6afc8fc64512225578c62557b96c7dc2e969adf
- Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930
- I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f

What we have learned from Bug 21508503 was that re-enabling
IMM#focusOut() probably requires much more work than we
thought.  Also relying on IMM#focusOut() might be overkill
because the situation in Bug 20820914 is really special where
the focused view is detached from the focused window hence
we should be able to be fix the issue more conservatively
by closing input session when and only when the focused
view is detached from the focused view, rather than
re-enabling IMM#focusOut() globally.

Bug: 20820914
Change-Id: Iaf3fe2c065b5bf91e49a729ba46262114bb6da88

9 years agoMerge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs
Joe Fernandez [Sat, 30 May 2015 00:44:37 +0000 (00:44 +0000)]
Merge "docs: supportlib 22.2.0 design version update" into mnc-preview-docs

9 years agoMerge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
Jeff Brown [Sat, 30 May 2015 00:33:05 +0000 (00:33 +0000)]
Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev

9 years agoMerge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
Doris Liu [Sat, 30 May 2015 00:31:45 +0000 (00:31 +0000)]
Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev

9 years agoTell PhoneWindowManager when we start/finish interactive changes.
Jeff Brown [Wed, 27 May 2015 02:50:18 +0000 (19:50 -0700)]
Tell PhoneWindowManager when we start/finish interactive changes.

Added some new callbacks that can be used to more precisely trigger
certain behaviors that need to happen around the time the device
is put to sleep and locked.

Fixed an issue where the going to sleep signal might be sent too
early on devices that don't support ambient mode due to the extra
wakefulness change between DOZING and ASLEEP.  We are now track
the early / late interactive change work separately from the rest.

Bug: 21375811
Change-Id: I95387195e216ae92a6e45485bd1bd362e41aa45a

9 years agoam 0e124520: am 8c11025e: Fix a date, adjust permissions language.
Dirk Dougherty [Sat, 30 May 2015 00:28:35 +0000 (00:28 +0000)]
am 0e124520: am 8c11025e: Fix a date, adjust permissions language.

* commit '0e12452091a23d7c7cb1171e71fe5ec49fa392c5':
  Fix a date, adjust permissions language.

9 years agoam 8c11025e: Fix a date, adjust permissions language.
Dirk Dougherty [Sat, 30 May 2015 00:14:38 +0000 (00:14 +0000)]
am 8c11025e: Fix a date, adjust permissions language.

* commit '8c11025e3b0689c32a0c69c4f88caae4fdbb3349':
  Fix a date, adjust permissions language.

9 years agoFix a date, adjust permissions language.
Dirk Dougherty [Fri, 29 May 2015 23:45:15 +0000 (16:45 -0700)]
Fix a date, adjust permissions language.

Change-Id: Icb09eb44645130af5e109c390b757dc12f458f91

9 years agoam db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
Alan Viverette [Fri, 29 May 2015 23:00:11 +0000 (23:00 +0000)]
am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev

* commit 'db2911321b1cb0870d10baab370c93da13a91067':
  Replace PNG-based seekbar thumb animation with AVD

9 years agoMerge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
Alan Viverette [Fri, 29 May 2015 22:50:56 +0000 (22:50 +0000)]
Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev

9 years agoam b85e1ecf: Fix broken transition to secure apps when relaunching
Adrian Roos [Fri, 29 May 2015 22:38:43 +0000 (22:38 +0000)]
am b85e1ecf: Fix broken transition to secure apps when relaunching

* commit 'b85e1ecfdf410b6aec7b6f93e3932b0aa32fba06':
  Fix broken transition to secure apps when relaunching

9 years agoam 2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into...
Marco Nelissen [Fri, 29 May 2015 22:38:38 +0000 (22:38 +0000)]
am 2e2ac33e: Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev

* commit '2e2ac33e889b76106af6c656aeca2a1ce8f1fc5d':
  Update ExifInterface.getDateTime to support subseconds

9 years agoFix broken transition to secure apps when relaunching
Adrian Roos [Fri, 29 May 2015 22:23:18 +0000 (15:23 -0700)]
Fix broken transition to secure apps when relaunching

Previously, the logic for keeping occluded mode during transitions
would also trigger when transitioning from the lockscreen to a
SHOW_WHEN_LOCKED activity that was already on-screen, which would
then prematurely clear the occluded mode and break the launch
transition.

With the fix, the lockscreen must already be occluded before the
keep-occluded-during-transitions logic is triggered.

Bug: 21525170
Change-Id: I1d9ad95b2dd0728af7986f09adb67a617cc62cb2

9 years agoMerge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev
Marco Nelissen [Fri, 29 May 2015 22:26:56 +0000 (22:26 +0000)]
Merge "Update ExifInterface.getDateTime to support subseconds" into mnc-dev

9 years agoam e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev
ztenghui [Fri, 29 May 2015 22:23:31 +0000 (22:23 +0000)]
am e9d8480f: Merge "Tweak the threshold for conic path quads computation." into mnc-dev

* commit 'e9d8480fc13da39905098cd615063482f00b66d7':
  Tweak the threshold for conic path quads computation.

9 years agoam 8c176dd2: am 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new...
Joe Fernandez [Fri, 29 May 2015 22:23:25 +0000 (22:23 +0000)]
am 8c176dd2: am 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs

* commit '8c176dd22ed1ac973eb12b1d3cc8c1f73e9335c8':
  docs: Regen wearable docs with new redesign templates

9 years agoMerge "Tweak the threshold for conic path quads computation." into mnc-dev
ztenghui [Fri, 29 May 2015 22:17:29 +0000 (22:17 +0000)]
Merge "Tweak the threshold for conic path quads computation." into mnc-dev

9 years agoTweak the threshold for conic path quads computation.
ztenghui [Thu, 28 May 2015 23:06:28 +0000 (16:06 -0700)]
Tweak the threshold for conic path quads computation.

We still want it to be related to the threshold for bezier generation.

b/19903239

Change-Id: Ifdce32f1c28ecea9eac98d02c73afa948341fc7d

9 years agoReplace PNG-based seekbar thumb animation with AVD
Alan Viverette [Fri, 29 May 2015 22:12:14 +0000 (15:12 -0700)]
Replace PNG-based seekbar thumb animation with AVD

Adds optical inset support for VectorDrawable and GradientDrawable.

Bug: 19944181
Change-Id: I9df04d9fe17ad858413e7f93694bf37ee2c43c85

9 years agoam 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign template...
Joe Fernandez [Fri, 29 May 2015 22:06:57 +0000 (22:06 +0000)]
am 927b8204: am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs

* commit '927b8204d573176cd39b96abb25cfeb9fd1dd0d2':
  docs: Regen wearable docs with new redesign templates

9 years agoam 9074831a: am def1dde3: am 1521c51c: docs: Quick fixes to screenshot
Andrew Solovay [Fri, 29 May 2015 21:59:04 +0000 (21:59 +0000)]
am 9074831a: am def1dde3: am 1521c51c: docs: Quick fixes to screenshot

* commit '9074831abdacc2b04546ad6278de3b50837b6595':
  docs: Quick fixes to screenshot

9 years agoam 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc...
Joe Fernandez [Fri, 29 May 2015 21:51:55 +0000 (21:51 +0000)]
am 80aa2b3e: Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs

* commit '80aa2b3e9079f847040707b9f1cd5face238137e':
  docs: Regen wearable docs with new redesign templates

9 years agoUpdate ExifInterface.getDateTime to support subseconds
Marco Nelissen [Fri, 29 May 2015 21:49:03 +0000 (14:49 -0700)]
Update ExifInterface.getDateTime to support subseconds

Also document that it returns local time.

Bug: 20638367
Change-Id: I6a1c35925e0555bcdcb079be0ca5b19a279a05a6

9 years agoam 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev
Chris Wren [Fri, 29 May 2015 21:47:21 +0000 (21:47 +0000)]
am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev

* commit '0886dcc7686cfa1ecfb497cadc92479a84a14945':
  add time-in-mode metrics for zen mode

9 years agoam e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev
Adrian Roos [Fri, 29 May 2015 21:47:14 +0000 (21:47 +0000)]
am e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev

* commit 'e67f67da9a41bd089b980c04c1721f52adebb389':
  Hide KeyguardMessageArea if empty

9 years agoam def1dde3: am 1521c51c: docs: Quick fixes to screenshot
Andrew Solovay [Fri, 29 May 2015 21:43:30 +0000 (21:43 +0000)]
am def1dde3: am 1521c51c: docs: Quick fixes to screenshot

* commit 'def1dde30656b7d785dd25c1a8f30292f4d47721':
  docs: Quick fixes to screenshot

9 years agoMerge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs
Joe Fernandez [Fri, 29 May 2015 21:38:02 +0000 (21:38 +0000)]
Merge "docs: Regen wearable docs with new redesign templates" into mnc-preview-docs

9 years agoMerge "add time-in-mode metrics for zen mode" into mnc-dev
Chris Wren [Fri, 29 May 2015 21:33:57 +0000 (21:33 +0000)]
Merge "add time-in-mode metrics for zen mode" into mnc-dev

9 years agoMerge "Hide KeyguardMessageArea if empty" into mnc-dev
Adrian Roos [Fri, 29 May 2015 21:33:08 +0000 (21:33 +0000)]
Merge "Hide KeyguardMessageArea if empty" into mnc-dev

9 years agoam 1521c51c: docs: Quick fixes to screenshot
Andrew Solovay [Fri, 29 May 2015 21:29:02 +0000 (21:29 +0000)]
am 1521c51c: docs: Quick fixes to screenshot

* commit '1521c51cb69e73de2d37a98c367e5fd617056af6':
  docs: Quick fixes to screenshot

9 years agoam ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
destradaa [Fri, 29 May 2015 21:27:46 +0000 (21:27 +0000)]
am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868

* commit 'ce48c1c1d8033e0bb62e0b24645b5c600c4adfc6':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868

9 years agoam 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into...
Yohei Yukawa [Fri, 29 May 2015 20:52:17 +0000 (20:52 +0000)]
am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev

* commit '650a91356b59fe4100f624c0b32d397ec00d51d9':
  Revert "Rely on IMM#focusOut() to close input session."

9 years agoam f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into...
Doris Liu [Fri, 29 May 2015 20:52:12 +0000 (20:52 +0000)]
am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev

* commit 'f042cd841fcc6607bb84f8ddb25db3f4b6ddb3e0':
  Update doc to include how clipToPadding affects EdgeEffect

9 years agoam 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
Svetoslav [Fri, 29 May 2015 20:51:58 +0000 (20:51 +0000)]
am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev

* commit '815be147a35452d52feb0610ff11d8645351ad9f':
  Use AtomicFile APIs correctly when reading.

9 years agoam d377b067: Merge "Cleanup Binder token resetting." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 20:51:51 +0000 (20:51 +0000)]
am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev

* commit 'd377b067358bf27eda2f1bdb806b9394a78e757c':
  Cleanup Binder token resetting.

9 years agoam 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into...
John Spurlock [Fri, 29 May 2015 20:51:46 +0000 (20:51 +0000)]
am 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev

* commit '2473e1e92241b532294524afb9e668497cd86258':
  Zen: Dim status bar alarm icon when zen = total silence.

9 years agoam 2400197f: Enable Keyguard debug logging
Jorim Jaggi [Fri, 29 May 2015 20:51:39 +0000 (20:51 +0000)]
am 2400197f: Enable Keyguard debug logging

* commit '2400197f10ff2ca8d393eac47a65a09dc0cea3e9':
  Enable Keyguard debug logging

9 years agoAllow INADDR_NONE as a valid configuration in AGpsStatus_v3.
destradaa [Fri, 29 May 2015 20:47:39 +0000 (13:47 -0700)]
Allow INADDR_NONE as a valid configuration in AGpsStatus_v3.
b/21516868

This change makes AGpsStatus_v3 consistent and compatible with the behavior
of AGpsStatus_v2.

Change-Id: Ia4e729d8ed1d61b51ae22c7eaf9bbe33f31b7a45

9 years agodocs: Quick fixes to screenshot
Andrew Solovay [Fri, 29 May 2015 19:52:17 +0000 (12:52 -0700)]
docs: Quick fixes to screenshot

I'd been using the "srcset" tag wrong (we're updating the devsite
style guide) so I'm fixing that. Also mislabeled this as "Figure 2"
(it's currently the only figure on the page).

Since this is a very straightforward fix I'm going to go ahead and
submit it.

See first comment for doc stage location.

Change-Id: I81969ff1a3838e516ef00612f3ae8944cca8fab5

9 years agoMerge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
Yohei Yukawa [Fri, 29 May 2015 20:41:24 +0000 (20:41 +0000)]
Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev

9 years agoMerge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
Doris Liu [Fri, 29 May 2015 20:28:19 +0000 (20:28 +0000)]
Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev

9 years agoRevert "Rely on IMM#focusOut() to close input session."
Yohei Yukawa [Fri, 29 May 2015 18:07:02 +0000 (11:07 -0700)]
Revert "Rely on IMM#focusOut() to close input session."

This reverts commit 41bb4953dad33b56b6d039d5bc87a574a0b70fe9.

Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930 caused Bug 21508503.
Since it looks like a timing issue, many other applications
could be affected potentially.

Bug 21508503 implies that re-enabling IMM#focusOut() globally
requires much more work than we thought.  Probably the memory
leak found in Bug 20820914 should be addressed in a more
conservative way at the moment, e.g., by plumbing events from
ViewGroup to IMMS.

Bug: 21508503
Bug: 20820914
Change-Id: I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f

9 years agoMerge "Use AtomicFile APIs correctly when reading." into mnc-dev
Svetoslav [Fri, 29 May 2015 20:02:53 +0000 (20:02 +0000)]
Merge "Use AtomicFile APIs correctly when reading." into mnc-dev

9 years agoUse AtomicFile APIs correctly when reading.
Svetoslav [Fri, 29 May 2015 20:00:32 +0000 (13:00 -0700)]
Use AtomicFile APIs correctly when reading.

21280155

Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d

9 years agoMerge "Cleanup Binder token resetting." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:59:33 +0000 (19:59 +0000)]
Merge "Cleanup Binder token resetting." into mnc-dev

9 years agoMerge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev
John Spurlock [Fri, 29 May 2015 19:50:06 +0000 (19:50 +0000)]
Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev

9 years agoCleanup Binder token resetting.
Alex Klyubin [Fri, 29 May 2015 19:39:32 +0000 (12:39 -0700)]
Cleanup Binder token resetting.

This is a follow-up to 7cbcfd4fc1e538bd391a20cdd00dd1494ace2d0e where
during the review it was pointed out that the code could be
streamlined.

Bug: 18088752
Change-Id: Iecb9fdbc31a0f3cdcb94ddb1b3e7e12a0543a231

9 years agoZen: Dim status bar alarm icon when zen = total silence.
John Spurlock [Fri, 29 May 2015 19:35:53 +0000 (15:35 -0400)]
Zen: Dim status bar alarm icon when zen = total silence.

Bug: 21359239
Change-Id: I5bf207c4c181869127ed8b90787cbd7d9bb0f6c2

9 years agoEnable Keyguard debug logging
Jorim Jaggi [Fri, 29 May 2015 19:32:48 +0000 (12:32 -0700)]
Enable Keyguard debug logging

Bug: 21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0

9 years agoam 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:32:10 +0000 (19:32 +0000)]
am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev

* commit '614b39f3de7747e9e1cd00d8985ec6fa9b356217':
  Refactor Android Keystore CipherSpi base class.

9 years agoam c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing...
Quddus Chong [Fri, 29 May 2015 19:22:34 +0000 (19:22 +0000)]
am c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'c1862737f8fd5c1b366d488e22c020e565f543c3':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agoam 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev
Tyler Gunn [Fri, 29 May 2015 19:22:24 +0000 (19:22 +0000)]
am 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev

* commit '2b26e8dcd130a371ef7ed170316766d0fbcd3212':
  Un-@hide some missed video APIs.

9 years agoam e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm...
John Spurlock [Fri, 29 May 2015 19:22:17 +0000 (19:22 +0000)]
am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

* commit 'e648c5f1cb41f72a3404a9a7d2656e764c52f8e1':
  Zen: Add warning text if total silence will eat the next alarm.

9 years agoam 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:22:11 +0000 (19:22 +0000)]
am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev

* commit '1a23c31752f1295c708cf749a7828dc42e4e9d9e':
  Add algorithm aliases for Android Keystore HMACs.

9 years agoam 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into...
Andy Hung [Fri, 29 May 2015 19:22:04 +0000 (19:22 +0000)]
am 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev

* commit '51c1e3bd149d2e10e68ad72fd7d25ef826a6075c':
  Clarify AudioFormat sample rate and encoding documentation

9 years agoam 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev
Jason Monk [Fri, 29 May 2015 19:21:58 +0000 (19:21 +0000)]
am 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev

* commit '2280218a93cbda885a7530f3b30c3d8d4b3a1ff6':
  Don't use string that has been removed.

9 years agoam e5c38788: am 92614179: am dedc768f: Fix typo
Glenn Kasten [Fri, 29 May 2015 19:21:44 +0000 (19:21 +0000)]
am e5c38788: am 92614179: am dedc768f: Fix typo

* commit 'e5c3878864993a974d48b11790106adb2a09031c':
  Fix typo

9 years agoam 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into...
James Cook [Fri, 29 May 2015 19:21:37 +0000 (19:21 +0000)]
am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev

* commit '63b6320af4302c0d190bbfaba739049b59c2418b':
  assist: Fix reported colors/styles for TextView/Switch

9 years agoam 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
Tony Mantler [Fri, 29 May 2015 19:20:57 +0000 (19:20 +0000)]
am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev

* commit '85b039f3488d15a926993b9df2a550a01a1938a4':
  Move ZoneGetter into SettingsLib

9 years agoam 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:20:42 +0000 (19:20 +0000)]
am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '55b4b2d5a82ef7999a32b8163340a15085b2df38':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:20:34 +0000 (19:20 +0000)]
am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '8320436ce559ba6b80e32bf24d5917fe7ee6c241':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:20:23 +0000 (19:20 +0000)]
am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev

* commit '9917768736f7d8581ee094267d2a4e5ca2b31cbf':
  Revert "Import translations. DO NOT MERGE"

9 years agoam 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev
John Spurlock [Fri, 29 May 2015 19:20:17 +0000 (19:20 +0000)]
am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev

* commit '4402f4bb12cc70eef3bae20631a4a9fe210c7c80':
  Tuner: add battery pct preference.

9 years agoam e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:57 +0000 (19:19 +0000)]
am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:52 +0000 (19:19 +0000)]
am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '0bdf1aab31d110b9e9de819e34e922f13442bf53':
  Import translations. DO NOT MERGE

9 years agoam df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:47 +0000 (19:19 +0000)]
am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

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

9 years agoam 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 19:19:41 +0000 (19:19 +0000)]
am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev

* commit '78a247da5f21415657a9ab6f20d4d8449a13f734':
  Import translations. DO NOT MERGE

9 years agoam e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 19:19:27 +0000 (19:19 +0000)]
am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev

* commit 'e103029dbc457596661ae4066aabcb2a35f07dfd':
  Avoid keyguard UI layout dimensions underflow

9 years agoam 642c4fc5: (-s ours) Import translations. DO NOT MERGE
Geoff Mendal [Fri, 29 May 2015 19:19:20 +0000 (19:19 +0000)]
am 642c4fc5: (-s ours) Import translations. DO NOT MERGE

* commit '642c4fc527da40cf4697d3630bdebdfc1044ab82':
  Import translations. DO NOT MERGE

9 years agoam d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / instal...
Narayan Kamath [Fri, 29 May 2015 19:18:51 +0000 (19:18 +0000)]
am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev

* commit 'd644c5638180d5d4218f34e1afb9e7782fc52e49':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.

9 years agoam 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions...
John Spurlock [Fri, 29 May 2015 19:18:45 +0000 (19:18 +0000)]
am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev

* commit '6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
  Zen: Use account name instead of calendar id in event conditions.

9 years agoam ff3bf4b1: Increased the falsing treashold for quick settings
Selim Cinek [Fri, 29 May 2015 19:18:36 +0000 (19:18 +0000)]
am ff3bf4b1: Increased the falsing treashold for quick settings

* commit 'ff3bf4b12f87d9aa552f517989f2b0dda4e43cc5':
  Increased the falsing treashold for quick settings

9 years agoam 34cca12b: am 906a91b4: am 08710f1b: Add video for families page. Add Studio versio...
Dirk Dougherty [Fri, 29 May 2015 19:18:31 +0000 (19:18 +0000)]
am 34cca12b: am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

* commit '34cca12bbda96ea8aad86b0455eb61e4674a4616':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.

9 years agoam 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one senten...
David Friedman [Fri, 29 May 2015 19:18:26 +0000 (19:18 +0000)]
am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another.

* commit '95af201aead0ce7dc5326220dd3ee8619a237ae6':
  Docs: Corrects technical content of one sentence, and deletes another.

9 years agoam 9bb76544: fix NPE in shutdown thread
Guang Zhu [Fri, 29 May 2015 19:18:19 +0000 (19:18 +0000)]
am 9bb76544: fix NPE in shutdown thread

* commit '9bb765448df43d41e0a3edb7de1d1641c9251c35':
  fix NPE in shutdown thread

9 years agoam 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix
Andrew Solovay [Fri, 29 May 2015 19:18:09 +0000 (19:18 +0000)]
am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix

* commit '832654a8574b4371b5dc69216dd0b8377368fb5c':
  docs: Quick spelling fix

9 years agoam 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post...
Sungsoo Lim [Fri, 29 May 2015 19:18:01 +0000 (19:18 +0000)]
am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev

* commit '6dddc7d1a9ed7f94e37dd6127664e02e25ceb6c8':
  Send a message with data in MediaController.MessageHandler.post()

9 years agoMerge "Refactor Android Keystore CipherSpi base class." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 19:15:17 +0000 (19:15 +0000)]
Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev

9 years agoam f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile...
Quddus Chong [Fri, 29 May 2015 18:55:02 +0000 (18:55 +0000)]
am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'f253e7d547f22bb02ef943bd80f598ca30302bda':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agoam c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug...
Quddus Chong [Fri, 29 May 2015 18:40:50 +0000 (18:40 +0000)]
am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

* commit 'c4d39dfc6c00578d4f7b9970bc9b33b237a1da54':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956

9 years agodocs: Fix issue where images are not appearing in mobile browsers.
Quddus Chong [Fri, 29 May 2015 17:51:56 +0000 (10:51 -0700)]
docs: Fix issue where images are not appearing in mobile browsers.
bug: 21517956

Change-Id: Ia00a42cd5c195881885c2f2927ada9acf2e1f453

9 years agodocs: Regen wearable docs with new redesign templates
Luan Nguyen [Fri, 29 May 2015 18:18:58 +0000 (11:18 -0700)]
docs: Regen wearable docs with new redesign templates

bug:21497653
Change-Id: I7fd0058a14d4adcd14fd584bb10a777987169823

9 years agoUpdate doc to include how clipToPadding affects EdgeEffect
Doris Liu [Fri, 29 May 2015 00:26:46 +0000 (17:26 -0700)]
Update doc to include how clipToPadding affects EdgeEffect

Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a

9 years agoMerge "Un-@hide some missed video APIs." into mnc-dev
Tyler Gunn [Fri, 29 May 2015 18:18:37 +0000 (18:18 +0000)]
Merge "Un-@hide some missed video APIs." into mnc-dev

9 years agodocs: supportlib 22.2.0 design version update
Rich Slogar [Fri, 29 May 2015 17:58:02 +0000 (10:58 -0700)]
docs: supportlib 22.2.0 design version update

b/21511130

Change-Id: I385811c2ee017ed534f45a14bacbe34e9b0b1bc9

9 years agoMerge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev
John Spurlock [Fri, 29 May 2015 18:07:35 +0000 (18:07 +0000)]
Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev

9 years agoMerge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev
Alex Klyubin [Fri, 29 May 2015 18:01:07 +0000 (18:01 +0000)]
Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev

9 years agoMerge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev
Andy Hung [Fri, 29 May 2015 17:51:49 +0000 (17:51 +0000)]
Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev