OSDN Git Service
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:15 +0000 (18:55 +0000)]
docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103
am:
1ebaca58c4
Change-Id: Ic47192af2c1501fc7dfb54cb8594ea497172ed5b
Jason Monk [Tue, 26 Jul 2016 18:46:18 +0000 (18:46 +0000)]
Merge \"Fix double status bar icons\" into nyc-mr1-dev
am:
9448f1b74a
Change-Id: I49f42dd69e0fffbfa10d8616199452b1d22cd492
Jason Monk [Tue, 26 Jul 2016 18:46:13 +0000 (18:46 +0000)]
Fix double status bar icons
am:
c6fe61c59c
Change-Id: I5d881904102d23f7aa0f593fcde496a2865bef29
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:42 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I82716c1bfd4748d61ae01909bbed0156fa43faa9
Jason Monk [Tue, 26 Jul 2016 18:39:13 +0000 (18:39 +0000)]
Merge "Fix double status bar icons" into nyc-mr1-dev
Aga Madurska [Tue, 26 Jul 2016 18:08:55 +0000 (18:08 +0000)]
Merge \"Use correct bounds for scroll bar rendering.\" into nyc-mr1-dev
am:
af9d5daae7
Change-Id: I9e5514fa1795d88fa033438797c076d5a4b4fa46
Aga Madurska [Tue, 26 Jul 2016 18:08:47 +0000 (18:08 +0000)]
Use correct bounds for scroll bar rendering.
am:
8cc883de9e
Change-Id: Ie82427a678241e7237144bbe76493c055a17bc2d
Agnieszka Madurska [Tue, 26 Jul 2016 17:47:29 +0000 (17:47 +0000)]
Merge "Use correct bounds for scroll bar rendering." into nyc-mr1-dev
fionaxu [Tue, 26 Jul 2016 17:09:29 +0000 (17:09 +0000)]
Merge \"add pii support for Rlog\" into nyc-mr1-dev
am:
a0f07728d9
Change-Id: Iec198c636f75347116b54314626b0d107df13a24
fionaxu [Tue, 26 Jul 2016 17:09:25 +0000 (17:09 +0000)]
add pii support for Rlog
am:
a7ab821aa1
Change-Id: I47153d683efd3256d6ee8d5b9417069b097f65c9
Jason Monk [Tue, 26 Jul 2016 17:04:50 +0000 (13:04 -0400)]
Fix double status bar icons
Don't allow the status bar icon slot list to be changed because
it confuses the relationship between StatusBarIconList and
StatusBarIconController. Set it in the constructor to enforce
this.
Change-Id: Ieeea0a9efad88179d1cccc0e5702899333de2e72
Fixes:
28524184
Chen Xu [Tue, 26 Jul 2016 17:00:17 +0000 (17:00 +0000)]
Merge "add pii support for Rlog" into nyc-mr1-dev
Aga Madurska [Tue, 26 Jul 2016 14:40:31 +0000 (15:40 +0100)]
Use correct bounds for scroll bar rendering.
Bug:
30001373
Change-Id: I20c77a2d97096bda451c3a871fd6be7ad699b047
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:55:13 +0000 (15:55 +0000)]
Merge \\\"Fix memory leak in MediaScannerConnection\\\" am:
e40ab18590 am:
0d5bcda101
am:
fd743b4d56
Change-Id: I9a8ef3f3ae06b5054f426e7936c5aa9548a9dfcd
Marco Nelissen [Tue, 26 Jul 2016 15:48:05 +0000 (15:48 +0000)]
Merge \\"Fix memory leak in MediaScannerConnection\\" am:
e40ab18590
am:
0d5bcda101
Change-Id: I5714252c0373db0fc85bf65df7b52c983fbc6171
xiaoli.xb.zuo [Tue, 26 Jul 2016 15:43:55 +0000 (15:43 +0000)]
Merge \"Fix memory leak in MediaScannerConnection\"
am:
e40ab18590
Change-Id: I894584a5d193624acc78c20a6207b54b20b61563
Marco Nelissen [Tue, 26 Jul 2016 15:37:32 +0000 (15:37 +0000)]
Merge "Fix memory leak in MediaScannerConnection"
Paul Jensen [Tue, 26 Jul 2016 14:39:45 +0000 (14:39 +0000)]
Merge \"Sanity check ICMP6 router advertisement packets\" into nyc-mr1-dev
am:
4e40413c50
Change-Id: I5365b39534fd01efe9f2d8e74efd1ccba06eba4a
Paul Jensen [Tue, 26 Jul 2016 14:39:42 +0000 (14:39 +0000)]
Sanity check ICMP6 router advertisement packets
am:
4b545b04f6
Change-Id: I129ce4cbe5c893e507050ff23fd2f5261466c970
Paul Jensen [Tue, 26 Jul 2016 14:33:30 +0000 (14:33 +0000)]
Merge \"Don\'t let sign-in to network app appear in recents when it finishes\" into nyc-mr1-dev
am:
c78bd7f01f
Change-Id: I288ab6796ab15e982423cf6e58bfdacf1ca5cf52
Paul Jensen [Tue, 26 Jul 2016 14:33:26 +0000 (14:33 +0000)]
Don\'t let sign-in to network app appear in recents when it finishes
am:
6a776c8317
Change-Id: Id0bca631f030c8c344b1bcac52f731152ab858a0
Paul Jensen [Tue, 26 Jul 2016 14:29:59 +0000 (14:29 +0000)]
Merge "Sanity check ICMP6 router advertisement packets" into nyc-mr1-dev
Paul Jensen [Tue, 26 Jul 2016 14:26:29 +0000 (14:26 +0000)]
Merge "Don't let sign-in to network app appear in recents when it finishes" into nyc-mr1-dev
Hugo Benichi [Tue, 26 Jul 2016 05:34:56 +0000 (05:34 +0000)]
Merge \"Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission\" into nyc-mr1-dev
am:
7c731f9e1f
Change-Id: I22c2a9aaedcdbf842c1afe119edaaac18c3522df
Hugo Benichi [Tue, 26 Jul 2016 04:08:14 +0000 (13:08 +0900)]
resolve merge conflicts of
514da60 to nyc-mr1-dev-plus-aosp
Change-Id: Ib1c01241fece36f660d27f3450ba8059b3b2809f
Hugo Benichi [Tue, 26 Jul 2016 02:46:30 +0000 (02:46 +0000)]
Merge "Add CONNECTIVITY_USE_RESTRICTED_NETWORKS permission" into nyc-mr1-dev
Chris Craik [Tue, 26 Jul 2016 00:29:48 +0000 (00:29 +0000)]
Merge \"Avoid destroying TextureView surfaces for onStop\" into nyc-mr1-dev
am:
eaa6d6b2c9
Change-Id: Ic8207def7703c1209dbb3b33301803b32cc44bb7
Chris Craik [Tue, 26 Jul 2016 00:29:44 +0000 (00:29 +0000)]
Avoid destroying TextureView surfaces for onStop
am:
391d560402
Change-Id: I6e1e5a5f024410e7e0288910386cbc439b8a9039
TreeHugger Robot [Tue, 26 Jul 2016 00:06:43 +0000 (00:06 +0000)]
Merge "Avoid destroying TextureView surfaces for onStop" into nyc-mr1-dev
Hangyu Kuang [Mon, 25 Jul 2016 23:45:38 +0000 (23:45 +0000)]
Merge \"media: Add hidden api to set video encoding profile and level.\" into nyc-mr1-dev
am:
e7e1f0b788
Change-Id: I9322ddf1e5dba78363b87976639433f008620753
Hangyu Kuang [Mon, 25 Jul 2016 23:45:35 +0000 (23:45 +0000)]
media: Add hidden api to set video encoding profile and level.
am:
f70ad43f13
Change-Id: I3bb9bf5884d791dd5d97fbda8117d1d4f3b1b40f
TreeHugger Robot [Mon, 25 Jul 2016 23:39:59 +0000 (23:39 +0000)]
Merge "media: Add hidden api to set video encoding profile and level." into nyc-mr1-dev
Michael Kwan [Mon, 25 Jul 2016 23:05:54 +0000 (23:05 +0000)]
Merge \"Add top and bottom panel overlay to lists in AlertDialog for watch.\" into nyc-mr1-dev
am:
ad74941699
Change-Id: I36e7157a24141db4cd17828206435788b8abb69a
Michael Kwan [Mon, 25 Jul 2016 23:05:43 +0000 (23:05 +0000)]
Add top and bottom panel overlay to lists in AlertDialog for watch.
am:
55e4030f77
Change-Id: I383c2ad50871265c1f521ecfd7f46d15027dc29c
Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:31 +0000 (23:05 +0000)]
Merge \"Fix AM.revokeUriPermissionFromOwner for prefix mode.\" into nyc-mr1-dev
am:
0217d4e6b8
Change-Id: I90c33ff1d5d24f2cd5e578d98193ee900eff6cc1
Vladislav Kaznacheev [Mon, 25 Jul 2016 23:05:22 +0000 (23:05 +0000)]
Fix AM.revokeUriPermissionFromOwner for prefix mode.
am:
4498aa6c58
Change-Id: I752efeb20f5fd28576babb7f90bdc79dbec02366
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:14 +0000 (23:05 +0000)]
Merge \"Set title in onCreate.\" into nyc-mr1-dev
am:
fb5a07938f
Change-Id: Icfb399258314565515c151cb3d3b188b868a76b2
Philip P. Moltmann [Mon, 25 Jul 2016 23:05:10 +0000 (23:05 +0000)]
Set title in onCreate.
am:
fef31ad5ae
Change-Id: Ide036a4f9bed9953040be7aa0f0fee26f9c84c82
Android Build Merger (Role) [Mon, 25 Jul 2016 22:52:07 +0000 (22:52 +0000)]
Merge changes I1acc3a4f,Ib049d75f into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev am:
65dfc2a3e5
Fix NPE in ValueAnimator am:
543a7ed7af
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:53 +0000 (22:51 +0000)]
Merge changes from topic 'am-
9fd0a895a44f4e7ebb6eebb2d79a62a9' into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev am:
4e0fc3ccd2
Enforce consistent sizes for arrays in SpannableStringInternal am:
83549088c6
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:38 +0000 (22:51 +0000)]
Merge changes Idf939fd3,I6ae3f730 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev am:
d021ba34fb
Handle USB power role \'sink\' am:
0135516153
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:21 +0000 (22:51 +0000)]
Merge "Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5 am:
0da397ea71" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Mon, 25 Jul 2016 22:51:03 +0000 (22:51 +0000)]
Merge "docs: updates to Buildilng Your First App doc am:
08d1bff71f am:
325ce1a475" into nyc-mr1-dev-plus-aosp
Justin Klaassen [Mon, 25 Jul 2016 22:50:11 +0000 (22:50 +0000)]
Merge \"Fix NPE in ValueAnimator\" into nyc-mr1-dev
am:
65dfc2a3e5
Change-Id: I1acc3a4f5e540900f6e798e924ff26d5ab954d89
Justin Klaassen [Mon, 25 Jul 2016 22:50:07 +0000 (22:50 +0000)]
Fix NPE in ValueAnimator
am:
543a7ed7af
Change-Id: Ib049d75f8c8460c3e7498080bbe502e67078e6ac
Raph Levien [Mon, 25 Jul 2016 22:49:47 +0000 (22:49 +0000)]
Merge \"Enforce consistent sizes for arrays in SpannableStringInternal\" into nyc-mr1-dev
am:
4e0fc3ccd2
Change-Id: I1d9951d56d0ba4893e4b09fb984cde3328ec390a
Raph Levien [Mon, 25 Jul 2016 22:49:14 +0000 (22:49 +0000)]
Enforce consistent sizes for arrays in SpannableStringInternal
am:
83549088c6
Change-Id: I6fd3b65dd388abcce6f8b7062f396a6fcf8fdf7a
Philip P. Moltmann [Mon, 25 Jul 2016 22:49:02 +0000 (22:49 +0000)]
Merge \"Handle USB power role \'sink\'\" into nyc-mr1-dev
am:
d021ba34fb
Change-Id: Idf939fd3875a4b232ebde6cd43a6d03e13f85a36
Philip P. Moltmann [Mon, 25 Jul 2016 22:48:54 +0000 (22:48 +0000)]
Handle USB power role \'sink\'
am:
0135516153
Change-Id: I6ae3f73072d811fc4319ff8c498962fc1802fb6f
Mark Lu [Mon, 25 Jul 2016 22:48:49 +0000 (22:48 +0000)]
Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5
am:
0da397ea71
Change-Id: Ifafd54ba11ada726905b9e0fc3a936d59ffd968d
Mark Lu [Mon, 25 Jul 2016 22:48:45 +0000 (22:48 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f
am:
325ce1a475
Change-Id: Ia206bc01acd7eb17ed3ce2074c84f479351b970f
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:47 +0000 (22:47 +0000)]
Merge changes I39b8c6a5,I6a15fdea,I459d3e01 into nyc-mr1-dev-plus-aosp
* changes:
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev am:
52a11f7c64
Fixes a bug where the lockscreen would be frozen am:
3127daf036
Allow home button to be tapped while a incoming call shows a HUN am:
64be772e03
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:30 +0000 (22:47 +0000)]
Merge changes I19e53731,I12ec6445 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev am:
5c6f5afd19
QS: Cleanup detail toggle on am:
35a9c14cc6
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:17 +0000 (22:47 +0000)]
Merge changes I2107c355,I60b5e161 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev am:
425023fcda
QS: Fixup footer + animations am:
df36aed859
Android Build Merger (Role) [Mon, 25 Jul 2016 22:47:03 +0000 (22:47 +0000)]
Merge changes I5a1e9d04,Ic6f20e06 into nyc-mr1-dev-plus-aosp
* changes:
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev am:
961492cc30
Don\'t reset layout params when repositioning am:
90dfb89916
Android Build Merger (Role) [Mon, 25 Jul 2016 22:46:46 +0000 (22:46 +0000)]
Merge "Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96 am:
dd756c26e2" into nyc-mr1-dev-plus-aosp
Selim Cinek [Mon, 25 Jul 2016 22:45:40 +0000 (22:45 +0000)]
Merge changes from topic \'home-button-lock-nyc-mr1-dev\' into nyc-mr1-dev
am:
52a11f7c64
Change-Id: I39b8c6a55804b088705889888d006695ef54231d
Selim Cinek [Mon, 25 Jul 2016 22:45:36 +0000 (22:45 +0000)]
Fixes a bug where the lockscreen would be frozen
am:
3127daf036
Change-Id: I6a15fdea3a17a9f6991931edfcd6aa7b224ff159
Selim Cinek [Mon, 25 Jul 2016 22:45:30 +0000 (22:45 +0000)]
Allow home button to be tapped while a incoming call shows a HUN
am:
64be772e03
Change-Id: I459d3e0160f0b4acdd64e31dc31948685a98cf2a
Jason Monk [Mon, 25 Jul 2016 22:45:24 +0000 (22:45 +0000)]
Merge \"QS: Cleanup detail toggle on\" into nyc-mr1-dev
am:
5c6f5afd19
Change-Id: I19e5373128c30c46838ba80d3a4d49581f7793ee
Jason Monk [Mon, 25 Jul 2016 22:45:21 +0000 (22:45 +0000)]
QS: Cleanup detail toggle on
am:
35a9c14cc6
Change-Id: I12ec6445c3536235d900f23af57bedf9efcdec28
Jason Monk [Mon, 25 Jul 2016 22:45:15 +0000 (22:45 +0000)]
Merge \"QS: Fixup footer + animations\" into nyc-mr1-dev
am:
425023fcda
Change-Id: I2107c3557322dea92559e469218fae0a7fb174b4
Jason Monk [Mon, 25 Jul 2016 22:45:11 +0000 (22:45 +0000)]
QS: Fixup footer + animations
am:
df36aed859
Change-Id: I60b5e161595199b8d7dd9ae9f6932f3d9075b9fb
Jorim Jaggi [Mon, 25 Jul 2016 22:45:06 +0000 (22:45 +0000)]
Merge \"Don\'t reset layout params when repositioning\" into nyc-mr1-dev
am:
961492cc30
Change-Id: I5a1e9d04eaaacd63ffa5e6d9d7874c636b45addc
Jorim Jaggi [Mon, 25 Jul 2016 22:45:02 +0000 (22:45 +0000)]
Don\'t reset layout params when repositioning
am:
90dfb89916
Change-Id: Ic6f20e06700728935bb0bfc3bc983b068d05079b
Dirk Dougherty [Mon, 25 Jul 2016 22:44:57 +0000 (22:44 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96
am:
dd756c26e2
Change-Id: I52d47ffe259c163031a931f566f0eaa9fa0657e2
Mark Lu [Mon, 25 Jul 2016 22:43:41 +0000 (22:43 +0000)]
Merge \\"docs: updates to Buildilng Your First App doc\\" into nyc-dev am:
d579d713a5
am:
041ac3d576
Change-Id: I27935655a4b00ef82dd6eb59ffe25bcc4f41220c
Mark Lu [Mon, 25 Jul 2016 22:43:36 +0000 (22:43 +0000)]
docs: updates to Buildilng Your First App doc am:
08d1bff71f
am:
04fb0c328d
Change-Id: Iaa8c32faaef6e0ebd34d81d2be7797ffa49a1f6a
Dirk Dougherty [Mon, 25 Jul 2016 22:43:30 +0000 (22:43 +0000)]
Merge \\"Fix code tags that contain html encoded characters, and fix at links.\\" into nyc-dev am:
fc0bc7bf96
am:
b653777ae3
Change-Id: I0bee12de83f9262afc89459c33d0f450d02e8065
Elliot Waite [Mon, 25 Jul 2016 22:39:04 +0000 (22:39 +0000)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
am:
66641f8ec5
Change-Id: Ie46a3e22905ba61eedb1c5b26a838d77c680d829
Mark Lu [Mon, 25 Jul 2016 22:38:18 +0000 (22:38 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Id58dd0692053ddbf41a93d6f2e45d78c4ef50df5
Mark Lu [Mon, 25 Jul 2016 22:38:08 +0000 (22:38 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I66aa204bf8618ab5af8613fac350d511b3f0486b
Elliot Waite [Mon, 25 Jul 2016 22:37:56 +0000 (22:37 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am:
fc0bc7bf96
Change-Id: Ib71dafd15bb5b6fb16cb44fd0fa659b2f100118e
Chris Craik [Mon, 25 Jul 2016 22:29:59 +0000 (15:29 -0700)]
Avoid destroying TextureView surfaces for onStop
bug:
30238922
TextureViews will hold onto their backing surfaces, which will allow
them to resume gracefully when the app's surfaces are saved.
Now only resources that are destroyed for onStop are DisplayLists.
Change-Id: Ia768ba9ffc4497c26aa3a5b101a0f5fa1a258b9c
fionaxu [Mon, 25 Jul 2016 22:05:14 +0000 (15:05 -0700)]
add pii support for Rlog
bug:
30368127
Change-Id: I18b7be483ce3f86f47dfcafa9d84fcb9b8724c08
Michael Kwan [Mon, 25 Jul 2016 22:15:38 +0000 (22:15 +0000)]
Merge "Add top and bottom panel overlay to lists in AlertDialog for watch." into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 21:55:51 +0000 (21:55 +0000)]
Merge "Fix AM.revokeUriPermissionFromOwner for prefix mode." into nyc-mr1-dev
Kevin Hufnagle [Wed, 20 Jul 2016 21:14:55 +0000 (14:14 -0700)]
docs: Migrated "key attestation" page to a new location (for N OTA).
Updated page location, TOC entry, and URL redirect in preparation
for Android Nougat OTA release.
Bug:
28851641
Change-Id: I8be252d79b0b5ad3c7d814175e6bfbfb98e95daf
Hangyu Kuang [Fri, 22 Jul 2016 17:47:16 +0000 (10:47 -0700)]
media: Add hidden api to set video encoding profile and level.
bug:
30284097
Change-Id: I898f9a05571098a0ca0f57fb5abf58567c16fdd1
TreeHugger Robot [Mon, 25 Jul 2016 21:26:36 +0000 (21:26 +0000)]
Merge "Set title in onCreate." into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 21:01:46 +0000 (21:01 +0000)]
Merge "Fix NPE in ValueAnimator" into nyc-mr1-dev
Dirk Dougherty [Mon, 25 Jul 2016 20:10:42 +0000 (13:10 -0700)]
resolve merge conflicts of
c88afb6 to nyc-mr1-dev-plus-aosp
Change-Id: I4f9e194d2e07852799cafabae7289a61cae18bb3
Raph Levien [Mon, 25 Jul 2016 20:52:39 +0000 (20:52 +0000)]
Merge "Enforce consistent sizes for arrays in SpannableStringInternal" into nyc-mr1-dev
Dirk Dougherty [Mon, 25 Jul 2016 20:47:53 +0000 (13:47 -0700)]
resolve merge conflicts of
c4ae782 to nyc-dev-plus-aosp
Change-Id: Ib81e71e0b9a17a4231d93f02f41c7722fad84ec3
TreeHugger Robot [Mon, 25 Jul 2016 20:23:13 +0000 (20:23 +0000)]
Merge "Handle USB power role 'sink'" into nyc-mr1-dev
Philip P. Moltmann [Mon, 25 Jul 2016 20:07:56 +0000 (13:07 -0700)]
Set title in onCreate.
This makes sure the accessibility service recognizes the correcy title.
Fixes:
30220082
Change-Id: Ieaa37818a55c7b2e543bbe8bd8836996ef0529d2
Justin Klaassen [Sat, 23 Jul 2016 02:30:03 +0000 (19:30 -0700)]
Fix NPE in ValueAnimator
- Reset mAnimationEndRequested to false in ValueAnimator#start(boolean)
so that previously canceled animated (with a start delay) can be
canceled again.
- In ObjectAnimator#animateValue(float) check if target == null
regardless of mTarget == null since it's possible the target was
explicitly set to null prior to the animator being cancelled.
Bug:
30190459
Change-Id: I6da55737df30a28f48355fc7a41ab91d05979deb
Mark Lu [Mon, 25 Jul 2016 18:59:59 +0000 (18:59 +0000)]
Merge \"docs: updates to Buildilng Your First App doc\" into nyc-dev
am:
d579d713a5
Change-Id: Iaea16a4bd5271a9ef50e0e27556f491a0ac0d314
Mark Lu [Mon, 25 Jul 2016 18:59:56 +0000 (18:59 +0000)]
docs: updates to Buildilng Your First App doc
am:
08d1bff71f
Change-Id: I030bd03c3f83ecc8332165dea75785cc78c3a114
Selim Cinek [Mon, 25 Jul 2016 18:49:48 +0000 (18:49 +0000)]
Merge changes from topic 'home-button-lock-nyc-mr1-dev' into nyc-mr1-dev
* changes:
Fixes a bug where the lockscreen would be frozen
Allow home button to be tapped while a incoming call shows a HUN
TreeHugger Robot [Mon, 25 Jul 2016 18:45:50 +0000 (18:45 +0000)]
Merge "docs: updates to Buildilng Your First App doc" into nyc-dev
Jason Monk [Mon, 25 Jul 2016 18:38:37 +0000 (18:38 +0000)]
Merge "QS: Cleanup detail toggle on" into nyc-mr1-dev
Jason Monk [Mon, 25 Jul 2016 18:36:00 +0000 (18:36 +0000)]
Merge "QS: Fixup footer + animations" into nyc-mr1-dev
TreeHugger Robot [Mon, 25 Jul 2016 18:34:33 +0000 (18:34 +0000)]
Merge "Don't reset layout params when repositioning" into nyc-mr1-dev
Raph Levien [Mon, 25 Jul 2016 17:05:35 +0000 (10:05 -0700)]
Enforce consistent sizes for arrays in SpannableStringInternal
The grow logic in SpannableStringInternal#setSpan assumes that the
size of mSpanData is consistent with that of mSpans, in particular
that if the latter doesn't need to grow, neither does the former.
The copySpans() method didn't enforce this, creating an mSpanData
array only big enough to hold the data.
This patch documents the invariant in a comment and enforces it.
Bug:
30359314
Change-Id: Ie25db70a76836e97af8476a7f5c10cb4b976c1cf
Bill Yi [Mon, 25 Jul 2016 17:15:31 +0000 (17:15 +0000)]
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am:
a2d4d0b599 -s ours
Change-Id: I61ff6cde5c1e725d4c5f5cdf8bbc18f7ddcd5815
Bill Yi [Mon, 25 Jul 2016 17:15:28 +0000 (17:15 +0000)]
Import translations. DO NOT MERGE
am:
da6099ec45 -s ours
Change-Id: I31e6241df14f4ff88fc81884367f56c5c29b58de
Mark Lu [Fri, 15 Jul 2016 20:36:55 +0000 (13:36 -0700)]
docs: updates to Buildilng Your First App doc
This commit includes the following updates:
- replaces Basic activity with Empty activity
- uses default values wherever possible
- removes instructions for floating button
- removes SDK instructions. Users must use Android Studio
- updates the SDK version to API 15
- combines some instructions that were too text heavy
Bug:
29766869
Bug:
29768686
Bug:
19154557
Change-Id: Id819cb2dde74b68b5145dfefe7a8502892bb377a
Elliot Waite [Mon, 25 Jul 2016 17:14:58 +0000 (17:14 +0000)]
Merge \"Fix code tags that contain html encoded characters, and fix at links.\" into nyc-dev
am:
fc0bc7bf96
Change-Id: Id9bf642ea3d5105efbfa4663ced5c6f660e0fd7f
Elliot Waite [Mon, 25 Jul 2016 17:14:56 +0000 (17:14 +0000)]
Fix code tags that contain html encoded characters, and fix at links.
am:
c4ae7827e2
Change-Id: I9d5adc8d151a6d6ed1b8f81630bbf8a93329f181
OSDN Git Service
