OSDN Git Service
Christopher Tate [Wed, 27 Jul 2016 01:36:17 +0000 (01:36 +0000)]
Fix wallpaper restore from pre-N devices am:
ebadfb17e7
am:
ac2f0b2c51
Change-Id: I7b8c8eb3e880389d1f70fd15f9d82bd815f1be16
Amith Yamasani [Wed, 27 Jul 2016 01:36:09 +0000 (01:36 +0000)]
Merge \\"Persist configuration for the calling or current user\\" into nyc-mr1-dev am:
7853ba63cd
am:
2e8bc33cdc
Change-Id: I71a44e3636515ace4bbfef72ad8601c44968c55d
Amith Yamasani [Wed, 27 Jul 2016 01:33:34 +0000 (01:33 +0000)]
Persist configuration for the calling or current user am:
034ec49b19
am:
cd1b117b48
Change-Id: I7d06ccfdeab31c5f2b3bdcdbb955dcc6a64925c4
Adrian Roos [Wed, 27 Jul 2016 01:33:27 +0000 (01:33 +0000)]
Merge \\"Never show transient navigation bar when empty\\" into nyc-mr1-dev am:
6da6657858
am:
c3ac2f182a
Change-Id: I94602d470e47a06a95594d12b65d89b9dd0ffc57
Adrian Roos [Wed, 27 Jul 2016 01:33:23 +0000 (01:33 +0000)]
Never show transient navigation bar when empty am:
1f4259057e
am:
794d684b69
Change-Id: Idd985c9dcc61e1ea03385288541e195b8f91b757
Jean-Michel Trivi [Wed, 27 Jul 2016 01:33:18 +0000 (01:33 +0000)]
Merge \\"Change AudioRecordingConfiguration constructor parameter order\\" into nyc-mr1-dev am:
57de824d64
am:
182af0a5b8
Change-Id: Ia0c3c6c9271beee6bd2eb0539ef7a8af86320ccf
Jean-Michel Trivi [Wed, 27 Jul 2016 01:33:13 +0000 (01:33 +0000)]
Change AudioRecordingConfiguration constructor parameter order am:
74eb6f62f8
am:
5145713e75
Change-Id: I38a6a836b536e3f191d2a8845d142204d3a92fc6
Jin Seok Park [Wed, 27 Jul 2016 01:29:44 +0000 (01:29 +0000)]
Merge "ExifInterface: Add PEF, RW2 files parse support"
Christopher Tate [Wed, 27 Jul 2016 01:18:05 +0000 (01:18 +0000)]
Fix wallpaper restore from pre-N devices
am:
ebadfb17e7
Change-Id: I4f88e555929bd9e48983dce64dc66f9e7fd46dc9
Amith Yamasani [Wed, 27 Jul 2016 01:17:59 +0000 (01:17 +0000)]
Merge \"Persist configuration for the calling or current user\" into nyc-mr1-dev
am:
7853ba63cd
Change-Id: I4990c800cb81410887f090f6365c91f18113bf28
Amith Yamasani [Wed, 27 Jul 2016 01:17:55 +0000 (01:17 +0000)]
Persist configuration for the calling or current user
am:
034ec49b19
Change-Id: Id5809af87a9d72cc93851ee32a437aea1849bc8a
Adrian Roos [Wed, 27 Jul 2016 01:17:46 +0000 (01:17 +0000)]
Merge \"Never show transient navigation bar when empty\" into nyc-mr1-dev
am:
6da6657858
Change-Id: Ice30e61695cca73a87e67e1a06b4547305b835fc
Adrian Roos [Wed, 27 Jul 2016 01:17:42 +0000 (01:17 +0000)]
Never show transient navigation bar when empty
am:
1f4259057e
Change-Id: I47739b5b1687457121564ef5f8fe9c7bb90b5b4b
Jean-Michel Trivi [Wed, 27 Jul 2016 01:17:34 +0000 (01:17 +0000)]
Merge \"Change AudioRecordingConfiguration constructor parameter order\" into nyc-mr1-dev
am:
57de824d64
Change-Id: I83bc976088eb861966dd9267fc8b07f1b8128f8b
Jean-Michel Trivi [Wed, 27 Jul 2016 01:17:29 +0000 (01:17 +0000)]
Change AudioRecordingConfiguration constructor parameter order
am:
74eb6f62f8
Change-Id: Ief48fc6b7b7f04d00ca11858b8b248cb449b2aab
Mark Lu [Wed, 27 Jul 2016 01:13:05 +0000 (01:13 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe am:
3977f8351a am:
9efcf16b8d
am:
967b43dde5
Change-Id: I57e46c6e452b96fd40b5470d729edb8e110cc6b7
Garfield, Tan [Wed, 27 Jul 2016 01:13:00 +0000 (01:13 +0000)]
Merge \\"DO NOT MERGE: Change the order of 2 statements to remove race.\\" into nyc-mr1-dev am:
45ae57eab4
am:
bcf1491cfa -s ours
Change-Id: Ieb58ddd7107634142058b70fc19e14ba5bac6b9f
Garfield, Tan [Wed, 27 Jul 2016 01:12:57 +0000 (01:12 +0000)]
DO NOT MERGE: Change the order of 2 statements to remove race. am:
ebb8450cd0
am:
877c28f9ad -s ours
Change-Id: Id3f464a54b8ce5d301e33355e55935e090b85df6
Mark Lu [Wed, 27 Jul 2016 01:08:41 +0000 (01:08 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe am:
3977f8351a
am:
9efcf16b8d
Change-Id: I5f0cf7713252c4972e6a08894ee72b25fbb1a6a9
Mark Lu [Wed, 27 Jul 2016 00:49:19 +0000 (00:49 +0000)]
docs: updates to Buildilng Your First App doc am:
ae47d9d4fe
am:
3977f8351a
Change-Id: Iea59ad167957f314adc09d90f734e1cd123577e4
Mark Lu [Wed, 27 Jul 2016 00:40:03 +0000 (00:40 +0000)]
docs: updates to Buildilng Your First App doc
am:
ae47d9d4fe
Change-Id: I7b3665dc0f304dcae06939a56c2423d9b269420c
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
(cherry picked from commit
08d1bff71f19e5567b8f545314fd84701e9b2cec)
Roozbeh Pournader [Tue, 26 Jul 2016 23:11:33 +0000 (23:11 +0000)]
Merge "Check defaults for Android default-emoji characters"
Roozbeh Pournader [Tue, 26 Jul 2016 01:14:14 +0000 (18:14 -0700)]
Check defaults for Android default-emoji characters
There are 12 characters that Android is defaulting to emoji,
differing from UTR #51 recommendation. This tests for their proper
support.
Change-Id: Icd570510090ef29b3b7a3520bc368c5f77f99fa4
Amith Yamasani [Tue, 26 Jul 2016 22:48:13 +0000 (22:48 +0000)]
Merge "Persist configuration for the calling or current user" into nyc-mr1-dev
Adrian Roos [Tue, 26 Jul 2016 22:41:54 +0000 (22:41 +0000)]
Merge "Never show transient navigation bar when empty" into nyc-mr1-dev
Jean-Michel Trivi [Tue, 26 Jul 2016 22:24:43 +0000 (22:24 +0000)]
Merge "Change AudioRecordingConfiguration constructor parameter order" into nyc-mr1-dev
Garfield, Tan [Tue, 26 Jul 2016 22:22:46 +0000 (22:22 +0000)]
Merge \"DO NOT MERGE: Change the order of 2 statements to remove race.\" into nyc-mr1-dev
am:
45ae57eab4
Change-Id: Ia7cd363c31ff456071872dd30d2b9ffb1ebc7941
Garfield, Tan [Tue, 26 Jul 2016 22:22:42 +0000 (22:22 +0000)]
DO NOT MERGE: Change the order of 2 statements to remove race.
am:
ebb8450cd0
Change-Id: Ica31fe1487551db935714f3d89543aff043d40b6
Jeff Sharkey [Tue, 26 Jul 2016 22:09:38 +0000 (22:09 +0000)]
Merge \\"Polish up PRE_BOOT notification.\\" into nyc-mr1-dev am:
445c01b591
am:
e5eaf129a8
Change-Id: I858b243ba715468546f6c0d598c1bb18ee4d4550
Jeff Sharkey [Tue, 26 Jul 2016 22:09:35 +0000 (22:09 +0000)]
Polish up PRE_BOOT notification. am:
288414e226
am:
c83a4fcc1f
Change-Id: Ia436ac15ca0da16c6389c949b2646d06425be235
TreeHugger Robot [Tue, 26 Jul 2016 22:01:43 +0000 (22:01 +0000)]
Merge "DO NOT MERGE: Change the order of 2 statements to remove race." into nyc-mr1-dev
Jeff Sharkey [Tue, 26 Jul 2016 22:01:30 +0000 (22:01 +0000)]
Merge \"Polish up PRE_BOOT notification.\" into nyc-mr1-dev
am:
445c01b591
Change-Id: Id326e6325e5b060af1e9417e3a6a786b5f677f6a
Jeff Sharkey [Tue, 26 Jul 2016 22:00:16 +0000 (22:00 +0000)]
Polish up PRE_BOOT notification.
am:
288414e226
Change-Id: Ibb123690c44c29ee251b8499e3b0cef5a37f0e95
Chad Brubaker [Tue, 26 Jul 2016 21:54:43 +0000 (21:54 +0000)]
Merge "Add missing sendBroadcastAsUser to BridgeContext"
Jeff Sharkey [Tue, 26 Jul 2016 21:52:04 +0000 (21:52 +0000)]
Merge "Polish up PRE_BOOT notification." into nyc-mr1-dev
Michael Kwan [Tue, 26 Jul 2016 21:44:52 +0000 (21:44 +0000)]
Merge \\"Add titles to PreferenceFragments and PreferenceScreens for watches.\\" into nyc-mr1-dev am:
9f3930d3f7
am:
26f2103f88
Change-Id: I4780f95676a9371d50a622315fbc70cacbeba401
Michael Kwan [Tue, 26 Jul 2016 21:44:49 +0000 (21:44 +0000)]
Add titles to PreferenceFragments and PreferenceScreens for watches. am:
744be16ffa
am:
f704097df4
Change-Id: Iba97f59b84ead98775c803c091c6e4dae6f18d8e
Fei Wu [Tue, 26 Jul 2016 21:44:45 +0000 (21:44 +0000)]
Merge \\"Fix Switch in SwitchPreference on watch\\" into nyc-mr1-dev am:
90cd4449bb
am:
893ada03ef
Change-Id: I2e1bb01d2830d90ba10ed1e997ea2d0b2cfea371
FEI WU [Tue, 26 Jul 2016 21:44:41 +0000 (21:44 +0000)]
Fix Switch in SwitchPreference on watch am:
ba3a1359ba
am:
ef1852040a
Change-Id: I7b37244451cdec3f534f26b3cb5188cca925cd78
Chad Brubaker [Tue, 26 Jul 2016 21:28:56 +0000 (14:28 -0700)]
Add missing sendBroadcastAsUser to BridgeContext
Change-Id: I843c4a97e07c955d5f588448ec1c147f4634117f
Michael Kwan [Tue, 26 Jul 2016 21:11:51 +0000 (21:11 +0000)]
Merge \"Add titles to PreferenceFragments and PreferenceScreens for watches.\" into nyc-mr1-dev
am:
9f3930d3f7
Change-Id: If4a1d8df880391dc26d608b2486433142b46d317
Michael Kwan [Tue, 26 Jul 2016 21:11:47 +0000 (21:11 +0000)]
Add titles to PreferenceFragments and PreferenceScreens for watches.
am:
744be16ffa
Change-Id: I54847a5ef3ddb4e09cc835433d80e121cf32b725
FEI WU [Tue, 26 Jul 2016 21:11:42 +0000 (21:11 +0000)]
Merge \"Fix Switch in SwitchPreference on watch\" into nyc-mr1-dev
am:
90cd4449bb
Change-Id: I8a36f3177a90c4ca2722da3ac4fa627561482567
FEI WU [Tue, 26 Jul 2016 21:11:39 +0000 (21:11 +0000)]
Fix Switch in SwitchPreference on watch
am:
ba3a1359ba
Change-Id: I4d7d4ecf7dbab7c24abddfca7ac4d33b66591e04
Jean-Michel Trivi [Tue, 26 Jul 2016 18:19:18 +0000 (11:19 -0700)]
Change AudioRecordingConfiguration constructor parameter order
Switch the device and client AudioFormat parameters in the
AudioRecordingConfiguration constructor, so it's the same
order as the rest of the code involved in sending a callback
when the recording configuration changes.
Bug
30282058
Change-Id: Iea417f02dcb644e3d4dacbc0e44ea4b2eac28840
Michael Kwan [Tue, 26 Jul 2016 20:58:46 +0000 (20:58 +0000)]
Merge "Add titles to PreferenceFragments and PreferenceScreens for watches." into nyc-mr1-dev
Makoto Onuki [Tue, 26 Jul 2016 20:55:10 +0000 (20:55 +0000)]
Merge \\"Update ShortcutManager javadoc\\" into nyc-mr1-dev am:
3858c4704c
am:
fc981defac
Change-Id: I753642044fa8cf17f9134002dc9cb375b9c22b31
Makoto Onuki [Tue, 26 Jul 2016 20:55:02 +0000 (20:55 +0000)]
Update ShortcutManager javadoc am:
fe9c9669a4
am:
d09c33f32c
Change-Id: I14fdc704a54e4b8e148b9bcd4127cadf7e89eec1
Fei Wu [Tue, 26 Jul 2016 20:54:28 +0000 (20:54 +0000)]
Merge "Fix Switch in SwitchPreference on watch" into nyc-mr1-dev
Makoto Onuki [Tue, 26 Jul 2016 20:50:04 +0000 (20:50 +0000)]
Merge \"Update ShortcutManager javadoc\" into nyc-mr1-dev
am:
3858c4704c
Change-Id: Ic48a2f015514ef3782f650afdad5d66f7ec9389f
Makoto Onuki [Tue, 26 Jul 2016 20:50:00 +0000 (20:50 +0000)]
Update ShortcutManager javadoc
am:
fe9c9669a4
Change-Id: I4bfaca9ce475e91ec0dae45739b1623ceac8a43c
Adam Powell [Tue, 26 Jul 2016 20:44:43 +0000 (20:44 +0000)]
Merge "Check for target SDK version for out-of-order fragment creation."
Makoto Onuki [Tue, 26 Jul 2016 20:40:03 +0000 (20:40 +0000)]
Merge "Update ShortcutManager javadoc" into nyc-mr1-dev
Chad Brubaker [Tue, 26 Jul 2016 20:25:41 +0000 (20:25 +0000)]
Merge "Add asUser version of sendBroadcast(Intent, String, Bundle)"
Jeff Sharkey [Tue, 26 Jul 2016 19:57:06 +0000 (19:57 +0000)]
Merge \\"Ignore stopped/deleted users when filling cache.\\" into nyc-mr1-dev am:
0711adc84d
am:
0b6c199db1
Change-Id: I444a09c81cac546bee3ebfc59965861521e462ee
Jeff Sharkey [Tue, 26 Jul 2016 19:57:02 +0000 (19:57 +0000)]
Ignore stopped/deleted users when filling cache. am:
38e0d0f512
am:
28f1ec461b
Change-Id: I044791062f3aa95b9ee210dde1bdaf93b7848ace
Jeff Sharkey [Tue, 26 Jul 2016 19:50:26 +0000 (19:50 +0000)]
Merge \"Ignore stopped/deleted users when filling cache.\" into nyc-mr1-dev
am:
0711adc84d
Change-Id: I52ffba44227224a0ca96ed4981fe94f299f77e9d
Jeff Sharkey [Tue, 26 Jul 2016 19:50:23 +0000 (19:50 +0000)]
Ignore stopped/deleted users when filling cache.
am:
38e0d0f512
Change-Id: Ie750e0f87205b4e8738fb2c61f0e9bd996e87b2b
Jeff Sharkey [Tue, 26 Jul 2016 19:36:37 +0000 (19:36 +0000)]
Merge "Ignore stopped/deleted users when filling cache." into nyc-mr1-dev
Kevin Hufnagle [Tue, 26 Jul 2016 19:23:42 +0000 (19:23 +0000)]
Merge \"docs: Migrated \\\"Network Security Configuration\\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551\" into nyc-mr1-dev-plus-aosp
am:
26ec9574d8
Change-Id: I2f73a4075e57a1fb9e898565cf962d7eb2edc20c
Kevin Hufnagle [Tue, 26 Jul 2016 19:23:38 +0000 (19:23 +0000)]
docs: Migrated \\\"Network Security Configuration\\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551
am:
de88cde410
Change-Id: I80584f3d541478d268e7c4fb5fa75f784fe2d135
Kevin Hufnagle [Tue, 26 Jul 2016 19:23:31 +0000 (19:23 +0000)]
docs: Migrated \\\"Network Security Configuration\\\" page on DAC (N OTA). am:
78747a1164 am:
1d7a40b34d
am:
8944bc0c30
Change-Id: Ida4a1395ac4748d289a9d4c74770b2b6640de911
Android Build Merger (Role) [Tue, 26 Jul 2016 19:09:38 +0000 (19:09 +0000)]
Merge "docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164 am:
6d34698551" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:29 +0000 (19:09 +0000)]
Merge \"Merge \\\"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA).\\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a\" into nyc-mr1-dev-plus-aosp
am:
fbec3d57b4
Change-Id: I3950d22b1ffb4c9429df2f5d6b84eab8d1e90dbb
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:18 +0000 (19:09 +0000)]
Merge \\\"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA).\\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a
am:
4333510a37
Change-Id: I673c1e6b63497591290a1543e808a91eb65c134b
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:06 +0000 (19:09 +0000)]
docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164
am:
1d7a40b34d
Change-Id: I6ce90de1a7048724be4c3fc6d4b780eded0d0219
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:03 +0000 (19:09 +0000)]
docs: Migrated \\"Network Security Configuration\\" page on DAC (N OTA). am:
78747a1164
am:
6d34698551
Change-Id: I7907170898ac394ba79d0bd3a908ecd0b823dd5e
Kevin Hufnagle [Tue, 26 Jul 2016 19:09:03 +0000 (19:09 +0000)]
Merge \"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4\" into nyc-mr1-dev-plus-aosp
am:
e57854b650
Change-Id: Ia4467fcbcd63772f75705aa73bf3899ebff06195
Kevin Hufnagle [Tue, 26 Jul 2016 19:08:58 +0000 (19:08 +0000)]
docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4
am:
a7174bbec3
Change-Id: Iee435c27fdc490e88381729dd728bf8e16cf1683
Kevin Hufnagle [Tue, 26 Jul 2016 19:08:50 +0000 (19:08 +0000)]
Merge \\\"docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA).\\\" into nyc-dev am:
6e4d765f95 am:
5fc8256256
am:
e4bd45ded5
Change-Id: I591895ad329bf78d0e2e371daa249a23f2c814a3
Kevin Hufnagle [Tue, 26 Jul 2016 19:08:47 +0000 (19:08 +0000)]
docs: Migrated \\\"key attestation\\\" page to a new location (for N OTA). am:
c946f9d103 am:
acb6f631d8
am:
2c1f99e173
Change-Id: I81dd039ec00cee4c3d361279eada96c409fec92c
Kevin Hufnagle [Tue, 26 Jul 2016 19:04:18 +0000 (19:04 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: I095a1e37838e325f7b10146cde3efb271a315ed2
Kevin Hufnagle [Tue, 26 Jul 2016 19:03:57 +0000 (19:03 +0000)]
docs: Migrated \"Network Security Configuration\" page on DAC (N OTA).
am:
78747a1164
Change-Id: If1ba3b821a6ccb368c6c61212d44ccfd04d8e7ef
Android Build Merger (Role) [Tue, 26 Jul 2016 18:56:19 +0000 (18:56 +0000)]
Merge "Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95 am:
1c2845238a" into nyc-mr1-dev-plus-aosp
Android Build Merger (Role) [Tue, 26 Jul 2016 18:56:01 +0000 (18:56 +0000)]
Merge "docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103 am:
1ebaca58c4" into nyc-mr1-dev-plus-aosp
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:19 +0000 (18:55 +0000)]
Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95
am:
1c2845238a
Change-Id: Ib4da678f3df4a6aea1f9f7e5c270f8b28dc66ab0
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
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:12 +0000 (18:55 +0000)]
Merge \\"docs: Migrated \\"key attestation\\" page to a new location (for N OTA).\\" into nyc-dev am:
6e4d765f95
am:
5fc8256256
Change-Id: I08b7644adbe3e3d01522d5d8f963101953a63836
Kevin Hufnagle [Tue, 26 Jul 2016 18:55:09 +0000 (18:55 +0000)]
docs: Migrated \\"key attestation\\" page to a new location (for N OTA). am:
c946f9d103
am:
acb6f631d8
Change-Id: I2e07ebc5fd1d66971d7cc153da4215d04ddafa60
Jason Monk [Tue, 26 Jul 2016 18:55:06 +0000 (18:55 +0000)]
Merge \\"Fix double status bar icons\\" into nyc-mr1-dev am:
9448f1b74a
am:
c2cccc17c7
Change-Id: Iac1ac2fbc34bd4bb55c28de41164e9164038030d
Jason Monk [Tue, 26 Jul 2016 18:55:03 +0000 (18:55 +0000)]
Fix double status bar icons am:
c6fe61c59c
am:
db8fbb8984
Change-Id: I7090bb9d5a220a267b27a304f1adf0db2c145163
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
Kevin Hufnagle [Thu, 21 Jul 2016 20:30:49 +0000 (13:30 -0700)]
docs: Migrated "Network Security Configuration" page on DAC (N OTA).
This page now resides with other pages discussing Android security
topics.
Bug:
27502850
Change-Id: I8ce3412198527a947e47e421b94c3d15cce6ec48
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:45 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I58fdbbe4efa20d1d8f8ca8be47b715edfe07f62c
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
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:38 +0000 (18:45 +0000)]
Merge \"docs: Migrated \"key attestation\" page to a new location (for N OTA).\" into nyc-dev
am:
6e4d765f95
Change-Id: I1107bc377d35c8bb63a2b90118c17940105cddaf
Kevin Hufnagle [Tue, 26 Jul 2016 18:45:35 +0000 (18:45 +0000)]
docs: Migrated \"key attestation\" page to a new location (for N OTA).
am:
c946f9d103
Change-Id: I86c74144ab6530c566550b71855f02e09840d7fe
Jason Monk [Tue, 26 Jul 2016 18:39:13 +0000 (18:39 +0000)]
Merge "Fix double status bar icons" into nyc-mr1-dev
Kevin Hufnagle [Tue, 26 Jul 2016 18:34:23 +0000 (18:34 +0000)]
Merge "docs: Migrated "key attestation" page to a new location (for N OTA)." into nyc-dev
Agnieszka Madurska [Tue, 26 Jul 2016 18:18:07 +0000 (18:18 +0000)]
Merge \\"Use correct bounds for scroll bar rendering.\\" into nyc-mr1-dev am:
af9d5daae7
am:
27fbe40746
Change-Id: I94479483e4e6240ce84a1bedebbd3e521db45c8c
Aga Madurska [Tue, 26 Jul 2016 18:17:58 +0000 (18:17 +0000)]
Use correct bounds for scroll bar rendering. am:
8cc883de9e
am:
f4b8e7d969
Change-Id: I08e2c8b988c1e472950515ee719ecd7022fd45e7
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
Phil Weaver [Tue, 26 Jul 2016 18:07:42 +0000 (18:07 +0000)]
Merge "Clarifying docs for lifecycle of 3 a11y objects."
Michael Kwan [Sat, 23 Jul 2016 01:37:31 +0000 (18:37 -0700)]
Add titles to PreferenceFragments and PreferenceScreens for watches.
Preferences lack a title on watch type devices due to lack of ActionBar
support. A custom ListView was added to use a custom wrapper adapter to
add a persistent header view at the top of the ListView that developers
would not be able to remove via the ListView API.
Bug:
27962897
Change-Id: I6bccecf85592d9507e0c7a04c9a035617001e9ef
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
Chen Xu [Tue, 26 Jul 2016 17:15:49 +0000 (17:15 +0000)]
Merge \\"add pii support for Rlog\\" into nyc-mr1-dev am:
a0f07728d9
am:
03e641e6e3
Change-Id: Ia289a14328175228af651b879f6aa691d90afebe
fionaxu [Tue, 26 Jul 2016 17:15:44 +0000 (17:15 +0000)]
add pii support for Rlog am:
a7ab821aa1
am:
d42fa0d7ec
Change-Id: I6d337cd7edecfdf24634ccb8d556de9f738935d7