OSDN Git Service
Barnaby James [Sat, 30 May 2015 22:11:28 +0000 (22:11 +0000)]
am
6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
* commit '
6fad7e7f42a4269a51d2f5aa785c5f253c2b4e45':
Minor VoiceInteractor documentation fixes.
Barnaby James [Sat, 30 May 2015 21:57:47 +0000 (21:57 +0000)]
Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
Jeff Sharkey [Sat, 30 May 2015 18:36:41 +0000 (18:36 +0000)]
am
d659f450: Fix the build months later?
* commit '
d659f450f3d9c113cbd2ddc4f592b7fc64d1c9cf':
Fix the build months later?
Jeff Sharkey [Sat, 30 May 2015 18:20:45 +0000 (11:20 -0700)]
Fix the build months later?
Change-Id: Ic5902fbe39cf2b536eb75682ad18f06e1ad8983e
Joe Fernandez [Sat, 30 May 2015 05:28:55 +0000 (05:28 +0000)]
am
3bacb4d8: am
0e997308: am
e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '
3bacb4d8009a715db40c766d949ae0f0020c001d':
docs: M Preview - Update volantis download signatures
Joe Fernandez [Sat, 30 May 2015 05:16:11 +0000 (05:16 +0000)]
am
0e997308: am
e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '
0e997308905d26000eafeee24dc4f7e685b1ec5b':
docs: M Preview - Update volantis download signatures
Joe Fernandez [Sat, 30 May 2015 05:02:50 +0000 (05:02 +0000)]
am
e2ee9b6b: docs: M Preview - Update volantis download signatures
* commit '
e2ee9b6be1b4bf70d5dd27d25527a1744b73d920':
docs: M Preview - Update volantis download signatures
Joe Fernandez [Sat, 30 May 2015 04:39:45 +0000 (21:39 -0700)]
docs: M Preview - Update volantis download signatures
- uploading a new system install package from J Eason
Change-Id: Iae9bde945feb6b6c7d742e10ca4c6a66760a4926
Alan Viverette [Sat, 30 May 2015 02:35:09 +0000 (02:35 +0000)]
am
2b184e86: Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev
* commit '
2b184e86347d9ff7b26d2667f31e436cf7d7be9e':
Reduce amount of unnecessary RippleDrawable mask redraw
Alan Viverette [Sat, 30 May 2015 02:19:57 +0000 (02:19 +0000)]
Merge "Reduce amount of unnecessary RippleDrawable mask redraw" into mnc-dev
Andrew Solovay [Sat, 30 May 2015 02:08:49 +0000 (02:08 +0000)]
am
765389ec: am
c5abcba4: am
820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '
765389ec4f7df86cc8f74258a087fc8b8f6f8a7e':
docs: Quick fixes for the M Preview "Setup SDK" page.
David Friedman [Sat, 30 May 2015 02:08:41 +0000 (02:08 +0000)]
am
538aabc1: am
270d4a70: am
acb470be: am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
538aabc15e80ad3a174c6182845803cf2ffe3ee1':
Quick typo fix.
Andrew Solovay [Sat, 30 May 2015 01:51:00 +0000 (01:51 +0000)]
am
c5abcba4: am
820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '
c5abcba46131748e03484af3cc7cb474461f47f7':
docs: Quick fixes for the M Preview "Setup SDK" page.
David Friedman [Sat, 30 May 2015 01:50:54 +0000 (01:50 +0000)]
am
270d4a70: am
acb470be: am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
270d4a70afc5fac8f48746751c34b3e0618cf5b7':
Quick typo fix.
Andrew Solovay [Sat, 30 May 2015 01:37:11 +0000 (01:37 +0000)]
am
820f2501: Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
* commit '
820f2501d6371059eb253d6a0d523ceb9f7473ca':
docs: Quick fixes for the M Preview "Setup SDK" page.
David Friedman [Sat, 30 May 2015 01:37:05 +0000 (01:37 +0000)]
am
acb470be: am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
acb470be4f456f4f42c9ed0e6e3babb2ea767353':
Quick typo fix.
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.
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
Andrew Solovay [Sat, 30 May 2015 01:27:28 +0000 (01:27 +0000)]
Merge "docs: Quick fixes for the M Preview "Setup SDK" page." into mnc-preview-docs
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
David Friedman [Sat, 30 May 2015 01:22:58 +0000 (01:22 +0000)]
am
490f8761: am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
490f876113cc58e9b3bbc1b6aab7c86aca4345ca':
Quick typo fix.
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
David Friedman [Sat, 30 May 2015 01:05:03 +0000 (01:05 +0000)]
am
7b3ecd65: Merge "Quick typo fix." into lmp-docs
* commit '
7b3ecd65270802bb9231a0d546f1674c7c133d60':
Quick typo fix.
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.
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
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
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
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
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.
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
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.
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
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
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
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
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
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.
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.
David Friedman [Sat, 30 May 2015 00:02:46 +0000 (00:02 +0000)]
Merge "Quick typo fix." into lmp-docs
Dirk Dougherty [Fri, 29 May 2015 23:45:15 +0000 (16:45 -0700)]
Fix a date, adjust permissions language.
Change-Id: Icb09eb44645130af5e109c390b757dc12f458f91
Alan Viverette [Fri, 29 May 2015 23:23:43 +0000 (16:23 -0700)]
Reduce amount of unnecessary RippleDrawable mask redraw
Bug:
19638504
Change-Id: Ie7b639c543150e13aec30dfeca2b303d5b601cf3
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
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
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
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
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
Marco Nelissen [Fri, 29 May 2015 22:26:56 +0000 (22:26 +0000)]
Merge "Update ExifInterface.getDateTime to support subseconds" 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.
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
ztenghui [Fri, 29 May 2015 22:17:29 +0000 (22:17 +0000)]
Merge "Tweak the threshold for conic path quads computation." into mnc-dev
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
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
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
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
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
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
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
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
Andrew Solovay [Thu, 28 May 2015 17:56:57 +0000 (10:56 -0700)]
docs: Quick fixes for the M Preview "Setup SDK" page.
Includes fixes to address comments made on http://ag/698181 after it
was submitted.
See first comment for doc stage location.
bug:
21478436
Change-Id: I7a5b0c183b000c8a5634fa8a22523b0519e5cafb
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
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
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
Adrian Roos [Fri, 29 May 2015 21:33:08 +0000 (21:33 +0000)]
Merge "Hide KeyguardMessageArea if empty" into mnc-dev
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
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
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."
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
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.
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.
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.
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
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
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
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
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
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
Svetoslav [Fri, 29 May 2015 20:02:53 +0000 (20:02 +0000)]
Merge "Use AtomicFile APIs correctly when reading." into mnc-dev
Svetoslav [Fri, 29 May 2015 20:00:32 +0000 (13:00 -0700)]
Use AtomicFile APIs correctly when reading.
21280155
Change-Id: I354ebac8fc91d8f28eec6016474a9521ff2a490d
Alex Klyubin [Fri, 29 May 2015 19:59:33 +0000 (19:59 +0000)]
Merge "Cleanup Binder token resetting." 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
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
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
Jorim Jaggi [Fri, 29 May 2015 19:32:48 +0000 (12:32 -0700)]
Enable Keyguard debug logging
Bug:
21320918
Change-Id: I2529bfb7cdaae6042bbc9e51340c7571a5a63ad0
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.
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
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.
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.
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.
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
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.
Glenn Kasten [Fri, 29 May 2015 19:21:44 +0000 (19:21 +0000)]
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
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
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"
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"
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"
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.
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
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
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