summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Trebuchet: Fix bug with removing items from foldersRaj Yengisetty2015-06-121-5/+5
| | | | | | | | | | | | The recent folder changes amended the usage of the mDragInProgress variable to be true only while the drag mechanism is acting on an open folder. This change breaks behavior when a single item is being dragged out of the folder. The folder is removed and replaced with the last item. This shouldn't happen while the global drag is still in progress, so check drag state using the drag controller instead of the mDragInProgress instance variable. Change-Id: I94ea23ca569396ea0241bf0a5af0b23756a13780
* Rotation: fix icons disappearingStephen Bird2015-06-112-2/+6
| | | | | | | | | | Only the dynamic grid reload should be stopping the launcher with intent to rebuild the entire workspace. This returns stopLoader to it's functionality pre-dynamic grid resize patch. Change-Id: I55861da83f9b640fd767031e0f2188c5b9b91e66
* Stop unnecessary exception posting to logcat.Martin Brabham2015-06-091-1/+1
| | | | Change-Id: I4f741246dc2ee77b24c3bb94075e12535fcd7ead
* Launcher: Check if componentName is null prior to getPackageName()Brandon McAnsh2015-06-051-6/+9
| | | | | | | * If getComponent() of the intent is null, an NPE will be thrown Change-Id: I93e6335d89daa5dc7950ba5ea99a15d4162ce369 Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
* Move icons to fit within Dynamic grid upon resize.Stephen Bird2015-06-044-46/+131
| | | | | | | | | | | | If the dynamic grid is made smaller, currently icons will simply be hidden from view. Instead, create extra screens and squeeze the icons in so that they will all be visible upon resize. In some cases, icons can end up creating screens when it's not necessary we should revisit this at a later time and look into making these icons show up in a more expected place. Change-Id: I9a46f1ac45c1a04e252ed8943afcfe952df1392d
* Trebuchet: send metrics values as stringsRoman Birg2015-06-022-3/+3
| | | | | | | - Also refer to the declared intent Change-Id: I3c99cc071aa2f4241ea8d3e6d2e8683f1f748e7d Signed-off-by: Roman Birg <roman@cyngn.com>
* Fix power save mode broken ui/animationsLinus Lee2015-06-012-35/+95
| | | | Change-Id: I7dc0123300ff2e9aa64713c1091d13ecc93001f3
* Trebuchet: fix excessive drawing with foldersLinus Lee2015-05-291-29/+49
| | | Change-Id: I0a33bfd3b18fe8b4d2c57e38fe7eb2dc247a9219
* Trebuchet Statistics:Martin Brabham2015-05-2815-5/+1410
| | | | | | | | - Add plumbing for sending events. - Add aggregation service that runs on some interval - Hook send events into respective UX interactions Change-Id: I77ba0ab75daf845621d800e0adf3e658096926af
* Fix the hint text of rename folder can't change with system languagexuke.yin2015-05-271-3/+1
| | | | | | | | | | | | Reproduce 1)In workspace make a folder, click the folder check the hint text of the rename edittext. 2)Change the system language, then click the folder for rename, in the second time click the folder the hint text will change to the last language. Change-Id: I97d14a15bfa748be900bef193950b85b890efe40 (cherry picked from commit 13d6bcf08e004877bd268a88165d2bc265764366)
* Trebuchet: fix NPE during touch eventsRaj Yengisetty2015-05-271-1/+2
| | | | | | | | | | | E/AndroidRuntime( 693): FATAL EXCEPTION: main E/AndroidRuntime( 693): java.lang.NullPointerException: Attempt to invoke virtual method 'int android.view.View.getMeasuredWidth()' on a null object reference E/AndroidRuntime( 693): at com.android.launcher3.PagedView.onTouchEvent (PagedView.java:1986) Change-Id: Ica9395a1e2b2d28a1b074b40ff759eab68154ff0
* Trebuchet : Activate the default homepage selection button on first runUmair Khan2015-05-241-1/+1
| | | | | | | | As of now, when the Trebuchet is started for the first time, the set default homepage button is not activated on any of the screens. Activating it for the first time on default home screen makes more sense. Change-Id: Ia1b7272e177707616902d20ce90ff6ba293576b4 Signed-off-by: Umair Khan <omerjerk@gmail.com>
* Trebuchet: close folder without full animation for overview modeRaj Yengisetty2015-05-141-1/+1
| | | | | | | | | | Repro: - Have HW nav keys enabled - Open a folder - Press the hw menu key - Observe: folder that was previously open cannot be opened Change-Id: Idc9012764975a2ca173c135baa7d7ba46fc2dd9a
* Trebuchet: fix behavior when ShowSearchBar feature is toggled offRaj Yengisetty2015-05-131-7/+4
| | | | | | | | | | | | This bug was introduced with the New Folder UI changes Repro: - Turn off Show Search Bar - Open App Drawer - Close App Drawer - Observe: "small" search bar shows up at the top of the screen Change-Id: I18e59acff3197ea908473c89ff3ade8eaf9bed28
* Do not reload settings for changing state to All Apps.Matt Garnes2015-05-131-3/+5
| | | | | | | When getStateChangeAnimation() is called, only reload settings if leaving overview mode. Change-Id: I9ee7330779b19bb73c1a30497065854ce9fc1162
* Trebuchet : Only reset overscrolled childDanesh M2015-05-121-6/+1
| | | | Change-Id: Ief240c7fbbe296673ff4124cd4d463c9ba65f764
* Trebuchet: new folder UI v1Raj Yengisetty2015-05-128-118/+581
| | | | | | | | | This change adds a number of new UI components and animations for folders. Designer: Hayden Schoen Change-Id: I255cd4664432d84aebecf7e16ace5d9948573e27
* Trebuchet: don't crash when protecting all appsRoman Birg2015-05-082-2/+8
| | | | | Change-Id: Iba37f386574a6ebf19bfd2dc0e35262ec0540914 Signed-off-by: Roman Birg <roman@cyngn.com>
* Trebuchet: Adjusted margin and vertical alignment of row titleHayden Schoen2015-05-061-1/+1
| | | | Change-Id: Ic3e0837ac2726e4437bc5df68a3b1cb033d2d78f
* AppDrawer: Calculate numColumns by using available screen spaceRaj Yengisetty2015-04-301-17/+38
| | | | | | | | | | | | | Using the allAppsNumColumns calculated by DeviceProfile isn't accurate for the vertical app drawer because of the leading char. So calculate our own. Additionally, set the appropriate padding for the drawer icon. Finally, distribute the extra pixel space available for app drawer rows between the app icons. This way apps are evenly spread across the screen. Change-Id: I921c5044d6a490150bf1300762698c2773627ff6
* Trebuchet: limit folder size to numRowsBase and numColumnsBaseRaj Yengisetty2015-04-281-12/+3
| | | | | | | | | Otherwise the size of the folder is determined by the size of the Dynamic Grid. This causes some weird issues with sizes and scrolling so just cap this to the base values for the numRows and numColumns. Change-Id: I5b1f13267299d3ab1f28e6e393d6260fa7fbdd3e
* Clean up scrollingMartin Brabham2015-04-282-55/+271
| | | | | | | | | | - Eliminate creation of garbage - Square up interface - Post animation signals to handler so they can be cancelled and redispatched with new data for the updated signal. Change-Id: I9824b7eb762a8d565e22e118bf3f07a8a4791ce8 (cherry picked from commit 22c34f768d1cf58f7b340350ef0a64b2c1ae9485)
* Fix CustomContent display issue.Matt Garnes2015-04-271-1/+1
| | | | | | | | | | During certain transition animations, the X offset value is computed, taking into account the translation value set by the transition effect. Preserved the right behavior by using child.getLeft() to compute the value, without including the X translation. Change-Id: I25acf6e4bae1db9a2c12525125a4994e16c40dfe (cherry picked from commit 5d2f7ac2757bb2454a558d14760e4c26129d494d)
* Trebuchet: always set initial wallpaper offsetsRoman Birg2015-04-271-1/+3
| | | | | | | | | After a fresh boot, computeScrollOffset() always returns false. So the result was the offsets were never properly being set on a fresh boot and they were only being applied on first drag of the home screen, which finally triggered computeScrollOffset() to return true. Change-Id: Iccaedd742bed861fca1f50dd54e2e4537fd4c9b0
* Trebuchet: Skip sorting again when sorted by Title when launching app viewLinus Lee2015-04-241-1/+5
| | | | | Change-Id: Ie5b5398d17e6742f28084ce7cd6d31c4ba872b24 (cherry picked from commit b53f60bced4657d35880952732b2bcb811e1b7a6)
* Handle theme changesClark Scheff2015-04-231-0/+78
| | | | | Change-Id: I85208f3d6b572fb7a161db79cd3b74c1102dbba2 (cherry picked from commit 50f78e36b079bbe14bcb50064d28940358d42544)
* Trebuchet: Finalized the pivot of the scaling lettersHayden Schoen2015-04-171-1/+1
| | | | Change-Id: I6375753abf7fc01e099544e72d0687f6bdad0be7
* AppDrawer: tweak animations and layoutHayden Schoen2015-04-172-5/+10
| | | | Change-Id: If9d788b25fbabf21bd4d9d35b0dd82ddcca180f8
* AppDrawer: Add highlighting scrubbing and offsetLinus Lee2015-04-162-29/+134
| | | | | | | | | When you drag the scrubber it now highlights that section differently Also when you drag on the scrubber, instead of bringing the section into view at any point, it will try to make it the 3 row from the bottom Change-Id: I7cefaa24fb3c757f6e031247bb4a247473dde828 (cherry picked from commit 0ce1d70dffb2f19a8e2997f03556b46b44c57156)
* Trebuchet: fix Protected apps issue with foldersRoman Birg2015-04-161-3/+6
| | | | | | | | | | | | | | | | When there's a folder of shortcuts where all of the items have been set to protected, the first item in the folder sometimes does not get removed from the workspace allowing access to the protected application. When the second-to-last item in a folder is being removed, it was being replaced with the shortcut automatically, and we were checking against the folder contents, which was off the workspace at this time, but still had the shortcut. We need to check whether the last shortcut we are re-adding back to the workspace is actually protected before adding it. Change-Id: I9c7dbbd8562ae3e71e198747e6cb1c10417d1f46 Signed-off-by: Roman Birg <roman@cyngn.com> (cherry picked from commit d06291251703ce19968625742438c03351203d37)
* Trebuchet: Fix Settings shortcut widget title displays wrong when changing ↵yong.zou2015-04-151-0/+19
| | | | | | | | | | | | system language 1.Add a Settings shortcut widget to workspace 2.Change the system language 3.Check the Settings shortcut widget title The Settings shortcut widget title should update when changing the language Change-Id: I5012a3e99b9734230a844ce20e856ff86fba773a
* Trebuchet: Fix NPE when adding widgetsRaj Yengisetty2015-04-151-0/+25
| | | | | | | | | | Make sure to setWaitingForResult on startIntentSenderForResult so that mPendingAddInfo is saved Repro: Change orientation when in the config activity for a widget Change-Id: I76ecc2b69b7f4a1cda65a481699aa79ae67f767a (cherry picked from commit ee224cb05e13d38c670733e59ae11b81515967b6)
* App drawer: add animations and letters to make things prettyLinus Lee2015-04-025-50/+941
| | | | | Change-Id: Iaf6718893e09df715b4524b864be9a7c22addc59 (cherry picked from commit e002b691b3233629598c77ef50f1ef91eb1877f0)
* Trebuchet: Fix bad ui state when backing twice quicklyLinus Lee2015-03-311-0/+8
| | | | | | | | If a user enters the widget add screen and quickly backs up twice, the widget panel stays around and captures touch, but the ui thinks it is in the homescreen. Change-Id: I52a920fd633f3ab690ca1c959fbc8935c2d0bb69
* ProtectedApps: map items without componentNames by positionRaj Yengisetty2015-03-272-5/+28
| | | | | | | | | | | Repro: - Add a contact widget to a folder - Open the hidden apps fragment - Attempt to remove an entry from the fragment - Observe: Force close Change-Id: I3ca2c62283af5232534b766d7579413c060a5403 (cherry picked from commit f963b11485ceef70bbce7a9a4b98415ac2672b5b)
* Protected Apps: fix insets so that views stay above navbarRaj Yengisetty2015-03-251-0/+10
| | | | Change-Id: I78b5a212b66aa31b22d72a65af40452dd114fc35
* ProtectedApps: Fix protecting shortcuts with no ComponentNamesRaj Yengisetty2015-03-252-4/+10
| | | | | | | | | | Repro: - Create a shortcut using the contacts widget - Add to a folder and open app protection screen - Observe: Trebuchet force closes Change-Id: I76f6a8b1d024beb36fa804bb3a866913edc335c1 (cherry picked from commit d8bdb0eef3f1799e8b829bcf114f1c3573bce8d6)
* Trebuchet: protect update path for widgetpreviews dbRaj Yengisetty2015-03-181-1/+5
| | | | | | | | | After the update path is called, calling getWritableDatabase always results in a SQLiteReadOnlyDatabaseException. Looks to be a Lollipop bug, protecting the code path till we have a better solution. Change-Id: Ic0487e2d588a341d42e046fb97e8f041622d6450
* Trebuchet: disable search bar when there are no search activitiesRaj Yengisetty2015-03-174-19/+60
| | | | | | | | | - On non-GMS devices, there are no Search apps which can support the search bar implementation. - Disable the search bar entirely if there is no search activity - Add a new utility method in SettingsProvider Change-Id: I3bcbceae4ceab308e4d797dad107e0a2ab72d673
* Trebuchet: fix live settings bugRaj Yengisetty2015-03-161-2/+3
| | | | | | | | | | | Repro: - On fresh boot, long press on workspace and open settings panel - Toggle a setting (e.g. Large icons) that triggers a grid refresh - Quickly close the panel and click into a workspace page - Observe sometimes the background of the workspace page is still outlined as if in Overview mode Change-Id: I89492aa9eed269dac18027fa43d1d86597370502
* App Drawer: respect drawer show/hide icon lablesRaj Yengisetty2015-03-101-0/+8
| | | | Change-Id: Id1d2b152dde3d1e3d89fca2e9e16bc2472f661bc
* App Drawer: take dynamic grid updatesRaj Yengisetty2015-03-092-11/+12
| | | | | | - Also fix row length so icons aren't cut off when large icons are enabled Change-Id: Iae95dc2380abee211eeed72eae08cafa4ec354f7
* App drawer: respect protected appsRaj Yengisetty2015-03-091-0/+36
| | | | Change-Id: I67d0af84cc8cad3d3e788280e34a9c2a95ab76a7
* App Drawer: Disables specific settings for the paginated appHayden Schoen2015-03-062-9/+47
| | | | | | drawer while the vertical app drawer is selected Change-Id: I352bfd42f60d46c53ee74c4ecf6a6bb3f0b7ba90
* App Drawer: fix drawer visibility after cancelling widget dropRaj Yengisetty2015-03-061-5/+0
| | | | | | | | | | | Repro: - Open widgets - Try to add a widget with setup setp (cLock) - When setup activity is launched, press Home to cancel - Observe: legacy app dawer is visible on top of Workspace without a background Change-Id: I5e7d7d2166cc1cac193407ac9ec16643f52591ba
* App Drawer: internationalizationRaj Yengisetty2015-03-065-35/+1071
| | | | Change-Id: Ib3976e0852aab4a2e78a90877c056ad3ecd3c448
* App Drawer: Add toggle functionality to change back to legacy app drawerRaj Yengisetty2015-03-065-10/+95
| | | | Change-Id: I4a78832188e27ae0b5a25b6a81ce000b6ffcd1f1
* App drawer smooth scrollingRaj Yengisetty2015-03-063-19/+7
| | | | | | Also fixes searchbar visibility when dragging icons from app drawer Change-Id: I418dc3210a95cc57c81979452def8240c27d2214
* Trebuchet: App Drawer - clean up open/close animationsRaj Yengisetty2015-03-065-69/+128
| | | | Change-Id: Ia1bcaec9cf5bdcd9ca61137aa45f91819fb2e94d
* Trebuchet: Implement new app drawer.Rajesh Yengisetty2015-03-068-40/+1336
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 535c5e89c7484ae96f83af021487a8061f3e0b04 Author: Adnan <adnan@cyngn.com> Date: Tue Jul 22 17:21:09 2014 -0700 Trebuchet: Implement new app drawer. Change-Id: Ibf6152352520ece4dff201b8013378a1ad562894 commit d46c52032ef20d9f97409114e6efc34650245fb6 Author: Raj Yengisetty <rajesh@cyngn.com> Date: Fri Jul 25 09:13:38 2014 -0700 Fix: With the new App Drawer implementation AppsDrawerListAdapter should clone it's AppInfo ArrayList before removing elements from it, otherwise the AppsCustomizePagedView will not add any apps to it's instance variables and will never dispaly widgets. Repro: Long press on workspace to get to overview mode Click widgets button Observe no Widgets (empty page) Change-Id: I7574ae23dbf3298674585060d5da5e00a5852d46 commit b0c7e4fad041e492816a36e538a505983d996a75 Author: Adnan <adnan@cyngn.com> Date: Tue Jul 22 19:06:15 2014 -0700 Catapult: Allow elements to be draggable out of drawer. Change-Id: I711b42bad0fc6ae14399f3eb88ec60cd443f87d1 commit 00148d42288a7ee37e8aa05cccb121e9bcf6fbda Author: Danesh M <danesh@cyngn.com> Date: Wed Jul 23 10:37:19 2014 -0700 Catapult : Make flowlayout wrap_content Change-Id: I9db6d39274b71ee2750058fd65f4917701394ac0 commit 268e707d14be0c29448b9f5aee4f26a3180c75fd Author: Adnan <adnan@cyngn.com> Date: Wed Jul 23 13:27:06 2014 -0700 Catapult: Use recyclerview for side app drawer. Change-Id: Ie6f916792375f82a8f97a0369b98b813416216e8 commit efcbdc635e34511b73939639cbcf910728b1b3b2 Author: Adnan <adnan@cyngn.com> Date: Wed Jul 23 14:30:37 2014 -0700 Catapult: Handle app install and uninstall in drawer. Change-Id: Ia22876574e96b9ff0d4b4d93a853d7e92633376c commit 3fb7c6cb0b4bb9cfaf1d11c787df14c6767a72a9 Author: Danesh M <danesh@cyngn.com> Date: Thu Jul 24 10:19:57 2014 -0700 Catapult : Improve scroll performance Change-Id: I294beb9c9e1946724108bad2c0bca8839c5bf56b commit 85828036bd4af0a242f408ba18236b11920a0120 Author: Adnan <adnan@cyngn.com> Date: Thu Jul 24 10:46:58 2014 -0700 Catapult: Use setHasFixedSize on RecyclerView. Change-Id: Id06faa37d69f2d3ef533f829d991971ea2a32012 commit 4206cc348bb8aa788b0e4a0f2080deeb55a73d38 Author: Adnan <adnan@cyngn.com> Date: Thu Jul 24 10:49:15 2014 -0700 Catapult: Show App Info and Uninstall options on drag. Change-Id: Ica307eef4d2a086733f84704d129ac893f9bbb34 commit 283db64b47a5ec395e7ec07d5e34660c98cef91d Author: Adnan <adnan@cyngn.com> Date: Thu Jul 24 15:00:37 2014 -0700 Catapult: Properly handle install, remove, and update. Change-Id: I16138503bb5d31e999f293afc00e1adc2d574727 commit ca19c304fac9de8b97c0345b0c9a7cf3c3bdf155 Author: Adnan <adnan@cyngn.com> Date: Thu Jul 24 15:27:09 2014 -0700 Catapult: Ignore index 0 when added. Change-Id: Id00a41feb1813c419fda4425327024292d51e300 commit f595d415d3b8d9775d7448f1bbc4b542ea40c7a3 Author: Adnan <adnan@cyngn.com> Date: Thu Jul 24 15:51:32 2014 -0700 Catapult: Clean up after drag. Change-Id: I858c9aa5e30bc6ca13d4ca53397b769bb6b2b86b commit c337a69e43f213cacc0fe50a0d001f4cb3a5d9f4 Author: Adnan <adnan@cyngn.com> Date: Fri Jul 25 12:46:39 2014 -0700 Catapult: Fix app updates for new data structure. - Also fix line wrapping in class. Change-Id: I3c4f33d6e3e236952ea6d73f8402f32ac059f810 commit ef6b88c44f2c6c3372136773fa01821c4fc7ba62 Author: Danesh M <danesh@cyngn.com> Date: Thu Jul 24 23:26:41 2014 -0700 Catapult : Add scrubber Change-Id: Ied2e44e2d393bc5537f77c29a4b099da1e1f2a64 commit a96939b669f8adfad7bb633aa9acfa18fe72ff1e Author: Adnan <adnan@cyngn.com> Date: Mon Jul 28 11:01:37 2014 -0700 Catapult: Fix crashes for addition of next sections in list. Change-Id: I66d8e02523595655458d0f30d75ccfbe3b65e69d commit 48dd4872ba59499e7cea950fe4b1f8e4c6774a24 Author: Adnan <adnan@cyngn.com> Date: Mon Jul 28 11:59:20 2014 -0700 Catapult: Place all special or numerics in a single category. - Also implement AutoFitTextView for character resizing. Change-Id: Ida4e702b43dc934835021cbbf3e0b41d9cea0b16 commit 40ed85a3f518dcabfbf8533f534934e029cb3835 Author: Adnan <adnan@cyngn.com> Date: Mon Jul 28 13:22:14 2014 -0700 Catapult: Disable split touch events within drawer item. Change-Id: I990717140d5b420b9a658aede317206947e9fbce commit d76583a1a4e5dd0a5792ce6d39adc427934d7db9 Author: Adnan <adnan@cyngn.com> Date: Mon Jul 28 15:53:23 2014 -0700 Catapult: Add spacer to last item in list. Change-Id: Ia3f2d7d12c09886ab24e8976549518c1bb1a9a0b commit 467e9cb6428b33fd6846be8d30bb8dcfe127acdf Author: Adnan <adnan@cyngn.com> Date: Tue Jul 29 12:39:37 2014 -0700 Catapult: Group special characters together under section. Change-Id: Ic2508eb101e1604c9e1544bdc858c7487f426a44 commit 1f566b1b5b9bac71d0d79d07084f024ba67982e1 Author: Danesh M <danesh@cyngn.com> Date: Tue Jul 29 14:25:26 2014 -0700 Catapult : Fix scrubber - Make seekbar height of entire scrubber - Cancel viewproperty animator instead of Animation - Reduce scrubber animation duration - Ignore swipe events if in scrubber area Change-Id: I3a80b5bc392105bd1d5deff1defed8c083512029 commit b54ace6ee3ecca153f4c8fd2cda35366b205106f Author: Danesh M <danesh@cyngn.com> Date: Tue Jul 29 14:29:44 2014 -0700 Catapult : Check if appdrawer is null when intercepting Change-Id: I8d1b095acc8484d2ffb3f3ffc07608a639c9a3a3 commit 7a544638641e953aa2e75e6bc3f353906887440e Author: Adnan <adnan@cyngn.com> Date: Tue Jul 29 18:23:30 2014 -0700 Catapult: Use isLetter to fix locale issues in some languages. Change-Id: I253139ab3a93a9b48d3158f790e3975f776ce666 commit 96d1198ec28e5b858aa5cda268eecdf2335c6cf2 Author: Danesh Mondegarian <danesh@cyngn.com> Date: Fri Aug 8 23:30:15 2014 -0700 Catapult : Improve scrubber 9patch Change-Id: Ide249c0fe269d2f8966c753f6fdd9c1f673a0df9 commit 4920d0fdd94f7b0df6fccc3d16f5b98cbf4d19a2 Author: Danesh M <danesh@cyngn.com> Date: Fri Aug 8 15:44:20 2014 -0700 Catapult : Improve app drawer perf Change-Id: I78f699dbeac2618dceaa463940175e33ce685677 commit 10004f024b01029b2c137520407cefb5568b8c47 Author: Raj Yengisetty <rajesh@cyngn.com> Date: Thu Feb 26 11:42:17 2015 -0800 Remove scrubber swipe logic from Workspace Change-Id: I44d94a412ccdb60ce0f537fd6ddb71c2daffc906 Change-Id: Ibf6152352520ece4dff201b8013378a1ad562894