OSDN Git Service
Philip P. Moltmann [Mon, 2 May 2016 23:30:32 +0000 (23:30 +0000)]
Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501
am:
fe99c4282e
* commit '
fe99c4282e8e8a057c9519b93640c09ffe8e628a':
Change-Id: Ice23b0a3c9fc625f378e9073bdd2c12f2b2e51a3
Philip P. Moltmann [Mon, 2 May 2016 23:29:43 +0000 (23:29 +0000)]
Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501
am:
0c71d3b5cf
* commit '
0c71d3b5cfbe14bb531ce3c94838ec84ef84d96b':
Read disk ID from intent
Change-Id: I3854c5c6f17789e5bdfa16b5c4c7ff9ca635b4d1
Philip P. Moltmann [Mon, 2 May 2016 23:24:05 +0000 (23:24 +0000)]
Merge "Read disk ID from intent" into nyc-dev
am:
e0e7fa4501
* commit '
e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
Read disk ID from intent
Change-Id: Ifd8786add5110d6556a0974d1e0379e68490acb4
Philip P. Moltmann [Mon, 2 May 2016 23:24:05 +0000 (23:24 +0000)]
Merge "Read disk ID from intent" into nyc-dev
am:
e0e7fa4501
* commit '
e0e7fa4501214be7c2cdf0fbf3e503d54504bd3f':
Read disk ID from intent
Change-Id: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
Philip P. Moltmann [Mon, 2 May 2016 23:00:30 +0000 (23:00 +0000)]
Merge "Read disk ID from intent" into nyc-dev
Sudheer Shanka [Mon, 2 May 2016 20:23:09 +0000 (20:23 +0000)]
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am:
57e6a9144a
am:
000293cbb9
* commit '
000293cbb962faf0defc294e0903617085ac45b4':
Change-Id: Ib0c380158917dfd24233e06faea8ab1c241f326b
Sudheer Shanka [Mon, 2 May 2016 20:17:21 +0000 (20:17 +0000)]
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev am:
57e6a9144a
am:
0814dfbccb
* commit '
0814dfbccb5bff8a7cbf2c60d8b835d7207a3b45':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.
Change-Id: I315ecc2c7583ea17e56861a1b2b78b5bdf07a7e1
Sudheer Shanka [Mon, 2 May 2016 20:09:59 +0000 (20:09 +0000)]
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev
am:
57e6a9144a
* commit '
57e6a9144a0577308bd9888f3498c17ca96e4f5f':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.
Change-Id: I348e39f6519c3d620b7f3a3cba6eca72118339a9
Sudheer Shanka [Mon, 2 May 2016 20:09:58 +0000 (20:09 +0000)]
Merge "Show app installer info even if it doesn\'t handle ACTION.APP_SHOW_INFO." into nyc-dev
am:
57e6a9144a
* commit '
57e6a9144a0577308bd9888f3498c17ca96e4f5f':
Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO.
Change-Id: I078516706896910eeee3e86b525e96cdf807aa1b
Sudheer Shanka [Mon, 2 May 2016 20:00:45 +0000 (20:00 +0000)]
Merge "Show app installer info even if it doesn't handle ACTION.APP_SHOW_INFO." into nyc-dev
Android Build Merger (Role) [Mon, 2 May 2016 18:10:37 +0000 (18:10 +0000)]
Merge "Merge "Remove top padding only if illustration is present" into nyc-dev am:
0e4816efb9 am:
ec3fec5f94" into nyc-mr1-dev-plus-aosp
Maurice Lam [Mon, 2 May 2016 18:10:21 +0000 (18:10 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev am:
0e4816efb9
am:
ec3fec5f94
* commit '
ec3fec5f94c5429433a1dd7c87cb40cd6a035efb':
Remove top padding only if illustration is present
Change-Id: Ie08a1d1ef54e32af85b5d3d312e6d5563ab3a822
Maurice Lam [Mon, 2 May 2016 18:10:09 +0000 (18:10 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev am:
0e4816efb9
am:
0f27a312b7
* commit '
0f27a312b7f8dd94443d8ccedc7e9e0debf49e3d':
Remove top padding only if illustration is present
Change-Id: I88243769eecf9a4ba373bc48bd40cca4308c626a
Maurice Lam [Mon, 2 May 2016 18:05:27 +0000 (18:05 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev
am:
0e4816efb9
* commit '
0e4816efb99e28a25efecee1702c552bfb9ba849':
Remove top padding only if illustration is present
Change-Id: I0b92a87785df54ca66427a4e3871f0ed4737b55f
Maurice Lam [Mon, 2 May 2016 18:05:23 +0000 (18:05 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev
am:
0e4816efb9
* commit '
0e4816efb99e28a25efecee1702c552bfb9ba849':
Remove top padding only if illustration is present
Change-Id: Ice07c970200be51a0b8447a1cfcaf59eac4e8142
Maurice Lam [Mon, 2 May 2016 17:58:10 +0000 (17:58 +0000)]
Merge "Remove top padding only if illustration is present" into nyc-dev
Fan Zhang [Mon, 2 May 2016 17:05:46 +0000 (17:05 +0000)]
Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev
am:
ac74071630
* commit '
ac7407163096e3a743e95d452a1d9675d17734b9':
Explicitly setAccount in the same way as setHasInternet.
Change-Id: I4845a410b7c8a79d9f7e83e6216bb75044c4fae5
Fan Zhang [Mon, 2 May 2016 16:57:11 +0000 (16:57 +0000)]
Merge "Explicitly setAccount in the same way as setHasInternet." into nyc-mr1-dev
Fan Zhang [Fri, 29 Apr 2016 20:05:49 +0000 (13:05 -0700)]
Explicitly setAccount in the same way as setHasInternet.
Bug:
28141203
This frees adapter from updating account and internet internally, and
allows refreshData() be private.
Change-Id: I8ccb4311c48c66222ee19e2d01b1c4943acdb0ee
Android Build Merger (Role) [Mon, 2 May 2016 15:26:11 +0000 (15:26 +0000)]
Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am:
820d7c85c7 am:
c14a9af008" into nyc-mr1-dev-plus-aosp
Adrian Roos [Mon, 2 May 2016 15:26:03 +0000 (15:26 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am:
820d7c85c7
am:
c14a9af008
* commit '
c14a9af0082efdab768a46d0de82cfdbbeb97d3c':
Change-Id: I40a3e59abcc38e11102e93b2e4c40daca0d23eda
Android Build Merger (Role) [Mon, 2 May 2016 15:25:22 +0000 (15:25 +0000)]
Merge "Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am:
820d7c85c7 am:
c14a9af008" into nyc-mr1-dev-plus-aosp
Adrian Roos [Mon, 2 May 2016 15:25:13 +0000 (15:25 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am:
820d7c85c7
am:
c14a9af008
* commit '
c14a9af0082efdab768a46d0de82cfdbbeb97d3c':
Properly handle rotation in NotificationLockscreenPreference
Change-Id: I449720787279e53eca1e8a413519ba8fa71202ed
Adrian Roos [Mon, 2 May 2016 15:25:12 +0000 (15:25 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev am:
820d7c85c7
am:
3b8cc35b4a
* commit '
3b8cc35b4ae79b6bbf0d7793b35df10f830d06f2':
Properly handle rotation in NotificationLockscreenPreference
Change-Id: I777028cb4d4b7120c538edc35928f1508743308f
Adrian Roos [Mon, 2 May 2016 15:21:02 +0000 (15:21 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
am:
820d7c85c7
* commit '
820d7c85c724b28267b1a5d0dee8b190f49d8517':
Properly handle rotation in NotificationLockscreenPreference
Change-Id: I1ce852a59674583c5dd2e67eeb79a4419ec15cda
Adrian Roos [Mon, 2 May 2016 15:21:02 +0000 (15:21 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
am:
820d7c85c7
* commit '
820d7c85c724b28267b1a5d0dee8b190f49d8517':
Properly handle rotation in NotificationLockscreenPreference
Change-Id: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
Adrian Roos [Mon, 2 May 2016 15:13:40 +0000 (15:13 +0000)]
Merge "Properly handle rotation in NotificationLockscreenPreference" into nyc-dev
Philip P. Moltmann [Fri, 29 Apr 2016 23:35:28 +0000 (16:35 -0700)]
Read disk ID from intent
mDisk might be null, but we can recover the disk ID from the original
Intent.
Bug:
28177789
Change-Id: Ic3e33a60084c42eb0bb06145ad50a45077e650d0
Maurice Lam [Fri, 29 Apr 2016 22:07:40 +0000 (15:07 -0700)]
Remove top padding only if illustration is present
Bug:
28469515
Change-Id: Ifc41b09b2b1675b696291753ff68fe4a801c76c2
Adrian Roos [Fri, 29 Apr 2016 21:37:02 +0000 (14:37 -0700)]
Properly handle rotation in NotificationLockscreenPreference
There were some issues because we didn't explicitly
track and restore the selected position upon rotating,
so the fragment's oppinion of which item was selected
didn't match the ListView's.
Change-Id: Ia86e25dab36b44931297f8bcc7bcb7d6974f4b76
Fixes:
27921546
Android Build Merger (Role) [Fri, 29 Apr 2016 19:01:10 +0000 (19:01 +0000)]
Merge "Merge "Don\'t crash on Settings data usage" into nyc-dev am:
b60c7560af am:
fc63188c2c" into nyc-mr1-dev-plus-aosp
Jason Monk [Fri, 29 Apr 2016 19:01:01 +0000 (19:01 +0000)]
Merge "Don\'t crash on Settings data usage" into nyc-dev am:
b60c7560af
am:
fc63188c2c
* commit '
fc63188c2cbb6fbda340c9f8c9c7b4541b160912':
Don't crash on Settings data usage
Change-Id: Iada79f9953fea61a164ddac887dff6aafce14553
Jason Monk [Fri, 29 Apr 2016 19:01:00 +0000 (19:01 +0000)]
Merge "Don\'t crash on Settings data usage" into nyc-dev am:
b60c7560af
am:
4b32f9f5ad
* commit '
4b32f9f5ada3f3eec32409c8188bb15e39bdea4b':
Don't crash on Settings data usage
Change-Id: I9f345c6c8fd278c15ca1eb8453581cee6e553323
Jason Monk [Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)]
Merge "Don\'t crash on Settings data usage" into nyc-dev
am:
b60c7560af
* commit '
b60c7560afe6c4326d9e77423b31e0dcbf452506':
Don't crash on Settings data usage
Change-Id: I6227d2797bdbe49758885a4c48f20e6013f30be7
Jason Monk [Fri, 29 Apr 2016 18:58:41 +0000 (18:58 +0000)]
Merge "Don\'t crash on Settings data usage" into nyc-dev
am:
b60c7560af
* commit '
b60c7560afe6c4326d9e77423b31e0dcbf452506':
Don't crash on Settings data usage
Change-Id: I0659dc194c2fb16dda9771e9a5a7b1d3375887b4
Jason Monk [Fri, 29 Apr 2016 18:54:08 +0000 (18:54 +0000)]
Merge "Don't crash on Settings data usage" into nyc-dev
Fan Zhang [Fri, 29 Apr 2016 18:29:30 +0000 (18:29 +0000)]
Merge "Disable stable id in support adapter." into nyc-mr1-dev
am:
7efc40797a
* commit '
7efc40797af03adc9b56e9f87acba4fa4d659940':
Disable stable id in support adapter.
Change-Id: Ic7cb02dd709876b88e602aa0b37aaa5e8e0898e8
Fan Zhang [Fri, 29 Apr 2016 18:20:50 +0000 (18:20 +0000)]
Merge "Disable stable id in support adapter." into nyc-mr1-dev
Jason Monk [Fri, 29 Apr 2016 18:06:10 +0000 (14:06 -0400)]
Don't crash on Settings data usage
Consider Settings uid (SYSTEM_UID) to be an app.
Change-Id: Ia5cc7897eafdf3d654e8a23715bd25502097bab8
Fixes:
28193076
Android Build Merger (Role) [Fri, 29 Apr 2016 17:59:52 +0000 (17:59 +0000)]
Merge "Merge "Don\'t crash settings when out of space." into nyc-dev am:
a1fe122b99 am:
cf5a448ce5" into nyc-mr1-dev-plus-aosp
Jason Monk [Fri, 29 Apr 2016 17:59:47 +0000 (17:59 +0000)]
Merge "Don\'t crash settings when out of space." into nyc-dev am:
a1fe122b99
am:
cf5a448ce5
* commit '
cf5a448ce57883088fa7f6b3d6683065e266470f':
Don't crash settings when out of space.
Change-Id: I3772a8b5210130f3cfbf4c7b6fe5d487eb9ace53
Jason Monk [Fri, 29 Apr 2016 17:59:36 +0000 (17:59 +0000)]
Merge "Don\'t crash settings when out of space." into nyc-dev am:
a1fe122b99
am:
cd5d6137bc
* commit '
cd5d6137bc893f21928f6e77c70963780fc6e159':
Don't crash settings when out of space.
Change-Id: I04e91645bb1e35b28ab1900d1f172d0633e2dc11
Jason Monk [Fri, 29 Apr 2016 17:57:27 +0000 (17:57 +0000)]
Merge "Don\'t crash settings when out of space." into nyc-dev
am:
a1fe122b99
* commit '
a1fe122b99a89e13ef3e06364df519ca93a35dcc':
Don't crash settings when out of space.
Change-Id: Id336b4dcf1ab7fce3581286d598cf590c4973548
Jason Monk [Fri, 29 Apr 2016 17:57:24 +0000 (17:57 +0000)]
Merge "Don\'t crash settings when out of space." into nyc-dev
am:
a1fe122b99
* commit '
a1fe122b99a89e13ef3e06364df519ca93a35dcc':
Don't crash settings when out of space.
Change-Id: Ie1095da87343cc74d65bbcf255d5692197a7a241
Jason Monk [Fri, 29 Apr 2016 17:54:33 +0000 (17:54 +0000)]
Merge "Don't crash settings when out of space." into nyc-dev
Android Build Merger (Role) [Fri, 29 Apr 2016 17:53:44 +0000 (17:53 +0000)]
Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am:
7dce005fab am:
f02a31beaa" into nyc-mr1-dev-plus-aosp
Mihai Niță [Fri, 29 Apr 2016 17:53:38 +0000 (17:53 +0000)]
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am:
7dce005fab
am:
f02a31beaa
* commit '
f02a31beaab1da23537073c8f376b9daec7b2215':
Change-Id: Ia1ee12e5410a835a3c6382208dd3a79a8aa37d3d
Android Build Merger (Role) [Fri, 29 Apr 2016 17:53:01 +0000 (17:53 +0000)]
Merge "Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am:
7dce005fab am:
f02a31beaa" into nyc-mr1-dev-plus-aosp
Mihai Niță [Fri, 29 Apr 2016 17:52:51 +0000 (17:52 +0000)]
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am:
7dce005fab
am:
f02a31beaa
* commit '
f02a31beaab1da23537073c8f376b9daec7b2215':
Fix: accessibility actions move languages but don't update
Change-Id: Ibbbcf694cb80a9ec586bce48a5cab07c98e7c38f
Mihai Niță [Fri, 29 Apr 2016 17:52:50 +0000 (17:52 +0000)]
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev am:
7dce005fab
am:
48db95270e
* commit '
48db95270ec9a85edd15b1df1085aad0020851ba':
Fix: accessibility actions move languages but don't update
Change-Id: I99157a90add1fb4bdaa513a6b479d2c7d1634fde
Jason Monk [Fri, 29 Apr 2016 17:51:08 +0000 (13:51 -0400)]
Don't crash settings when out of space.
Change-Id: I2e36fe845601558d789f38ae9f70d1a1684d8fd4
Fixes:
28198128
Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am:
7dce005fab
* commit '
7dce005fabf15c3532db0540cdc2c67e59da7fb4':
Fix: accessibility actions move languages but don't update
Change-Id: Ie565b3a9d7d7caa00d8be389774b397339fec1b9
Mihai Nita [Fri, 29 Apr 2016 17:50:39 +0000 (17:50 +0000)]
Merge "Fix: accessibility actions move languages but don\'t update" into nyc-dev
am:
7dce005fab
* commit '
7dce005fabf15c3532db0540cdc2c67e59da7fb4':
Fix: accessibility actions move languages but don't update
Change-Id: Ia6218cfbd9d2b0d29e36def684f5909932980481
Mihai Niță [Fri, 29 Apr 2016 17:46:16 +0000 (17:46 +0000)]
Merge "Fix: accessibility actions move languages but don't update" into nyc-dev
Android Build Merger (Role) [Fri, 29 Apr 2016 17:42:08 +0000 (17:42 +0000)]
Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am:
35bf932eb0 am:
99e5285425" into nyc-mr1-dev-plus-aosp
Clara Bayarri [Fri, 29 Apr 2016 17:42:01 +0000 (17:42 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am:
35bf932eb0
am:
99e5285425
* commit '
99e5285425962f61d7b17dbb0f01471e3a8f2932':
Change-Id: Id0f502c4093c7d48f4ec41c75e070c64df791298
Android Build Merger (Role) [Fri, 29 Apr 2016 17:41:23 +0000 (17:41 +0000)]
Merge "Merge "Remove Secure Startup option from Security Settings" into nyc-dev am:
35bf932eb0 am:
99e5285425" into nyc-mr1-dev-plus-aosp
Clara Bayarri [Fri, 29 Apr 2016 17:41:17 +0000 (17:41 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am:
35bf932eb0
am:
99e5285425
* commit '
99e5285425962f61d7b17dbb0f01471e3a8f2932':
Remove Secure Startup option from Security Settings
Change-Id: I68b498dba4eb5ea66768c07653aa9e2993940dcb
Clara Bayarri [Fri, 29 Apr 2016 17:41:14 +0000 (17:41 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev am:
35bf932eb0
am:
1159a0a79c
* commit '
1159a0a79cdf9fcbbae574198ae5ba192ef84aca':
Remove Secure Startup option from Security Settings
Change-Id: I2721e0e9e2d5920e54b549124664a303a591ae54
Clara Bayarri [Fri, 29 Apr 2016 17:39:05 +0000 (17:39 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am:
35bf932eb0
* commit '
35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Ife90c8effce61106a438ccd9158a001792810ede
Clara Bayarri [Fri, 29 Apr 2016 17:38:56 +0000 (17:38 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
am:
35bf932eb0
* commit '
35bf932eb0daf8038cc917508839784953c45c72':
Remove Secure Startup option from Security Settings
Change-Id: Id555f9a2abadf9a941e5e63e60ea55c5ce7179bd
Clara Bayarri [Fri, 29 Apr 2016 17:28:42 +0000 (17:28 +0000)]
Merge "Remove Secure Startup option from Security Settings" into nyc-dev
Fan Zhang [Fri, 29 Apr 2016 17:23:21 +0000 (10:23 -0700)]
Disable stable id in support adapter.
Bug:
28141203
Change-Id: I8785b804e15e58b4885645bc72d68c2a3cacc692
Clara Bayarri [Fri, 29 Apr 2016 16:51:25 +0000 (16:51 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am:
d2549ce663
am:
0a84fd121d
* commit '
0a84fd121d8bf2c1301f4d4eb6465212f1172094':
Change-Id: I4645e0dbad308748f873bc38103996e655c5efb8
Clara Bayarri [Fri, 29 Apr 2016 16:49:04 +0000 (16:49 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev am:
d2549ce663
am:
55fc7dd52b
* commit '
55fc7dd52b5eb6a736c8a48fc5cddbb343c02a16':
Storage Settings shows hamburger instead of back arrow
Change-Id: Id4fa67b14edaaefd698f9ab0522ff271fc42b345
Clara Bayarri [Fri, 29 Apr 2016 16:46:28 +0000 (16:46 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am:
d2549ce663
* commit '
d2549ce6635943144bde17582b825113c07aa868':
Storage Settings shows hamburger instead of back arrow
Change-Id: Icc2014157f5160968563fdbaab175cbd90a76d58
Clara Bayarri [Fri, 29 Apr 2016 16:46:27 +0000 (16:46 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
am:
d2549ce663
* commit '
d2549ce6635943144bde17582b825113c07aa868':
Storage Settings shows hamburger instead of back arrow
Change-Id: I178049719bc00f5baddce247c257004ec41fcbbe
Clara Bayarri [Fri, 29 Apr 2016 16:38:11 +0000 (16:38 +0000)]
Merge "Storage Settings shows hamburger instead of back arrow" into nyc-dev
Clara Bayarri [Fri, 29 Apr 2016 15:58:09 +0000 (16:58 +0100)]
Storage Settings shows hamburger instead of back arrow
When there is only internal storage, StorageSettings forwards
automatically to this sub settings page, causing the navigation
icon to be the back arrow. Fixed to make it a hamburger in this
case.
Bug:
28197210
Change-Id: Ief3f7daa3973332a800faa652261e2cfdec36e85
Fan Zhang [Fri, 29 Apr 2016 15:56:25 +0000 (15:56 +0000)]
Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev
am:
050d94151f
* commit '
050d94151fa931ee2c90a1c949090f66aa032792':
Prompt sign-in when there is no account for support options
Change-Id: I6b78faaf8080a5c0e6c4158592c297e1d9728039
Fan Zhang [Fri, 29 Apr 2016 15:49:30 +0000 (15:49 +0000)]
Merge "Prompt sign-in when there is no account for support options" into nyc-mr1-dev
Android Build Merger (Role) [Fri, 29 Apr 2016 14:37:39 +0000 (14:37 +0000)]
Merge "Merge "Fix NPE in user settings." into nyc-dev am:
e69d754865 am:
9f6de156ca" into nyc-mr1-dev-plus-aosp
Julia Reynolds [Fri, 29 Apr 2016 14:37:27 +0000 (14:37 +0000)]
Merge "Fix NPE in user settings." into nyc-dev am:
e69d754865
am:
9f6de156ca
* commit '
9f6de156ca1391e386f86c284226269519381865':
Fix NPE in user settings.
Change-Id: Ia8ab48b8db1e29f046ba0ac41ea8f1cc62b697fb
Julia Reynolds [Fri, 29 Apr 2016 14:37:26 +0000 (14:37 +0000)]
Merge "Fix NPE in user settings." into nyc-dev am:
e69d754865
am:
1d5fbf6672
* commit '
1d5fbf66729b76485362beb26771592370bdef7b':
Fix NPE in user settings.
Change-Id: I80b5e7c37b158ed03f43eeef78b4359ed107b730
Julia Reynolds [Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)]
Merge "Fix NPE in user settings." into nyc-dev
am:
e69d754865
* commit '
e69d754865572edf40a59c0edbf657a0d7948865':
Fix NPE in user settings.
Change-Id: Icb2585bb7619e9bac4592f904b8978b8668ba4ff
Julia Reynolds [Fri, 29 Apr 2016 14:34:28 +0000 (14:34 +0000)]
Merge "Fix NPE in user settings." into nyc-dev
am:
e69d754865
* commit '
e69d754865572edf40a59c0edbf657a0d7948865':
Fix NPE in user settings.
Change-Id: I9eb1d38fb2b60a6c4937a99d58e91e4970454933
Julia Reynolds [Fri, 29 Apr 2016 14:29:18 +0000 (14:29 +0000)]
Merge "Fix NPE in user settings." into nyc-dev
Android Build Merger (Role) [Fri, 29 Apr 2016 13:36:56 +0000 (13:36 +0000)]
Merge "Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am:
19c01f0351 am:
5d8a18ce2a" into nyc-mr1-dev-plus-aosp
Shweta Chahar [Fri, 29 Apr 2016 13:36:45 +0000 (13:36 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am:
19c01f0351
am:
5d8a18ce2a
* commit '
5d8a18ce2addbb2304e9db6787b2e5d412aac8ee':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: I46d54f787d0265a4329ddcbb76fcf9955f3921db
Shweta Chahar [Fri, 29 Apr 2016 13:36:43 +0000 (13:36 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev am:
19c01f0351
am:
bf4e0306bc
* commit '
bf4e0306bc9acf8fcb00df87e8f03755f0c06c7a':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: I77472d9ba0ddce30a5e99d9b65725312521d85ec
shwetachahar [Fri, 29 Apr 2016 13:34:19 +0000 (13:34 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
am:
19c01f0351
* commit '
19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: I0b55dd38a001726331012df441de34ba998c512f
shwetachahar [Fri, 29 Apr 2016 13:34:19 +0000 (13:34 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
am:
19c01f0351
* commit '
19c01f03511610541ab80b8f565381da31d21926':
Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java
Change-Id: If4a777002972d217fbd770c0b2f481a9934bfd41
Shweta Chahar [Fri, 29 Apr 2016 13:29:10 +0000 (13:29 +0000)]
Merge "Set the max for pitch seekbar in xml in sync with the max for pitch seekbar in TextToSpeechSettings.java" into nyc-dev
Julia Reynolds [Fri, 29 Apr 2016 12:42:01 +0000 (08:42 -0400)]
Fix NPE in user settings.
Bug:
28337026
Change-Id: I437874e8dd605b9a19318aafecf292303ee3ad58
Android Build Merger (Role) [Thu, 28 Apr 2016 23:24:20 +0000 (23:24 +0000)]
Merge "Handling of issues while migrating primary storage am:
1ec941db0c am:
4d2714fd10" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Thu, 28 Apr 2016 23:24:08 +0000 (23:24 +0000)]
Handling of issues while migrating primary storage am:
1ec941db0c
am:
4d2714fd10
* commit '
4d2714fd10c628c8b3b060d57d428fdffcf94217':
Handling of issues while migrating primary storage
Change-Id: If2e9111ea8c2f2b568ca23dcc935bb582b4a32cc
Philip P. Moltmann [Thu, 28 Apr 2016 23:24:06 +0000 (23:24 +0000)]
Handling of issues while migrating primary storage am:
1ec941db0c
am:
16d64842d9
* commit '
16d64842d9b4e54f3e99a760e60918ac4f16bddf':
Handling of issues while migrating primary storage
Change-Id: I0c817a826c44e42ab169423eac9500c92650fb7e
Philip P. Moltmann [Thu, 28 Apr 2016 23:21:50 +0000 (23:21 +0000)]
Handling of issues while migrating primary storage
am:
1ec941db0c
* commit '
1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: Ic298e031e2b8b2afcfce5a4f01b34f6c7dd13b65
Philip P. Moltmann [Thu, 28 Apr 2016 23:21:48 +0000 (23:21 +0000)]
Handling of issues while migrating primary storage
am:
1ec941db0c
* commit '
1ec941db0ce37a864b5aa1a92111e5c52953c33e':
Handling of issues while migrating primary storage
Change-Id: I95283e6b84be28c026867b47ce84a1425e8b3859
Philip P. Moltmann [Thu, 21 Apr 2016 17:45:39 +0000 (10:45 -0700)]
Handling of issues while migrating primary storage
Bug:
28177789
Change-Id: Icfbd048ddf0a1d55df1e7273d49727357b98a452
Fan Zhang [Tue, 26 Apr 2016 22:05:04 +0000 (15:05 -0700)]
Prompt sign-in when there is no account for support options
Bug:
28141203
Bug:
28316343
Change-Id: Ie7f86955519504e5eed4af4c8406a353a3847995
Julia Reynolds [Thu, 28 Apr 2016 19:39:47 +0000 (19:39 +0000)]
Expand BT screen. am:
05c6a2c007
am:
8acb204098
* commit '
8acb204098fffe65159a4332636ed2e133dd1459':
Change-Id: I2880d62010ce9a1bd70e3710f7e685ec7b65870c
Julia Reynolds [Thu, 28 Apr 2016 19:37:17 +0000 (19:37 +0000)]
Expand BT screen. am:
05c6a2c007
am:
8136b125f6
* commit '
8136b125f66ae32f1ab64b74a225d583fb911c60':
Expand BT screen.
Change-Id: I882414db3110576b33ef9c3d102c074880a79e93
Julia Reynolds [Thu, 28 Apr 2016 19:35:28 +0000 (19:35 +0000)]
Expand BT screen.
am:
05c6a2c007
* commit '
05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: I0c3ed43962f1618b4cffe054bcff1fff0b5e0893
Julia Reynolds [Thu, 28 Apr 2016 19:24:51 +0000 (19:24 +0000)]
Expand BT screen.
am:
05c6a2c007
* commit '
05c6a2c007675fede50245519571879f749c8e66':
Expand BT screen.
Change-Id: Ied5dfb76787680a4b48f62dedd657fb065f744fd
Julia Reynolds [Thu, 28 Apr 2016 13:41:25 +0000 (09:41 -0400)]
Expand BT screen.
Bug:
27106877
Change-Id: I31100598f27d45b6a50351f14bd0d20cc6e27d9d
shwetachahar [Thu, 28 Apr 2016 15:05:55 +0000 (16:05 +0100)]
Set the max for pitch seekbar in xml in sync with the max for pitch
seekbar in TextToSpeechSettings.java
Bug:
28257828
Change-Id: I8a114cf31d72eedf1ba03093364074bec7e7cdee
Android Build Merger (Role) [Thu, 28 Apr 2016 15:01:48 +0000 (15:01 +0000)]
Merge "Merge "Fix summary lifecycle" into nyc-dev am:
6e51591 am:
c39a0fa" into nyc-mr1-dev-plus-aosp
Jason Monk [Thu, 28 Apr 2016 15:01:38 +0000 (15:01 +0000)]
Merge "Fix summary lifecycle" into nyc-dev am:
6e51591
am:
c39a0fa
* commit '
c39a0fa7ce9bffeb00beb9487113a9634072fd3c':
Fix summary lifecycle
Change-Id: Id01514e1384f96c873be22d37e00e8c76ec6d3fd
Jason Monk [Thu, 28 Apr 2016 15:01:37 +0000 (15:01 +0000)]
Merge "Fix summary lifecycle" into nyc-dev am:
6e51591
am:
db723c9
* commit '
db723c92211b9a6a71a0431256e7615304459dbd':
Fix summary lifecycle
Change-Id: I04c55c1e345cbabb0de89f134df88122069e897c
OSDN Git Service
