OSDN Git Service
Jason Monk [Tue, 3 May 2016 19:42:19 +0000 (19:42 +0000)]
Merge "Fix leaks" into nyc-dev am:
ea8ee68507
am:
639ed29bae
* commit '
639ed29bae86891616643d00ffe143639e9cbb41':
Fix leaks
Change-Id: Ib37a585ad37575abe7ef04f3c7d4b3024210738e
Jason Monk [Tue, 3 May 2016 19:39:59 +0000 (19:39 +0000)]
Merge "Fix leaks" into nyc-dev
am:
ea8ee68507
* commit '
ea8ee685077c4fff18f6ac8e12b69d1d119a022d':
Fix leaks
Change-Id: Ibf93ffeda0bca5e554da3462647ba207d0f9653f
Jason Monk [Tue, 3 May 2016 19:36:34 +0000 (19:36 +0000)]
Merge "Fix leaks" into nyc-dev
Jason Monk [Tue, 3 May 2016 19:24:05 +0000 (15:24 -0400)]
Fix leaks
Change-Id: Iba29be756934d9564cfdee1f6281c56345772dc7
Fixes:
28074995
Jason Monk [Tue, 3 May 2016 18:45:41 +0000 (18:45 +0000)]
Merge "Try to fix receiver crash" into nyc-dev am:
5a2d6800b6
am:
bf96779cbf
* commit '
bf96779cbf24603de712856d6b646e30586714d7':
Change-Id: I0e224054779528a95e4fdb0c3e5d53455584878b
Jason Monk [Tue, 3 May 2016 18:44:38 +0000 (18:44 +0000)]
Merge "Try to fix receiver crash" into nyc-dev am:
5a2d6800b6
am:
508e93babd
* commit '
508e93babdab9cde97721670bbcd0fbc4a5a1e28':
Try to fix receiver crash
Change-Id: I9f839090a913905358283f15a6930446209078c4
Jason Monk [Tue, 3 May 2016 18:42:10 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I3c2bb9113fbd9599450a011836881e91dbfd8270
Jason Monk [Tue, 3 May 2016 18:42:05 +0000 (18:42 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
am:
5a2d6800b6
* commit '
5a2d6800b67fdfa3ef3ba930c09668e1f59f8cfc':
Try to fix receiver crash
Change-Id: I641c41d7833bb8104f722889c123d1fe2447f6e7
Michael Wright [Tue, 3 May 2016 18:39:09 +0000 (18:39 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev am:
12c2c2538b
am:
e71a6ac6cd
* commit '
e71a6ac6cdcbca69a0f759211b8a08724b7701d8':
Change-Id: I5761dcceb05a7dea7e7d212fa7c7cf765be956d0
Jason Monk [Tue, 3 May 2016 18:37:23 +0000 (18:37 +0000)]
Merge "Try to fix receiver crash" into nyc-dev
Michael Wright [Tue, 3 May 2016 18:36:48 +0000 (18:36 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev am:
12c2c2538b
am:
df824969af
* commit '
df824969af786598f951830bd6ec387606da316a':
Add subtext for default keyboard layout.
Change-Id: I3f2802ca95c8c0b95967dd52fdc664544f6eeccf
Michael Wright [Tue, 3 May 2016 18:34:18 +0000 (18:34 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
am:
12c2c2538b
* commit '
12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: Idd3946011f5f516c444973ce0f06381efe44cda9
Michael Wright [Tue, 3 May 2016 18:34:17 +0000 (18:34 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
am:
12c2c2538b
* commit '
12c2c2538b1e87f1a2d75f001772719bca9ab8f4':
Add subtext for default keyboard layout.
Change-Id: I4cfe66c6352b72e7b9baf933d9835df2a8c84282
Michael Wright [Tue, 3 May 2016 18:28:59 +0000 (18:28 +0000)]
Merge "Add subtext for default keyboard layout." into nyc-dev
Michael Wright [Tue, 3 May 2016 13:32:32 +0000 (14:32 +0100)]
Add subtext for default keyboard layout.
Bug:
27742933
Change-Id: I51bec339c0cbcfb114f85758b6a227deb57a69e2
Jason Monk [Tue, 3 May 2016 18:25:56 +0000 (14:25 -0400)]
Try to fix receiver crash
Change-Id: I98fcde7f4595d0bf90bf2a2b8ba96cb96519a008
Fixes:
28554650
Baligh Uddin [Tue, 3 May 2016 16:54:27 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
e6a875576f -s ours
am:
5c4e2d741a -s ours
* commit '
5c4e2d741a296a7da00e94bafa70b191e9702fed':
Change-Id: Ia43a5b595a0807dfc59135010925f6254a2fe723
Baligh Uddin [Tue, 3 May 2016 16:54:25 +0000 (16:54 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am:
ad4773b774 -s ours
* commit '
ad4773b774d905bfcccc3d1dbb45d0f0c27bc12e':
Import translations. DO NOT MERGE
Change-Id: Ia1afdb49580d23fbe60f22f458d169c62bea1e3b
Baligh Uddin [Tue, 3 May 2016 16:51:27 +0000 (16:51 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev am:
e6a875576f -s ours
am:
8c648f3fd5 -s ours
* commit '
8c648f3fd5b3dc776f52a72b4d248cfa0baba655':
Import translations. DO NOT MERGE
Change-Id: I49326528232aaac98c1b6830bc35505ff86ccbfc
Baligh Uddin [Tue, 3 May 2016 16:49:06 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e6a875576f -s ours
* commit '
e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE
Change-Id: Ia280336dd979aee7c6faf76fc77bef275f2b6285
Baligh Uddin [Tue, 3 May 2016 16:49:04 +0000 (16:49 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
e6a875576f -s ours
* commit '
e6a875576f3713c755c5bbca855b43b1048b3618':
Import translations. DO NOT MERGE
Change-Id: I54dbc26d0afdd735fb798eefd4eab6d3a3773aa1
Baligh Uddin [Tue, 3 May 2016 16:41:20 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
Baligh Uddin [Tue, 3 May 2016 16:41:17 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Baligh Uddin [Tue, 3 May 2016 08:39:46 +0000 (01:39 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ief7fdf92fd579e99764edbf2438caa44d6735da7
Auto-generated-cl: translation import
Baligh Uddin [Tue, 3 May 2016 08:25:52 +0000 (01:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: If49388814aafcf05ad9b1899b7e991463c8c3662
Auto-generated-cl: translation import
Android Build Merger (Role) [Mon, 2 May 2016 23:30:38 +0000 (23:30 +0000)]
Merge "Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501 am:
fe99c4282e" into nyc-mr1-dev-plus-aosp
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
Android Build Merger (Role) [Mon, 2 May 2016 23:29:54 +0000 (23:29 +0000)]
Merge "Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501 am:
fe99c4282e" into nyc-mr1-dev-plus-aosp
Philip P. Moltmann [Mon, 2 May 2016 23:29:45 +0000 (23:29 +0000)]
Merge "Read disk ID from intent" into nyc-dev am:
e0e7fa4501
am:
fe99c4282e
* commit '
fe99c4282e8e8a057c9519b93640c09ffe8e628a':
Read disk ID from intent
Change-Id: Ifb0d8f693059943f78e07ff90bec8b355998b23e
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: Ia40f3b5901385cf22ddadc37131f464dbee93b2b
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: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: I67be3fb9333356f0e1e7fa3de7c4a3838554b32a
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: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
OSDN Git Service
