OSDN Git Service
Rubin Xu [Mon, 22 Jun 2015 15:57:52 +0000 (15:57 +0000)]
am
c54bcade: Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
* commit '
c54bcade1b7ec7e044aca7fe9c60357ad957a8c2':
New internal permission to protect apps against rogue Nfc message.
Derek Sollenberger [Mon, 22 Jun 2015 15:45:11 +0000 (15:45 +0000)]
am
b2aea9dc: Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev
* commit '
b2aea9dcbd6edfa645c6fc3ae4adab95aa79cc1c':
Enable Picture w/ HW Accelerated Canvas.
Rubin Xu [Mon, 22 Jun 2015 15:44:41 +0000 (15:44 +0000)]
Merge "New internal permission to protect apps against rogue Nfc message." into mnc-dev
Derek Sollenberger [Mon, 22 Jun 2015 15:38:09 +0000 (15:38 +0000)]
Merge "Enable Picture w/ HW Accelerated Canvas." into mnc-dev
Jason Monk [Mon, 22 Jun 2015 14:38:10 +0000 (14:38 +0000)]
am
616f035b: Merge "Add icon mapping for NETWORK_TYPE_IWLAN" into mnc-dev
* commit '
616f035bc9a2d9855feb2348d2b732a18ebdbffb':
Add icon mapping for NETWORK_TYPE_IWLAN
Jason Monk [Mon, 22 Jun 2015 14:29:43 +0000 (14:29 +0000)]
Merge "Add icon mapping for NETWORK_TYPE_IWLAN" into mnc-dev
Jason Monk [Mon, 22 Jun 2015 14:22:55 +0000 (10:22 -0400)]
Add icon mapping for NETWORK_TYPE_IWLAN
According to TelephonyManager#getNetworkClass, it seems to be a form
of 4g, so give it those icons.
Bug:
21338555
Change-Id: I00629572950191f30fd274367e95c3117990f671
Geoff Mendal [Mon, 22 Jun 2015 14:13:09 +0000 (14:13 +0000)]
am
3862452f: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
3862452f30fa98f2652954a87cf0173889cbd0e4':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 22 Jun 2015 14:01:43 +0000 (14:01 +0000)]
am
224083b8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
224083b8a12f00427194216c1d29f3744ee9d30d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 22 Jun 2015 14:01:09 +0000 (14:01 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 22 Jun 2015 13:59:17 +0000 (08:59 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2ad73428a2295cfc3824de5837ab2f927fd5d626
Auto-generated-cl: translation import
Geoff Mendal [Mon, 22 Jun 2015 13:51:42 +0000 (13:51 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Mon, 22 Jun 2015 13:51:18 +0000 (08:51 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ifd91f44e7bb3ea8577d2054394d4e6b64c488f2b
Auto-generated-cl: translation import
Derek Sollenberger [Thu, 4 Jun 2015 19:54:15 +0000 (15:54 -0400)]
Enable Picture w/ HW Accelerated Canvas.
Bug:
20688645
Change-Id: I664f37d6dbb3e61b17206c82ebcc63f988cefc65
Andrei Stingaceanu [Mon, 22 Jun 2015 13:05:55 +0000 (13:05 +0000)]
am
b1891b3f: Fix selection by double tap in Extracted mode
* commit '
b1891b3fc9d07ef766978f0a39c382b217a529e0':
Fix selection by double tap in Extracted mode
Andrei Stingaceanu [Fri, 19 Jun 2015 15:44:37 +0000 (16:44 +0100)]
Fix selection by double tap in Extracted mode
Select with double tap in extracted mode has suffered
a regression recently: flickers and it does not correctly
select. Found this fix after a lot of trials.
Bug:
20128047
Change-Id: I1bbe8c11982d37e5409bac2b648a31b0ca1f0bbc
Vladislav Kaznacheev [Mon, 22 Jun 2015 09:33:39 +0000 (09:33 +0000)]
am
8228e424: Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev
* commit '
8228e4247c320632ba1e401259eceae7aa2738d1':
Fix huge bounce-back in ListView when double-flinging
Vladimir Marko [Mon, 22 Jun 2015 09:33:34 +0000 (09:33 +0000)]
am
c2869507: Merge "Don\'t prevent notification updates in DOS protection." into mnc-dev
* commit '
c28695079e3511e02845bad9d730753daefba8a3':
Don't prevent notification updates in DOS protection.
Vladislav Kaznacheev [Mon, 22 Jun 2015 09:30:17 +0000 (09:30 +0000)]
Merge "Fix huge bounce-back in ListView when double-flinging" into mnc-dev
Vladimir Marko [Mon, 22 Jun 2015 08:53:48 +0000 (08:53 +0000)]
Merge "Don't prevent notification updates in DOS protection." into mnc-dev
Jae Seo [Mon, 22 Jun 2015 01:27:28 +0000 (01:27 +0000)]
am
37099a08: Merge "TIF: Minor code improvement" into mnc-dev
* commit '
37099a082f7e0b106e22cc59fa92ba6a3656ebb2':
TIF: Minor code improvement
Jae Seo [Mon, 22 Jun 2015 01:18:04 +0000 (01:18 +0000)]
Merge "TIF: Minor code improvement" into mnc-dev
Jae Seo [Mon, 22 Jun 2015 00:56:29 +0000 (00:56 +0000)]
am
77771822: TIF: Use equals() instead of \'==\' for String comparisons
* commit '
777718220cdacb82e984c7ea8915e36ea203e5a2':
TIF: Use equals() instead of '==' for String comparisons
Jae Seo [Mon, 22 Jun 2015 00:39:02 +0000 (17:39 -0700)]
TIF: Use equals() instead of '==' for String comparisons
Change-Id: Iea6e3d5f5146e2e3a37c52db5a0a9706540ddb23
Jae Seo [Sun, 21 Jun 2015 23:40:34 +0000 (16:40 -0700)]
TIF: Minor code improvement
- Removed unnecessary 'final' keywords for private methods
- Removed unnecessary interface modifiers
- Added a missing ‘final’ keyword
- Simplified if statements
- Removed Javadoc links pointing to itself
- Removed redundant conditional expressions
- Removed unnecessary return statements
- Replaced explicit types with <>
- Removed an unnecessary unboxing
- Removed a redundant initializer
- Fixed typos
Change-Id: I1d137fda70192b33dd00e92ab01396519135ab39
Jae Seo [Sun, 21 Jun 2015 23:10:35 +0000 (23:10 +0000)]
am
392f2d3b: Merge "TIF: Use the right size for calls to toArray() instead of 0" into mnc-dev
* commit '
392f2d3b5d8407f7920e437a2d0db900251b4f81':
TIF: Use the right size for calls to toArray() instead of 0
Jae Seo [Sun, 21 Jun 2015 23:00:09 +0000 (23:00 +0000)]
Merge "TIF: Use the right size for calls to toArray() instead of 0" into mnc-dev
Jae Seo [Sun, 21 Jun 2015 21:40:46 +0000 (21:40 +0000)]
am
a5103b9b: Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev
* commit '
a5103b9b52f38fa4928f8712c95049791a1153d2':
TIF: Add the columns for the app-linking to TvContract.Channels
Jae Seo [Sun, 21 Jun 2015 21:27:39 +0000 (21:27 +0000)]
Merge "TIF: Add the columns for the app-linking to TvContract.Channels" into mnc-dev
Jae Seo [Sun, 21 Jun 2015 21:08:54 +0000 (14:08 -0700)]
TIF: Use the right size for calls to toArray() instead of 0
Change-Id: I645a09403b60545123627df7d0222ed34f084ffe
Jae Seo [Sun, 21 Jun 2015 20:57:56 +0000 (20:57 +0000)]
am
6185858b: Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-dev
* commit '
6185858bd9fe5a6f2e6e5e06938ab9ba55bf8389':
TIF: Add COLUMN_SEARCHABLE to TvContract.Programs
Jae Seo [Sun, 21 Jun 2015 20:57:50 +0000 (20:57 +0000)]
am
99a242c3: Merge "TIF: Always flush pending app-private commands when resetting TvView" into mnc-dev
* commit '
99a242c3636bf5d2e07d645375f139a6e086711e':
TIF: Always flush pending app-private commands when resetting TvView
Jae Seo [Sun, 21 Jun 2015 20:57:45 +0000 (20:57 +0000)]
am
5ab0ae0e: Merge "TIF: Fix a typo" into mnc-dev
* commit '
5ab0ae0e387078914457774e5c82308f3cc9b5e3':
TIF: Fix a typo
Jae Seo [Sun, 21 Jun 2015 20:57:42 +0000 (20:57 +0000)]
am
70289a6e: Merge "TIF: Remove unnecessary interface modifiers" into mnc-dev
* commit '
70289a6e8a60c9a2b91d409dfedd2aea7bce6620':
TIF: Remove unnecessary interface modifiers
Jae Seo [Sun, 21 Jun 2015 20:57:38 +0000 (20:57 +0000)]
am
0d4b4a19: Merge "TIF: Replace StringBuffer with String" into mnc-dev
* commit '
0d4b4a196436a1dfe8b55a20e5d8bb114cd9aea7':
TIF: Replace StringBuffer with String
Jae Seo [Sun, 21 Jun 2015 20:48:25 +0000 (20:48 +0000)]
Merge "TIF: Add COLUMN_SEARCHABLE to TvContract.Programs" into mnc-dev
Jae Seo [Sun, 21 Jun 2015 20:47:06 +0000 (20:47 +0000)]
Merge "TIF: Always flush pending app-private commands when resetting TvView" into mnc-dev
Jae Seo [Sun, 21 Jun 2015 20:46:39 +0000 (20:46 +0000)]
Merge "TIF: Fix a typo" into mnc-dev
Jae Seo [Sun, 21 Jun 2015 20:46:24 +0000 (20:46 +0000)]
Merge "TIF: Remove unnecessary interface modifiers" into mnc-dev
Jae Seo [Sun, 21 Jun 2015 20:46:05 +0000 (20:46 +0000)]
Merge "TIF: Replace StringBuffer with String" into mnc-dev
John Spurlock [Sun, 21 Jun 2015 15:02:37 +0000 (15:02 +0000)]
am
3953b5a1: Merge "Zen: Tweak total silence new user message for non-voice devices." into mnc-dev
* commit '
3953b5a1f935369b016894ed9e8cbb387fb17338':
Zen: Tweak total silence new user message for non-voice devices.
John Spurlock [Sun, 21 Jun 2015 14:52:48 +0000 (14:52 +0000)]
Merge "Zen: Tweak total silence new user message for non-voice devices." into mnc-dev
John Spurlock [Sun, 21 Jun 2015 14:46:28 +0000 (10:46 -0400)]
Zen: Tweak total silence new user message for non-voice devices.
Bug:
21953388
Change-Id: I395af64b175b22fc58d80529cdbb12ebd9e00115
Jae Seo [Sun, 21 Jun 2015 07:47:43 +0000 (00:47 -0700)]
TIF: Fix a typo
Change-Id: Iae3b359369a86224767493149b11d83ba2810ec5
Jae Seo [Sun, 21 Jun 2015 07:45:04 +0000 (00:45 -0700)]
TIF: Remove unnecessary interface modifiers
Change-Id: I6b0744b32207bece45bc7ac6bee279b244f8cd3b
Jae Seo [Sun, 21 Jun 2015 07:17:23 +0000 (00:17 -0700)]
TIF: Replace StringBuffer with String
Change-Id: I52f7d7cc8af7d230d6a23993391f662542886f37
Jae Seo [Sun, 21 Jun 2015 06:02:29 +0000 (23:02 -0700)]
TIF: Always flush pending app-private commands when resetting TvView
Bug:
19809952
Change-Id: Ic676b81591def065d79ac45cb1d247b67178e50b
Svet Ganov [Sat, 20 Jun 2015 17:45:22 +0000 (17:45 +0000)]
am
3ac465a7: Do not thrown on error persisting runtime permissions
* commit '
3ac465a7d830a973096b4f69ef4531f09dcdf07c':
Do not thrown on error persisting runtime permissions
Svet Ganov [Sat, 20 Jun 2015 17:31:25 +0000 (10:31 -0700)]
Do not thrown on error persisting runtime permissions
bug:
20752986
Change-Id: I49d7e30afd49d3dcb1bcffd2fd48e9460ed5147f
Svet Ganov [Sat, 20 Jun 2015 09:40:05 +0000 (09:40 +0000)]
am
0f800f7c: Ensure default permissions not dropped on data wipe
* commit '
0f800f7c163383ce3a49cc99bc2d8097f8961bde':
Ensure default permissions not dropped on data wipe
Svet Ganov [Sat, 20 Jun 2015 08:30:40 +0000 (01:30 -0700)]
Ensure default permissions not dropped on data wipe
bug:
21954760
Change-Id: I15de766012e66e171d2089af574687ad513a5d57
Svet Ganov [Sat, 20 Jun 2015 07:10:35 +0000 (07:10 +0000)]
am
d8e247db: Make READ_EXTERNAL_STORAGE dangerous
* commit '
d8e247db8cabe209966f4bfcb550637b45f18441':
Make READ_EXTERNAL_STORAGE dangerous
Svet Ganov [Sat, 20 Jun 2015 06:57:47 +0000 (23:57 -0700)]
Make READ_EXTERNAL_STORAGE dangerous
We have a new storage permission group that has read and
write external storage. However, read external storage is
(not a regression) a normal permission while write is a
dangerous one. This leads to cases where the user disables
the Storage permission and apps still read form it. This
change makes read external storage a dangerous permission.
bug:
21949045
Change-Id: I7e28f629dda6e9c1f70cb20a3d5bea74fb109890
Jae Seo [Sat, 20 Jun 2015 00:34:37 +0000 (17:34 -0700)]
TIF: Add COLUMN_SEARCHABLE to TvContract.Programs
This allows applications to specify not only channels but also programs
searchable or not enabling finer grained access control.
Bug:
18910284
Change-Id: Id476c37ae8521301c50a4fb2007b41661e74fe89
Bart Sears [Sat, 20 Jun 2015 05:33:28 +0000 (05:33 +0000)]
am
950aa197: Merge "Revert "Clarify handling client certificates"" into mnc-dev
* commit '
950aa197d417bf18ddbdd7fb6fe11f990860b639':
Revert "Clarify handling client certificates"
Bart Sears [Sat, 20 Jun 2015 05:22:37 +0000 (05:22 +0000)]
Merge "Revert "Clarify handling client certificates"" into mnc-dev
Bart Sears [Sat, 20 Jun 2015 05:21:38 +0000 (05:21 +0000)]
Revert "Clarify handling client certificates"
CL broke the javadoc build.
This reverts commit
36cf701e1ef0e24ce865734babb526ef5e4dc9b4.
Change-Id: Idf8add1c7d2c205400e6657d7dc3c1b89ee238f8
Selim Cinek [Sat, 20 Jun 2015 03:34:22 +0000 (03:34 +0000)]
am
c99d9a95: Fixed content description of the lock icon when fingerprint is on
* commit '
c99d9a95643c514ee0a671f023359931df443077':
Fixed content description of the lock icon when fingerprint is on
Selim Cinek [Sat, 20 Jun 2015 01:44:50 +0000 (18:44 -0700)]
Fixed content description of the lock icon when fingerprint is on
Also surfacing Fingerprint Errors now with a message.
Bug:
21565811
Change-Id: I3bba66303c08313dbca1df5ef2f20b251f541bc1
Paul Jensen [Sat, 20 Jun 2015 01:21:11 +0000 (01:21 +0000)]
am
08d9834c: Merge "Occasionally retest for captive portals once detected" into mnc-dev
* commit '
08d9834c1bbba5f7dd284ea648e45db8a7db115b':
Occasionally retest for captive portals once detected
Paul Jensen [Sat, 20 Jun 2015 01:21:07 +0000 (01:21 +0000)]
am
422f04bc: Merge "Speed up network transition when WiFi disconnects" into mnc-dev
* commit '
422f04bc57309c34ca82746a95dda34b49b7fdf5':
Speed up network transition when WiFi disconnects
Paul Jensen [Sat, 20 Jun 2015 01:20:59 +0000 (01:20 +0000)]
am
2f56a330: Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
* commit '
2f56a33041b95fc9badcf08e8be4fd57eec56ccb':
Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)
Paul Jensen [Sat, 20 Jun 2015 01:20:55 +0000 (01:20 +0000)]
am
8e21d29f: Merge "Don\'t send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev
* commit '
8e21d29f7e8691c5798ef613c2ccc4112c649421':
Don't send spurious onAvailable NetworkCallbacks when rematching
Paul Jensen [Sat, 20 Jun 2015 01:16:19 +0000 (01:16 +0000)]
Merge "Occasionally retest for captive portals once detected" into mnc-dev
Paul Jensen [Sat, 20 Jun 2015 01:15:33 +0000 (01:15 +0000)]
Merge "Speed up network transition when WiFi disconnects" into mnc-dev
Paul Jensen [Wed, 17 Jun 2015 18:42:30 +0000 (14:42 -0400)]
Speed up network transition when WiFi disconnects
Before falling back to cellular we used to first delete all the
network routing tables and rules for WiFi. This isn't necessary
and can take significant time as it requires a lot of netd
shelling out to ip and ip[6]tables to flush routes and remove
the incoming packet mark rule. Instead have netd delete all the
network routing tables and rules after we've either fallen back
to cellular or at least kicked off a cellular connection attempt.
Bug:
21932815
Change-Id: Iabac4a8b962492682df3073cc41a12e35bc9f1bb
Paul Jensen [Sat, 20 Jun 2015 01:13:16 +0000 (01:13 +0000)]
Merge "Add ConnectivityManager.registerNetworkCallback(NetworkRequest, PendingIntent)" into mnc-dev
Paul Jensen [Sat, 20 Jun 2015 01:12:18 +0000 (01:12 +0000)]
Merge "Don't send spurious onAvailable NetworkCallbacks when rematching" into mnc-dev
Adam Powell [Sat, 20 Jun 2015 00:54:28 +0000 (00:54 +0000)]
am
b3add4da: Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
* commit '
b3add4dae22076d35c2c2fb9f150a69382356598':
Fix regression in viewing app info from ChooserActivity targets
Adam Powell [Sat, 20 Jun 2015 00:46:03 +0000 (00:46 +0000)]
Merge "Fix regression in viewing app info from ChooserActivity targets" into mnc-dev
Andreas Gampe [Sat, 20 Jun 2015 00:39:51 +0000 (00:39 +0000)]
am
ce49be7e: Merge "Frameworks/base: Update preloaded-classes" into mnc-dev
* commit '
ce49be7ee6cfcbf15e0e4d8975e58f6ed6916006':
Frameworks/base: Update preloaded-classes
Vinit Deshpande [Sat, 20 Jun 2015 00:39:46 +0000 (00:39 +0000)]
am
edb83227: Merge "Fix access point list jumping around in WifiSettings" into mnc-dev
* commit '
edb832271bc036975d9ff8cd1513b6a1e097f3cd':
Fix access point list jumping around in WifiSettings
Doris Liu [Sat, 20 Jun 2015 00:39:42 +0000 (00:39 +0000)]
am
4a799925: Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
* commit '
4a79992591bd9971764b504bfe10cad656edf632':
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
Andreas Gampe [Sat, 20 Jun 2015 00:25:26 +0000 (00:25 +0000)]
Merge "Frameworks/base: Update preloaded-classes" into mnc-dev
Vinit Deshpande [Sat, 20 Jun 2015 00:24:31 +0000 (00:24 +0000)]
Merge "Fix access point list jumping around in WifiSettings" into mnc-dev
Doris Liu [Sat, 20 Jun 2015 00:23:24 +0000 (00:23 +0000)]
Merge "Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice" into mnc-dev
Quddus Chong [Sat, 20 Jun 2015 00:16:08 +0000 (00:16 +0000)]
am
bcca4ac4: am
0bdd3204: am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
bcca4ac4fb4fa66f2e4196437998c08e4dbed1d3':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Sat, 20 Jun 2015 00:16:03 +0000 (00:16 +0000)]
am
19cecd51: am
a5de0f30: am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
19cecd51f92ad16f3545eec2ab712cdc7c83b224':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Quddus Chong [Sat, 20 Jun 2015 00:03:00 +0000 (00:03 +0000)]
am
0bdd3204: am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
0bdd320402aa3406ece0afd1c89bcd00c21b3f7a':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Sat, 20 Jun 2015 00:02:55 +0000 (00:02 +0000)]
am
a5de0f30: am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
a5de0f30cf9edfb980f5da3e8329eeb60d77057d':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Adrian Roos [Fri, 19 Jun 2015 23:57:28 +0000 (23:57 +0000)]
am
b2522511: Merge "Tweak assist disclosure animation" into mnc-dev
* commit '
b252251144388856a390c9ace912e1cb4ecdaa51':
Tweak assist disclosure animation
Robert Shih [Fri, 19 Jun 2015 23:57:24 +0000 (23:57 +0000)]
am
1b98ab33: Merge "MediaPlayer: documentation for error/info codes." into mnc-dev
* commit '
1b98ab33281f0000ac3f1c12e9cb2b4dfb0a2bb6':
MediaPlayer: documentation for error/info codes.
Junda Liu [Fri, 19 Jun 2015 23:57:19 +0000 (23:57 +0000)]
am
8f87c824: Merge "Fix spelling of a config variable." into mnc-dev
* commit '
8f87c8249b33feff0ac414576b90e5c70b5661be':
Fix spelling of a config variable.
Christopher Ferris [Fri, 19 Jun 2015 23:57:15 +0000 (23:57 +0000)]
am
bf30b4fd: Merge "Add libwilhelm to app_process." into mnc-dev
* commit '
bf30b4fd92496cb0d66053ce777f29b4a07494b2':
Add libwilhelm to app_process.
Svetoslav [Fri, 19 Jun 2015 23:57:11 +0000 (23:57 +0000)]
am
2fbe248c: Merge "Grant default permissions if perms reset on upgrade." into mnc-dev
* commit '
2fbe248c155a716d0345f683963aef7c95cc02b6':
Grant default permissions if perms reset on upgrade.
Filip Gruszczynski [Fri, 19 Jun 2015 23:57:06 +0000 (23:57 +0000)]
am
a51f8b90: am
73187e57: am
dd91362c: Make sure home activity gets resumed after started.
* commit '
a51f8b90f53acbd8967755a39096705704980d05':
Make sure home activity gets resumed after started.
Adrian Roos [Fri, 19 Jun 2015 23:51:20 +0000 (23:51 +0000)]
Merge "Tweak assist disclosure animation" into mnc-dev
Robert Shih [Fri, 19 Jun 2015 23:49:44 +0000 (23:49 +0000)]
Merge "MediaPlayer: documentation for error/info codes." into mnc-dev
Quddus Chong [Fri, 19 Jun 2015 23:49:15 +0000 (23:49 +0000)]
am
4437a129: Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
* commit '
4437a1294e26507449b48783a31b422d769af53b':
docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976
Quddus Chong [Fri, 19 Jun 2015 23:49:11 +0000 (23:49 +0000)]
am
cdc28652: Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
* commit '
cdc28652601d977bd0964d088b9070f6d2ef32d9':
docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002
Junda Liu [Fri, 19 Jun 2015 23:48:57 +0000 (23:48 +0000)]
Merge "Fix spelling of a config variable." into mnc-dev
Adrian Roos [Fri, 19 Jun 2015 22:57:25 +0000 (15:57 -0700)]
Tweak assist disclosure animation
Bug:
21568059
Change-Id: I81666bed4d4ae3eb1998cfdcc652921bafeae7f2
Robert Shih [Fri, 19 Jun 2015 18:14:00 +0000 (11:14 -0700)]
MediaPlayer: documentation for error/info codes.
Documented in this change:
MEDIA_ERROR_SYSTEM, and
MEDIA_INFO_NETWORK_BANDWIDTH
Bug:
18237764
Change-Id: I0e1efb5813ab0f65133d4119de7562912947c41d
Christopher Ferris [Fri, 19 Jun 2015 23:46:53 +0000 (23:46 +0000)]
Merge "Add libwilhelm to app_process." into mnc-dev
Svetoslav [Fri, 19 Jun 2015 23:43:10 +0000 (23:43 +0000)]
Merge "Grant default permissions if perms reset on upgrade." into mnc-dev
Svetoslav [Fri, 19 Jun 2015 23:42:22 +0000 (16:42 -0700)]
Grant default permissions if perms reset on upgrade.
Change-Id: I371e8eb42dc8e8953a184d29cc2a3bd2c361097e
Filip Gruszczynski [Fri, 19 Jun 2015 23:42:16 +0000 (23:42 +0000)]
am
73187e57: am
dd91362c: Make sure home activity gets resumed after started.
* commit '
73187e5761063340d2092c37f5584c9b56e4a11e':
Make sure home activity gets resumed after started.
Quddus Chong [Fri, 19 Jun 2015 23:37:39 +0000 (23:37 +0000)]
Merge "docs: Add link from TV design page on DAC to Android TV spec on Google Design site. bug:
21786976" into mnc-preview-docs
Quddus Chong [Fri, 19 Jun 2015 23:37:10 +0000 (23:37 +0000)]
Merge "docs: Updated Recommending TV Content lesson to support card customization. bug:
21787002" into mnc-preview-docs
Doris Liu [Fri, 19 Jun 2015 22:00:24 +0000 (15:00 -0700)]
Fix NumberPicker.setWrapSelectorWheel(boolean) not respecting user choice
The issue states that NumberPicker.setWrapSelectorWheel(false) only works
in a specific call order. The underlying problem is that NumberPicker
does not remember user's preference on whether the selector wheel should
be wrapped. Therefore, it only works when user sets their preference last,
after everything else that could affect the choice gets executed.
Bug:
19049714
Change-Id: Ic27d909cb3dd657993a4df9a04c819b6965ad11b
OSDN Git Service
