OSDN Git Service
The Android Automerger [Sat, 18 Oct 2014 13:10:56 +0000 (06:10 -0700)]
merge in lmp-mr1-release history after reset to
ed512c817c090e2545db89e13837481f86e7596e
Dianne Hackborn [Sat, 18 Oct 2014 00:42:23 +0000 (00:42 +0000)]
Merge "Fix issue #
17948288: Improve accuracy of memory use reporting" into lmp-mr1-dev
Alan Viverette [Sat, 18 Oct 2014 00:32:17 +0000 (00:32 +0000)]
am
e61519b4: am
15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
* commit '
e61519b4a541a4262389842ae8b72dac401b2199':
Translate compound button drawable by scroll position
Alan Viverette [Sat, 18 Oct 2014 00:26:21 +0000 (00:26 +0000)]
am
15e7b2ac: Merge "Translate compound button drawable by scroll position" into lmp-dev
* commit '
15e7b2ac60b0e6355e6ed5c1be676744c23f5a0e':
Translate compound button drawable by scroll position
Alan Viverette [Sat, 18 Oct 2014 00:20:26 +0000 (00:20 +0000)]
Merge "Translate compound button drawable by scroll position" into lmp-dev
Alan Viverette [Sat, 18 Oct 2014 00:19:12 +0000 (17:19 -0700)]
Translate compound button drawable by scroll position
BUG:
18028674
Change-Id: Iaba848642b87f0d134c6a6c57e5756d883e45904
Andrew Lee [Sat, 18 Oct 2014 00:15:35 +0000 (00:15 +0000)]
Merge "Add functions to update on conference changes." into lmp-mr1-dev
Kristian Monsen [Sat, 18 Oct 2014 00:03:06 +0000 (00:03 +0000)]
am
4183a2fc: am
5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
* commit '
4183a2fc83369996499dfffcfb4113cb6b506165':
Let TYPE_ANNOUNCEMENT be sent from any window
Jim Miller [Fri, 17 Oct 2014 23:57:33 +0000 (23:57 +0000)]
am
a054a828: am
c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
* commit '
a054a8280c1316a1f805cc86f00f571a3b1cfc2f':
Add utility methods to LockPatternUtils for encryption
Kristian Monsen [Fri, 17 Oct 2014 23:57:18 +0000 (23:57 +0000)]
am
5d604181: Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
* commit '
5d6041813283086c5a290ad6ca07e05b1a6ffc14':
Let TYPE_ANNOUNCEMENT be sent from any window
Kristian Monsen [Fri, 17 Oct 2014 23:54:00 +0000 (23:54 +0000)]
Merge "Let TYPE_ANNOUNCEMENT be sent from any window" into lmp-dev
Jim Miller [Fri, 17 Oct 2014 23:52:41 +0000 (23:52 +0000)]
am
c6c843fb: Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
* commit '
c6c843fbe8fb8d9bdd012a472e22970ee89b9d24':
Add utility methods to LockPatternUtils for encryption
Jim Miller [Fri, 17 Oct 2014 23:48:20 +0000 (23:48 +0000)]
Merge "Add utility methods to LockPatternUtils for encryption" into lmp-dev
Yorke Lee [Fri, 17 Oct 2014 23:24:53 +0000 (23:24 +0000)]
am
9621b793: am
e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
* commit '
9621b79396303037a86eb2639035b12080c858bf':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
Yorke Lee [Fri, 17 Oct 2014 23:19:31 +0000 (23:19 +0000)]
am
e4e3fcec: Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
* commit '
e4e3fcec415cdc9739f32ce1eaaec67666e5454d':
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
Yorke Lee [Fri, 17 Oct 2014 23:16:33 +0000 (23:16 +0000)]
Merge "Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions" into lmp-dev
Svetoslav [Fri, 17 Oct 2014 23:09:55 +0000 (23:09 +0000)]
am
ebb38bcc: am
cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit '
ebb38bcc03a0f770d371b2ed997570572df7aed1':
Accessibility no longer overrides strong encryption.
Jim Miller [Fri, 17 Oct 2014 02:50:18 +0000 (19:50 -0700)]
Add utility methods to LockPatternUtils for encryption
This enables a change in Settings that allows device
encryption to be disabled by the user.
Fixes bug
17881324
Change-Id: I34dfc586df1a598bf969dc82adf8537a2730d345
Svetoslav [Fri, 17 Oct 2014 23:04:12 +0000 (23:04 +0000)]
am
cd2b54e6: Merge "Accessibility no longer overrides strong encryption." into lmp-dev
* commit '
cd2b54e6e546099e028f9e41966ab7cf1deedd3c':
Accessibility no longer overrides strong encryption.
Adam Lesinski [Fri, 17 Oct 2014 23:01:44 +0000 (23:01 +0000)]
am
83fae208: am
3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit '
83fae208fee402d8a6a51362f99660f9a49bd5a4':
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
Svetoslav [Fri, 17 Oct 2014 22:59:20 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption." into lmp-dev
Adam Lesinski [Fri, 17 Oct 2014 22:56:10 +0000 (22:56 +0000)]
am
3cd840f4: Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
* commit '
3cd840f4b5a2988700a6b366fa32f4565c319900':
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
Adam Lesinski [Fri, 17 Oct 2014 22:50:48 +0000 (22:50 +0000)]
Merge "AAPT: Fix an issue where a resource name was incorrectly derived on Windows" into lmp-dev
Dianne Hackborn [Fri, 17 Oct 2014 22:25:13 +0000 (15:25 -0700)]
Fix issue #
17948288: Improve accuracy of memory use reporting
We now use Mapped to not double-count cached pages that are
mapped in to app processes. Also read in some more values that
count towards kernel RAM use, and count buffers as free rather
than used RAM.
It also looks like the zram accounting is broken -- it was never
collecting the total zram reserved space. I need to figure out
how I was finding that before.
Change-Id: I883f6fc93966774b5c7d2801d1801666dd11ed41
William Bourke [Fri, 17 Oct 2014 22:09:19 +0000 (22:09 +0000)]
am
7d5c68e3: am
84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit '
7d5c68e31eea3848fd8fa75dfd9f7190ef1cd3a3':
Modified lollipop Easter egg for TV compatibility
Joe Fernandez [Fri, 17 Oct 2014 22:09:15 +0000 (22:09 +0000)]
am
2cc44f2a: am
6dc5d683: docs: Android L release fixes
* commit '
2cc44f2adce51bbc7df4b96d12287628b8f903b3':
docs: Android L release fixes
William Bourke [Fri, 17 Oct 2014 22:03:50 +0000 (22:03 +0000)]
am
84b4791a: Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
* commit '
84b4791aaf0384a334068a97c70fcda162cfadab':
Modified lollipop Easter egg for TV compatibility
Joe Fernandez [Fri, 17 Oct 2014 22:03:47 +0000 (22:03 +0000)]
am
6dc5d683: docs: Android L release fixes
* commit '
6dc5d68399377eb8d6a3132c2af475d92ed8aca5':
docs: Android L release fixes
William Bourke [Fri, 17 Oct 2014 22:00:59 +0000 (22:00 +0000)]
Merge "Modified lollipop Easter egg for TV compatibility" into lmp-dev
Joe Fernandez [Fri, 17 Oct 2014 20:57:15 +0000 (13:57 -0700)]
docs: Android L release fixes
- L Highlights fixes
b/
18029526
- L API Overview fixes
b/
18034482
Change-Id: I2e93ece18748c15a8fe10749e75008bf5ed9a7c0
William Bourke [Fri, 17 Oct 2014 18:13:11 +0000 (11:13 -0700)]
Modified lollipop Easter egg for TV compatibility
Bug:
17997922
Change-Id: I0e2e34245183cdd146ecca02ab09b2c4867770ec
Joe Fernandez [Fri, 17 Oct 2014 21:51:51 +0000 (21:51 +0000)]
am
1fede10c: am
09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev
* commit '
1fede10c269f97f2a9dac48025dccce7e45cef9d':
docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
Adam Lesinski [Fri, 17 Oct 2014 21:40:17 +0000 (14:40 -0700)]
AAPT: Fix an issue where a resource name was incorrectly derived on Windows
Calling String8::getLeaf() will assume the system's file path separator,
however the source string was already converted to a unix path.
getLeaf() would therefore not find any occurence of '\' and would
return the full path.
Bug:
18036805
Change-Id: Ic2bfac0cc553406740204a296327e266b05c0eff
Joe Fernandez [Fri, 17 Oct 2014 21:46:10 +0000 (21:46 +0000)]
am
09cce6f5: Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev
* commit '
09cce6f509af58e3eeaf687b63e292c222a7d769':
docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
Joe Fernandez [Fri, 17 Oct 2014 21:39:26 +0000 (21:39 +0000)]
Merge "docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result" into lmp-dev
Svetoslav [Fri, 17 Oct 2014 18:38:06 +0000 (11:38 -0700)]
Accessibility no longer overrides strong encryption.
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:
17881324
Change-Id: Ic60d760c267d3f934040a42e1963b179bd8b9f5f
Kristian Monsen [Fri, 17 Oct 2014 21:13:07 +0000 (14:13 -0700)]
Let TYPE_ANNOUNCEMENT be sent from any window
Part of fix for bug
17905712
Change-Id: I4e4b09f6b6342a27744e42984d483ef8de18fbff
Andrew Solovay [Fri, 17 Oct 2014 21:05:22 +0000 (14:05 -0700)]
docs: Added new BILLING_RESPONSE_RESULT_SERVICE_UNAVAILABLE result
See first comment for doc staging directory.
bug:
18000631
Change-Id: I4dba47e0965947774adad86218369678311f4a0c
Joe Fernandez [Fri, 17 Oct 2014 20:01:04 +0000 (20:01 +0000)]
am
c97bc213: am
f21746fc: Merge "docs: update location of sample apps" into lmp-dev
* commit '
c97bc213481cef235b10a2d4d17caba7301cd3c5':
docs: update location of sample apps
Joe Fernandez [Fri, 17 Oct 2014 19:52:07 +0000 (19:52 +0000)]
am
f21746fc: Merge "docs: update location of sample apps" into lmp-dev
* commit '
f21746fca8603ed5a4d328b804ad6de24226ef49':
docs: update location of sample apps
Joe Fernandez [Fri, 17 Oct 2014 19:39:27 +0000 (19:39 +0000)]
Merge "docs: update location of sample apps" into lmp-dev
Adam Lesinski [Fri, 17 Oct 2014 19:17:18 +0000 (19:17 +0000)]
Merge "Minor resource notation/compatibility fixes" into lmp-mr1-dev
Amith Yamasani [Fri, 17 Oct 2014 19:05:25 +0000 (19:05 +0000)]
am
b5afeca3: am
a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
* commit '
b5afeca3d9ce3efb0ab9ab6536d4446ec73b416c':
Use the correct method to check if device is encrypted
smain@google.com [Fri, 17 Oct 2014 19:05:21 +0000 (19:05 +0000)]
am
e62a4a50: am
af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev
* commit '
e62a4a50cf2cc4c26f8616d09bed30e94a7699ca':
fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
Amith Yamasani [Fri, 17 Oct 2014 19:00:36 +0000 (19:00 +0000)]
am
a865bb5d: Merge "Use the correct method to check if device is encrypted" into lmp-dev
* commit '
a865bb5df834194dee339db615c17d7c7b63aaa3':
Use the correct method to check if device is encrypted
smain@google.com [Fri, 17 Oct 2014 18:56:06 +0000 (18:56 +0000)]
am
af8de90f: Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev
* commit '
af8de90fd604d3a677947e72b0000bd1075c3665':
fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh.
Amith Yamasani [Fri, 17 Oct 2014 18:55:57 +0000 (18:55 +0000)]
Merge "Use the correct method to check if device is encrypted" into lmp-dev
Quddus Chong [Fri, 17 Oct 2014 18:53:57 +0000 (18:53 +0000)]
am
fdb2d1f8: am
c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev
* commit '
fdb2d1f85c24bb72ca7e1150626d48a662324e63':
docs: Fixed sound and vibration section in Android 5.0 API overview.
Dianne Hackborn [Fri, 17 Oct 2014 18:53:37 +0000 (18:53 +0000)]
am
bab9b48e: am
52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
* commit '
bab9b48efcc55ee247c428aa3f53725c25222166':
SDK only: hide the old L API version constant.
smain@google.com [Fri, 17 Oct 2014 18:53:30 +0000 (18:53 +0000)]
am
a1012fb5: am
fe511970: Merge "edits to the Lollipop highlights" into lmp-dev
* commit '
a1012fb5ad6fa07fccf5b9c791bd77579720c857':
edits to the Lollipop highlights
Vince Harron [Fri, 17 Oct 2014 18:53:22 +0000 (18:53 +0000)]
am
9d141d1d: am
6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev
* commit '
9d141d1d4c4fd33eb7013b2739bd2421620648ab':
Updated Android SDK/Studio system requirements
Quddus Chong [Fri, 17 Oct 2014 18:53:18 +0000 (18:53 +0000)]
am
7f83b4a7: am
15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev
* commit '
7f83b4a7b037b9ccc93cda95a9855a976382907a':
docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode.
Trevor Johns [Fri, 17 Oct 2014 18:53:14 +0000 (18:53 +0000)]
am
6e028eba: am
ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples
* commit '
6e028eba502e86e16dbb5182cb8f5e0697dc43cf':
Docs: Update "What's New" for L Final Preview samples
Jim Miller [Fri, 17 Oct 2014 18:53:01 +0000 (18:53 +0000)]
am
4142d9b0: am
7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
* commit '
4142d9b01d6485afddf7567f1da9959361d6a687':
Fix getStorageEncryptionStatus() in DevicePolicyManager
Dirk Dougherty [Fri, 17 Oct 2014 18:52:57 +0000 (18:52 +0000)]
am
f0c1af8e: am
22fa76da: Merge "Doc change: Add Lollipop to platform versions table." into lmp-dev
* commit '
f0c1af8e4b00a973914a1a3fe22f6d0f98fb704f':
Doc change: Add Lollipop to platform versions table.
smain@google.com [Fri, 17 Oct 2014 18:52:54 +0000 (18:52 +0000)]
am
5957b633: am
c8cef6cc: Merge "time to forget about honeycomb and gingerbread." into lmp-dev
* commit '
5957b6339621d1c84669581bf6a9f68f3d9fbd95':
time to forget about honeycomb and gingerbread.
smain@google.com [Fri, 17 Oct 2014 18:52:50 +0000 (18:52 +0000)]
am
2ff9be11: am
8adb5fd1: Merge "fix links on preview page" into lmp-dev
* commit '
2ff9be116ff6e6ffea33cfae21921d34d66b7f72':
fix links on preview page
smain@google.com [Fri, 17 Oct 2014 18:52:46 +0000 (18:52 +0000)]
am
dfcdfbd6: am
f19f6397: Merge "edits to the lollipop highlights" into lmp-dev
* commit '
dfcdfbd64acc4d2135b28eb3d61d2a174748e55d':
edits to the lollipop highlights
Joe Fernandez [Fri, 17 Oct 2014 18:52:42 +0000 (18:52 +0000)]
am
7314b607: am
e7cc9e80: Merge "docs: Android TV docs fixes for L SDK release" into lmp-dev
* commit '
7314b6076ecef1b79f205016544268ffd38112f3':
docs: Android TV docs fixes for L SDK release
smain@google.com [Fri, 17 Oct 2014 18:52:21 +0000 (18:52 +0000)]
am
d9b48e94: am
4561be01: Merge "add TV quality page to Develop landing carousel" into lmp-dev
* commit '
d9b48e94a139e11924527f16f66ff0491a4502d8':
add TV quality page to Develop landing carousel
Scott Rowe [Fri, 17 Oct 2014 18:52:17 +0000 (18:52 +0000)]
am
fafb6c70: am
dd886683: docs: Notifications changes for L
* commit '
fafb6c708096d809ce6b8b57ac8c2293698cdf6a':
docs: Notifications changes for L
Joe Fernandez [Fri, 17 Oct 2014 18:52:13 +0000 (18:52 +0000)]
am
f8d6891c: am
4deed3ec: Merge "docs: Android TV App Quality Requirements v2" into lmp-dev
* commit '
f8d6891c69d9ef716f1e7f4df206522cf6356e00':
docs: Android TV App Quality Requirements v2
Scott Rowe [Fri, 17 Oct 2014 18:52:08 +0000 (18:52 +0000)]
am
583cf69c: am
6bd081ca: docs: Displaying a Now Playing Card
* commit '
583cf69c00326a1d67d5ca8c8a0d9597ec50aa93':
docs: Displaying a Now Playing Card
Joe Fernandez [Fri, 17 Oct 2014 18:52:04 +0000 (18:52 +0000)]
am
770f57e0: am
321e7645: Merge "docs: Recents screen for tasks and activities" into lmp-dev
* commit '
770f57e06837c8d2b7e42776b569b568d2360057':
docs: Recents screen for tasks and activities
smain@google.com [Fri, 17 Oct 2014 18:52:00 +0000 (18:52 +0000)]
am
4a0f162d: am
c6400892: Merge "add Lollipop highlights and revision to 5.0 API overview intro" into lmp-dev
* commit '
4a0f162df7ca0079b25b61cd4734340cbe5de7f4':
add Lollipop highlights and revision to 5.0 API overview intro
Joe Fernandez [Fri, 17 Oct 2014 18:51:56 +0000 (18:51 +0000)]
am
491fa057: am
d664dc93: Merge "Android 5.0 changes to IME switching" into lmp-dev
* commit '
491fa0570def75b1e056dc1c0954f07d2b524a7f':
Android 5.0 changes to IME switching
Joe Fernandez [Fri, 17 Oct 2014 18:51:52 +0000 (18:51 +0000)]
am
be097523: am
c49acf02: Merge "docs: Update Android TV home for L announcement" into lmp-dev
* commit '
be097523180eab10ec3dec73ec4cc2b7056fed6e':
docs: Update Android TV home for L announcement
David Friedman [Fri, 17 Oct 2014 18:51:47 +0000 (18:51 +0000)]
am
4e5ebb99: am
c2a556ff: Merge "Notificiations Design for Android L Release" into lmp-dev
* commit '
4e5ebb994a7d96c86f598c499956f04a1256e6a7':
Notificiations Design for Android L Release
David Friedman [Fri, 17 Oct 2014 18:51:43 +0000 (18:51 +0000)]
am
981c97ec: am
597d3861: Merge "NDK-r10c release notes (change log) for publication to NDK page on DAC." into lmp-dev
* commit '
981c97ecc0347b2647682a54556d06f2e52ad16a':
NDK-r10c release notes (change log) for publication to NDK page on DAC.
smain@google.com [Fri, 17 Oct 2014 18:51:39 +0000 (18:51 +0000)]
am
238b4795: am
271078f5: update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
* commit '
238b4795468bf8ab93ab7c50b9855e8e84d2f49d':
update L preview landing page for 5.0 SDK launch includes new system images also update the DAC homepage announcement
Ricardo Cervera [Fri, 17 Oct 2014 18:51:23 +0000 (18:51 +0000)]
am
f1425001: am
2e57c2c9: Merge "docs: Migrating material design info from the Preview site" into lmp-dev
* commit '
f14250014b11fd61dec427dd0813fbb43d2fe3ff':
docs: Migrating material design info from the Preview site
Quddus Chong [Fri, 17 Oct 2014 18:51:18 +0000 (18:51 +0000)]
am
0fae717e: am
67b5c8eb: Merge "docs: Updates to Android 5.0 API Overview." into lmp-dev
* commit '
0fae717e207d18a36148c7ddb4a203d4f7447bf7':
docs: Updates to Android 5.0 API Overview.
smain@google.com [Fri, 17 Oct 2014 18:47:11 +0000 (18:47 +0000)]
Merge "fix 1% mystery bug on preview image downloads. just remove the hashchange listener; no more back-navigation, eh." into lmp-dev
smain@google.com [Fri, 17 Oct 2014 18:45:33 +0000 (11:45 -0700)]
fix 1% mystery bug on preview image downloads.
just remove the hashchange listener; no more back-navigation, eh.
Change-Id: I6c822336f33448d9ce01e710fbea2ab134fb8718
Amith Yamasani [Fri, 17 Oct 2014 18:16:58 +0000 (11:16 -0700)]
Use the correct method to check if device is encrypted
DPM's method will return false if encrypted by default password,
preventing the changing of encryption password to lockscreen password.
Check if the device is encrypted by some means, instead.
Also fix a SecurityException when Device Admin queries encryption state
(recent regression)
Bug:
17881324
Change-Id: Id897e61c5e254ab3f8dc569285428a73005303ea
Quddus Chong [Fri, 17 Oct 2014 18:37:29 +0000 (18:37 +0000)]
am
c598a4a4: Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev
* commit '
c598a4a4d5739dbdac7674d86125a347696937f6':
docs: Fixed sound and vibration section in Android 5.0 API overview.
Alan Viverette [Fri, 17 Oct 2014 18:36:38 +0000 (11:36 -0700)]
Fix build
Change-Id: Idd7ae84c0d128bd40f0e7a83882e4ed4181e8a4d
Quddus Chong [Fri, 17 Oct 2014 18:32:01 +0000 (18:32 +0000)]
Merge "docs: Fixed sound and vibration section in Android 5.0 API overview." into lmp-dev
Scott Rowe [Fri, 17 Oct 2014 17:46:04 +0000 (10:46 -0700)]
docs: update location of sample apps
Change-Id: I5079d5578c29cde387d087ec8767ae03aaa7ebe2
Andrew Lee [Thu, 16 Oct 2014 22:39:30 +0000 (15:39 -0700)]
Add functions to update on conference changes.
+ Add onConferenceChanged() to Connection, so that the Connection can
make act on changes to the conference.
+ Add a utility function to PhoneCapabilities to remove a capability
from a PhoneCapabilities bitmask. Figure this abstracts some bit
logic away to make things more readable.
Bug:
17429707
Change-Id: I0c97731a95dd6573488cd10f094a63abe2428bce
Yorke Lee [Fri, 17 Oct 2014 17:22:26 +0000 (10:22 -0700)]
Make READ_VOICEMAIL/WRITE_VOICEMAIL system permissions
Bug:
18020724
Change-Id: I5a0e5ef8a1e40ee23f4b132f5877b63a738e776e
Alan Viverette [Fri, 17 Oct 2014 17:18:34 +0000 (17:18 +0000)]
Merge "Check type resolution on declared methods and fields in ViewDebug" into lmp-mr1-dev
Quddus Chong [Fri, 17 Oct 2014 17:08:41 +0000 (10:08 -0700)]
docs: Fixed sound and vibration section in Android 5.0 API overview.
Change-Id: Icb5379cb1c390c011c9ca8c1d585ebcaea8f92dc
Dianne Hackborn [Fri, 17 Oct 2014 17:15:08 +0000 (17:15 +0000)]
am
52476989: Merge "SDK only: hide the old L API version constant." into lmp-dev
* commit '
52476989b8afc0e96c2218625031ed550b12c79b':
SDK only: hide the old L API version constant.
Dianne Hackborn [Fri, 17 Oct 2014 17:12:00 +0000 (17:12 +0000)]
Merge "Add API level for MR1." into lmp-mr1-dev
Dianne Hackborn [Fri, 17 Oct 2014 17:11:23 +0000 (17:11 +0000)]
Merge "SDK only: hide the old L API version constant." into lmp-dev
smain@google.com [Fri, 17 Oct 2014 16:51:51 +0000 (16:51 +0000)]
am
fe511970: Merge "edits to the Lollipop highlights" into lmp-dev
* commit '
fe51197084ab70ea48a9ddf13ecc0d0afe81d0ea':
edits to the Lollipop highlights
smain@google.com [Fri, 17 Oct 2014 16:47:32 +0000 (16:47 +0000)]
Merge "edits to the Lollipop highlights" into lmp-dev
smain@google.com [Fri, 17 Oct 2014 16:25:24 +0000 (09:25 -0700)]
edits to the Lollipop highlights
Change-Id: I1702946aca8c30528488465be422a9b68a9ae049
John Spurlock [Fri, 17 Oct 2014 16:39:19 +0000 (16:39 +0000)]
Merge "PowerUI: Uncategorize battery notifications as _SYSTEM." into lmp-mr1-dev
John Spurlock [Fri, 17 Oct 2014 16:16:57 +0000 (12:16 -0400)]
PowerUI: Uncategorize battery notifications as _SYSTEM.
So they don't interrupt in priority mode.
Bug:
17691121
Change-Id: I51757c0275ec461a786d1e254b0e71f7b27b5029
Vince Harron [Fri, 17 Oct 2014 16:14:35 +0000 (16:14 +0000)]
am
6da9e548: Merge "Updated Android SDK/Studio system requirements" into lmp-dev
* commit '
6da9e5481aa78fa3541f0546f237049f9d8e3b81':
Updated Android SDK/Studio system requirements
Vince Harron [Fri, 17 Oct 2014 16:12:05 +0000 (16:12 +0000)]
Merge "Updated Android SDK/Studio system requirements" into lmp-dev
Quddus Chong [Fri, 17 Oct 2014 16:10:02 +0000 (16:10 +0000)]
am
15d2e768: Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev
* commit '
15d2e768d67b23fc374895dac8024d40598ffc72':
docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode.
Trevor Johns [Fri, 17 Oct 2014 16:09:58 +0000 (16:09 +0000)]
am
ac21dbb4: Docs: Update "What\'s New" for L Final Preview samples
* commit '
ac21dbb447158c7c75e154277c5f5f19ed456315':
Docs: Update "What's New" for L Final Preview samples
Quddus Chong [Fri, 17 Oct 2014 16:08:43 +0000 (16:08 +0000)]
Merge "docs: Updated Android 5.0 API Overview to reflect that setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE causes the device to leave priority mode." into lmp-dev
John Spurlock [Fri, 17 Oct 2014 16:06:38 +0000 (12:06 -0400)]
QS: 7 day timeout for color-inversion tile.
Bug:
17631628
Change-Id: I4f8a6ce3ea1f79d696686760732c3e8216bfb6c4
Trevor Johns [Fri, 17 Oct 2014 16:00:38 +0000 (09:00 -0700)]
Docs: Update "What's New" for L Final Preview samples
Change-Id: Idc414ffa3b391212136601bd0f65dbcab07efe1e
Quddus Chong [Fri, 17 Oct 2014 15:29:30 +0000 (08:29 -0700)]
docs: Updated Android 5.0 API Overview to reflect that
setting the device to RINGER_MODE_NORMAL or RINGER_MODE_VIBRATE
causes the device to leave priority mode.
Change-Id: I9a7be4529f757417a62ca376df39bf01309e1e69
Jim Miller [Fri, 17 Oct 2014 09:34:37 +0000 (09:34 +0000)]
am
7d96dc6d: Merge "Fix getStorageEncryptionStatus() in DevicePolicyManager" into lmp-dev
* commit '
7d96dc6d98774ff9b7cf1370f9a5508c4eac6a85':
Fix getStorageEncryptionStatus() in DevicePolicyManager
OSDN Git Service
