OSDN Git Service
Sudheer Shanka [Thu, 7 Apr 2016 01:31:56 +0000 (18:31 -0700)]
Add new section in Apps screen to show app installer name.
Bug:
27404193
Change-Id: I589a7618250dc1cd40deb282f0563ea65da62108
Udam Saini [Thu, 31 Mar 2016 20:30:28 +0000 (20:30 +0000)]
Merge "Fixes graybar as status bar and unshifts header view." into nyc-dev
Udam Saini [Thu, 31 Mar 2016 20:13:39 +0000 (20:13 +0000)]
Merge "Prevents users from being added if device is not provisioned" into nyc-dev
Chris Tate [Thu, 31 Mar 2016 19:24:41 +0000 (19:24 +0000)]
Merge "Track in-progress wallpaper API changes" into nyc-dev
Robin Lee [Thu, 31 Mar 2016 18:44:21 +0000 (18:44 +0000)]
Merge "DISALLOW_CONFIG_CREDENTIALS blocks user credentials" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 18:00:54 +0000 (18:00 +0000)]
Merge "Fix missing summaries" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 17:59:46 +0000 (13:59 -0400)]
Fix missing summaries
Handle non-cached tiles by doing lookup from component name.
Change-Id: I979e2df2eed4a065f290c5c0e66276d08b4fb0af
Fixes:
27942733
Robin Lee [Fri, 11 Mar 2016 16:22:23 +0000 (16:22 +0000)]
DISALLOW_CONFIG_CREDENTIALS blocks user credentials
All settings preferences related to credentials of any kind should be
stopped by this user restriction.
Bug:
26879958
Change-Id: I983c6e58081bd4022bb006942499cba4b74954e7
Maria Garcia Puyol [Thu, 31 Mar 2016 17:38:55 +0000 (17:38 +0000)]
Merge "Use same task for Settings>Users and EmergencyInfo" into nyc-dev
Victor Chang [Thu, 31 Mar 2016 17:04:53 +0000 (17:04 +0000)]
Merge "Show notification when failing to turn on always-on vpn" into nyc-dev
Christopher Tate [Thu, 31 Mar 2016 16:56:37 +0000 (09:56 -0700)]
Track in-progress wallpaper API changes
FLAG_*, not FLAG_SET_*
Bug
27365822
Change-Id: I5cb4dbfd251519a80997a86d3010f19240b9ff23
Victor Chang [Mon, 21 Mar 2016 22:57:59 +0000 (22:57 +0000)]
Show notification when failing to turn on always-on vpn
- Notification icon is Settings icon
- VpnName is obtained as the same way as AppPreference
- Post notification as the current user with PendingIntent to VpnSettings to parent user
- Auto-cancel when user taps on the notification
- This implementation posts notification only when the failure happens sychronously
(Assume ConnectivityService only unset always-on package immediately after calling setAlwaysOnVpnPackageForUser)
Bug:
27374485
Change-Id: I0aee38498c8cc300dd8eb9687adcae5f9dc4f8af
Jason Monk [Thu, 31 Mar 2016 14:36:44 +0000 (14:36 +0000)]
Merge "Fix categeries being read out on settings dashboard" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 14:35:03 +0000 (10:35 -0400)]
Fix categeries being read out on settings dashboard
Change-Id: Ica0eec62a532fa40b57553e8e3d9fba1cba3bd4e
Fixes:
26125682
Jason Monk [Thu, 31 Mar 2016 13:56:51 +0000 (13:56 +0000)]
Merge "Fix cell data preference in single sim case" into nyc-dev
Jason Monk [Thu, 31 Mar 2016 13:55:25 +0000 (09:55 -0400)]
Fix cell data preference in single sim case
Change-Id: Ic956d4a7a4935bcdbeaf868f978e23ba11919f9c
Fixes:
27653690
Jason Monk [Thu, 31 Mar 2016 13:47:32 +0000 (13:47 +0000)]
Merge changes from topic 'SettingsMetrics' into nyc-dev
* changes:
Add metrics for suggestions
Add metrics for settings conditionals
Bill Yi [Thu, 31 Mar 2016 13:23:36 +0000 (13:23 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Yohei Yukawa [Thu, 31 Mar 2016 06:13:54 +0000 (06:13 +0000)]
Merge changes Ieea9a13a,Id2ae6151 into nyc-dev
* changes:
Remove gear icon from InputMethodPreference.
Update title to "Add or edit virtual keyboards".
Bill Yi [Thu, 31 Mar 2016 05:29:47 +0000 (22:29 -0700)]
Import translations. DO NOT MERGE
Change-Id: I942bbb8156f204723bf2b421702ecf6a1ddbd7cf
Auto-generated-cl: translation import
mariagpuyol [Thu, 31 Mar 2016 01:04:54 +0000 (18:04 -0700)]
Use same task for Settings>Users and EmergencyInfo
Bug:
27859534
Change-Id: I0ea4e56e4f6daacfd478336444aceeb84d8bfe5d
Noah Wang [Thu, 31 Mar 2016 00:37:02 +0000 (00:37 +0000)]
Merge "Fix crashing of font size settings screen due to the timing of initialization of ExploreByTouchHelper Bug:
27674946" into nyc-dev
Daichi Hirono [Wed, 30 Mar 2016 23:59:05 +0000 (23:59 +0000)]
Merge "Change the dialog text in USB device tyep chooser." into nyc-dev
Mihai Niță [Wed, 30 Mar 2016 22:37:53 +0000 (22:37 +0000)]
Merge "Fix missing dot in the remove language confirmation message" into nyc-dev
Udam Saini [Wed, 30 Mar 2016 20:38:05 +0000 (13:38 -0700)]
Fixes graybar as status bar and unshifts header view.
StickyHeaderListView will not layout all the way to the top of the screen
if fitsSystemWindows is true.
bug:
27875272
Change-Id: I4150dc183778284df2f07f3a6220e0c0b2607774
Mihai Nita [Wed, 30 Mar 2016 21:55:30 +0000 (14:55 -0700)]
Fix missing dot in the remove language confirmation message
Bug:
27709559
Change-Id: Ie0f4ecf01578a1f6317b058dfed288dcbfa28d92
Noah Wang [Wed, 30 Mar 2016 21:41:42 +0000 (21:41 +0000)]
Merge "Make preview screens in font/display size settings scrollable Bug:
27274145 Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82" into nyc-dev
Anna Galusza [Wed, 30 Mar 2016 21:39:05 +0000 (21:39 +0000)]
Merge "Fix issues with wrong configuration being used to inflate layouts. Bug:
27700406" into nyc-dev
Noah Wang [Wed, 24 Feb 2016 01:26:13 +0000 (17:26 -0800)]
Make preview screens in font/display size settings scrollable
Bug:
27274145
Change-Id: Ib93ff8faa9b14181b9b4f596a8b48cd0804f8f82
Amith Yamasani [Wed, 30 Mar 2016 20:43:03 +0000 (20:43 +0000)]
Merge "Don't prompt twice to uninstall updates" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:24:19 +0000 (20:24 +0000)]
Merge "Fix wifi animation issues" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:22:39 +0000 (16:22 -0400)]
Fix wifi animation issues
There are still some remaining animation issues on the wifi screen.
To avoid regressions from M, just disable animations on the entire
wifi screen.
Change-Id: Iabf8ace731638ae7af483c6f3887ca351b17ac60
Fixes:
26271353
Udam Saini [Wed, 30 Mar 2016 20:05:45 +0000 (20:05 +0000)]
Merge "Wait for fingerprints to be removed (Partial fix)." into nyc-dev
Jason Monk [Wed, 30 Mar 2016 20:05:29 +0000 (16:05 -0400)]
Add metrics for suggestions
Bug:
27851236
Change-Id: Ia5aa1d42a40ba09a19db3c3790f0a7342660e613
Noah Wang [Wed, 30 Mar 2016 20:03:38 +0000 (20:03 +0000)]
Merge "Adding contentDescription to ViewPager in font/display size settings. Bug:
27326035" into nyc-dev
Noah Wang [Wed, 30 Mar 2016 20:03:13 +0000 (20:03 +0000)]
Merge "Set minimum height for preview screen of font/display size settings Bug:
27699996" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 19:46:26 +0000 (15:46 -0400)]
Add metrics for settings conditionals
Bug:
27851236
Change-Id: I400716457d3f628419410a02c2a457d41d19a067
Jason Monk [Wed, 30 Mar 2016 19:11:18 +0000 (19:11 +0000)]
Merge "Fix keywords for default home app" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 19:09:20 +0000 (15:09 -0400)]
Fix keywords for default home app
Change-Id: I38851f70d34168f906cf9b7223772bb3442852db
Fixes:
27826745
Jason Monk [Wed, 30 Mar 2016 18:53:31 +0000 (18:53 +0000)]
Merge "Only show enabled/disabled filters in main app list" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 18:51:52 +0000 (14:51 -0400)]
Only show enabled/disabled filters in main app list
Change-Id: I8d7c94098b71f5893b08786a4caa90d9c191da99
Fixes:
27921850
Yohei Yukawa [Wed, 30 Mar 2016 18:45:00 +0000 (11:45 -0700)]
Remove gear icon from InputMethodPreference.
Per comment from UX, we do not show gear icons on InputMethodPreference
because there is no difference between tapping the item itself and
tapping the gear icon.
Bug:
27543291
Change-Id: Ieea9a13a4b7af9c90c3a2a8f365bd318663998b1
Yohei Yukawa [Wed, 30 Mar 2016 18:40:30 +0000 (11:40 -0700)]
Update title to "Add or edit virtual keyboards".
Per comment from UX, we replace "Add virtual keyboard" with
"Add or edit virtual keyboards" because the user is able to not only
enable but also disable virtual keyboards.
Bug:
27543291
Change-Id: Id2ae61519152bbe622aa5915f728a4cbbc49e078
Jason Monk [Wed, 30 Mar 2016 17:26:55 +0000 (17:26 +0000)]
Merge "Fix bridged app list saved scroll state" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 17:24:37 +0000 (13:24 -0400)]
Fix bridged app list saved scroll state
(don't clear the list when we have the info)
Fixes:
27185911
Change-Id: Ieda4fd0fc6dd662741da9a1805c1435d4473490d
Muyuan Li [Fri, 25 Mar 2016 22:46:12 +0000 (15:46 -0700)]
Intent to start app memory usage page.
Start the app with intent: android.settings.APP_MEMORY_USAGE will bring
up this page.
Bug:
26820467
Change-Id: I50690c71e8182735ea14fdf42a4812573f650e1b
(cherry picked from commit
b816812a4f68a1841703da5d29b32ccafd0896f6)
Amith Yamasani [Wed, 30 Mar 2016 16:52:33 +0000 (09:52 -0700)]
Don't prompt twice to uninstall updates
PackageInstaller is going to ask again, so skip
asking in Settings when user wants to uninstall
updates to a system app.
Bug:
26694521
Change-Id: I4335a4e9bfe54985eb58ba19a890caba06705bef
Jason Monk [Wed, 30 Mar 2016 16:36:26 +0000 (16:36 +0000)]
Merge "Fix sim pin settings" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 16:31:34 +0000 (16:31 +0000)]
Merge "Revert "Rename more to other networks"" into nyc-dev
Jason Monk [Wed, 30 Mar 2016 15:41:45 +0000 (11:41 -0400)]
Fix sim pin settings
Change-Id: I8fba2a367958da5831efd04f599ba7a363d11a1f
Fixes:
27419276
Fixes:
27529989
Yohei Yukawa [Wed, 30 Mar 2016 06:00:24 +0000 (06:00 +0000)]
Merge "Use word "languages" in favor of multi-locale support." into nyc-dev
Noah Wang [Wed, 30 Mar 2016 04:32:18 +0000 (21:32 -0700)]
Adding contentDescription to ViewPager in font/display size settings.
Bug:
27326035
Change-Id: I416c05f2fc7c9238a61b8d512f09cb834f8ec537
Noah Wang [Wed, 30 Mar 2016 04:02:37 +0000 (21:02 -0700)]
Set minimum height for preview screen of font/display size settings
Bug:
27699996
Change-Id: I1e2e16a355993f058301c57d29857f6fca8ec858
Yohei Yukawa [Wed, 30 Mar 2016 03:44:01 +0000 (20:44 -0700)]
Use word "languages" in favor of multi-locale support.
In Android N, the user is able to select multiple languages. Hence
in the IME subtype enabler "Use system language" should be updated to
"Use system languages".
Bug:
27722513
Change-Id: Idcc2fa7eecd1316feac04774ff18c42614a0dc9a
Noah Wang [Wed, 30 Mar 2016 03:23:29 +0000 (20:23 -0700)]
Fix crashing of font size settings screen due to the timing
of initialization of ExploreByTouchHelper
Bug:
27674946
Change-Id: Ief92b5db975861aa31029712854e78edf4454eb5
Daichi Hirono [Wed, 30 Mar 2016 00:38:52 +0000 (09:38 +0900)]
Change the dialog text in USB device tyep chooser.
Updates the texts to the new ones from UX.
Change-Id: Id741a9685c230e005019fe4b57933617fa67d257
Fixed:
27843605
Chris Tate [Wed, 30 Mar 2016 00:13:58 +0000 (00:13 +0000)]
Merge "Improve notes on "Opening links" and related strings" into nyc-dev
Christopher Tate [Wed, 30 Mar 2016 00:09:41 +0000 (17:09 -0700)]
Improve notes on "Opening links" and related strings
Bug
27857777
Change-Id: Ie4c70bca29c7b93c6bb9989b3bb3dc80bae6d805
Mihai Niță [Tue, 29 Mar 2016 23:33:21 +0000 (23:33 +0000)]
Merge "Fix locale reorder jank" into nyc-dev
Udam Saini [Tue, 29 Mar 2016 21:38:30 +0000 (14:38 -0700)]
Wait for fingerprints to be removed (Partial fix).
This is a partial fix for b/
27903189.
When we remove the lock screen and remove all fingerprints, wait for
them to all be removed before finishing the activity. This will let
the security screen accurately show how many fingerprints are available.
bug:
27903189
Change-Id: I30908dbefb7a858f6d99e532841ed4ff894bfe62
Noah Wang [Tue, 29 Mar 2016 21:56:13 +0000 (21:56 +0000)]
Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug:
27694339" into nyc-dev
Udam Saini [Tue, 29 Mar 2016 19:42:27 +0000 (19:42 +0000)]
Merge "Fixes back button on action bar on some fragments." into nyc-dev
Victor Chang [Tue, 29 Mar 2016 18:51:33 +0000 (18:51 +0000)]
Merge "Remove VPN Overflow menu" into nyc-dev
Udam Saini [Mon, 28 Mar 2016 23:35:13 +0000 (16:35 -0700)]
Fixes back button on action bar on some fragments.
SettingsPreferenceFragment has this already set so that the drawer
layout will work when the menu doesn't exist. However, some fragments
are not preference fragments, and we need to set setHasOptionsMenu
manually.
bug:
27879503
Change-Id: I6faadeb56dab00af611ac413109800822038c66d
Jason Monk [Tue, 29 Mar 2016 17:23:32 +0000 (17:23 +0000)]
Merge "Fix crash when clearing preference screen" into nyc-dev
Jason Monk [Tue, 29 Mar 2016 17:21:48 +0000 (13:21 -0400)]
Fix crash when clearing preference screen
Bug:
27892359
Change-Id: I96cd167e8173bf0345c3e186fa11c2e613b63e6f
Jason Monk [Tue, 29 Mar 2016 17:12:56 +0000 (17:12 +0000)]
Revert "Rename more to other networks"
Bug:
27638488
This reverts commit
34ed8a243b799c65c393f51b6628e997cb3d5949.
Change-Id: I5e10e11d40d24ae26c8605f832c43bd41c62c1dc
Udam Saini [Tue, 29 Mar 2016 16:54:23 +0000 (16:54 +0000)]
Merge "Prevents drawer menu from showing depending on intent." into nyc-dev
Fyodor Kupolov [Tue, 29 Mar 2016 16:45:59 +0000 (16:45 +0000)]
Merge "Disable Add user until Setup prompt is shown" into nyc-dev
Victor Chang [Thu, 17 Mar 2016 20:58:50 +0000 (20:58 +0000)]
Remove VPN Overflow menu
- Move always-on option for legacy vpn into the legacy vpn config page
- This implementation doesn't show dialogue when replacing existing always-on vpn
- Continue to disable lockdown option for legacy vpn when "persist.radio.imsregrequired" is true.
Not applying to vpn app
- Force to save account info when legacy vpn is always-on
- When legacy vpn is always-on, don't try to connect. (Otherwise, an exception is thrown)
TODO: Remove EXTRA_PICK_LOCKDOWN in LockdownVpnTracker in framework
Bug:
26950700
Change-Id: Ia80669359c0b7cdb955c84937156c020ac6e9af5
Daniel U [Tue, 29 Mar 2016 09:34:05 +0000 (09:34 +0000)]
Merge "Override device lock pattern visibility when unifying" into nyc-dev
Pierre Imai [Tue, 29 Mar 2016 07:04:47 +0000 (16:04 +0900)]
Prevent multicast addresses in static Wifi config.
Change-Id: I1961b10d67d322fb863620813fe9039b63bb7895
Noah Wang [Tue, 29 Mar 2016 03:18:31 +0000 (20:18 -0700)]
Replace "A" icon with underline with simple "A" icon on font size
settings screen
Bug:
27694339
Change-Id: I56c3b2bbaec36022730a8d392531f9e13d612184
Fyodor Kupolov [Mon, 28 Mar 2016 22:10:19 +0000 (15:10 -0700)]
Disable Add user until Setup prompt is shown
Bug:
27848426
Change-Id: Ibbc0ac0aad8298252dfc460a10a87955fc3e713d
Udam Saini [Mon, 28 Mar 2016 21:29:48 +0000 (14:29 -0700)]
Prevents drawer menu from showing depending on intent.
When ChooseLockScreenGeneric is started via the set password
intents, it should not allow the drawer menu to show.
bug:
26288300
Change-Id: I10d512e20fedab2be8c725c7d524db0c55666590
Udam Saini [Mon, 28 Mar 2016 22:06:59 +0000 (22:06 +0000)]
Merge "Changes SetupRedactionInterstitial to be an optional step" into nyc-dev
Maria Garcia Puyol [Mon, 28 Mar 2016 21:56:59 +0000 (21:56 +0000)]
Merge "Add flags to emergency info intent" into nyc-dev
mariagpuyol [Mon, 28 Mar 2016 19:20:05 +0000 (12:20 -0700)]
Add flags to emergency info intent
Bug:
27859534
Change-Id: I3ff0aea7b0115a22c0a4a853d8fc83a7ae7adc20
Ajay Kumar Nadathur Sreenivasan [Mon, 28 Mar 2016 21:08:26 +0000 (21:08 +0000)]
Merge "NPE on "Nexus Imprint"" into nyc-dev
Robb Glasser [Mon, 28 Mar 2016 21:06:40 +0000 (21:06 +0000)]
Merge "Telephony(MSIM): Fix Cellular Data Preference" into nyc-dev
Sandeep Gutta [Fri, 5 Dec 2014 00:42:40 +0000 (16:42 -0800)]
Telephony(MSIM): Fix Cellular Data Preference
While voice call is active, if cellular data preference
updated via updateCellularDataValues(), the cellular data
preference option getting enabled.
To fix this consider the call state while updating
cellular data preference in updateCellularDataValues().
bug:
27635796
Change-Id: I5306f021e8bdeecc845d50a3b55b9c07d1b2c837
Joe Onorato [Mon, 28 Mar 2016 20:52:38 +0000 (20:52 +0000)]
Merge "Adapt to procstats classes which moved." into nyc-dev
Anna Galusza [Mon, 28 Mar 2016 18:14:49 +0000 (18:14 +0000)]
Merge "Fix padding on Font size and Display size preview screens. Bug:
27675989" into nyc-dev
Anna Galusza [Mon, 28 Mar 2016 18:14:36 +0000 (18:14 +0000)]
Merge "Fix summary text on A11y SUW hub screen and remove unused String. Bug:
26966572" into nyc-dev
Anna Galusza [Mon, 28 Mar 2016 18:14:18 +0000 (18:14 +0000)]
Merge "Remove blue bar from where System Navigation Bar is before its removed. Bug:
27579766" into nyc-dev
Ajay Nadathur [Mon, 28 Mar 2016 18:02:33 +0000 (11:02 -0700)]
NPE on "Nexus Imprint"
- When no fingerprint is setup, "Nexus Imprint" crashes because
"selectableItemBackground" is not defined. (Which is referenced by
SUW's RecyclerItemAdapter)
- Added selectableItemBackground to themes.xml
bug:
27853943
Change-Id: I0e4107cf92aef5e4e3853ca45af73905d38b230e
Sudheer Shanka [Mon, 28 Mar 2016 17:18:54 +0000 (17:18 +0000)]
Merge "Fix crash in ApnSettings." into nyc-dev
Sudheer Shanka [Mon, 28 Mar 2016 17:18:36 +0000 (17:18 +0000)]
Merge "Fix crash in AndroidBeam class." into nyc-dev
Geoff Mendal [Mon, 28 Mar 2016 14:46:13 +0000 (14:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 28 Mar 2016 14:42:47 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: I87b7e8ca95a7c65402a93cf6ad37db5222b3e4ec
Auto-generated-cl: translation import
Jason Monk [Mon, 28 Mar 2016 14:14:01 +0000 (14:14 +0000)]
Merge changes I22d799f8,I1bc14e7a into nyc-dev
* changes:
Guard against crash in dev options
Switch to whitelist for animations
Bill Yi [Sat, 26 Mar 2016 17:26:10 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Bill Yi [Sat, 26 Mar 2016 07:37:09 +0000 (00:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I766afa18abf7a57162fc9bc51ed0c1aa9c97e9a9
Auto-generated-cl: translation import
Christopher Tate [Thu, 24 Mar 2016 23:48:32 +0000 (16:48 -0700)]
Call it "Opening links" now
Better labels are better.
Bug
27834016
Change-Id: I3f5a8088234db7790ac8baded0547f415d7e2c4c
Udam Saini [Fri, 25 Mar 2016 17:47:00 +0000 (10:47 -0700)]
Prevents users from being added if device is not provisioned
Also added a utility function for checking provisioning, instead of
repeating code for this check in several places.
bug:
26156445
Change-Id: I9f4a280dd0cdf889f892e386dbf6a3fdb2a052ef
Alan Viverette [Fri, 25 Mar 2016 19:59:37 +0000 (19:59 +0000)]
Merge "Move DensityUtils into SettingsLib" into nyc-dev
Alan Viverette [Fri, 25 Mar 2016 18:56:25 +0000 (14:56 -0400)]
Move DensityUtils into SettingsLib
Bug:
27644685
Change-Id: Ie493bd7b07700c2df1221a4257c0487db2a14ff7
Philip P. Moltmann [Fri, 25 Mar 2016 16:50:34 +0000 (16:50 +0000)]
Merge "Use changed getStatus interface" into nyc-dev
Philip P. Moltmann [Fri, 18 Mar 2016 16:38:24 +0000 (09:38 -0700)]
Use changed getStatus interface
Change-Id: I72a2aa74607e34a1afbef0982f634def3e30efd4
Sudheer Shanka [Thu, 24 Mar 2016 22:39:24 +0000 (15:39 -0700)]
Fix crash in ApnSettings.
ApnSettings runs with uid android.uid.phone and since it doesn't has
the MANAGE_DEVICE_ADMINS and MANAGE_PROFILE_AND_DEVICE_OWNERS
permission, show the generic support instead of the admin specific
message.
Bug:
27826969
Change-Id: I556a8b74aa1f692ebac1f4e30aeab3ed78ec5078