OSDN Git Service
Sudheer Shanka [Mon, 7 Mar 2016 20:56:53 +0000 (12:56 -0800)]
Adjust restricted lock positions as per new design.
Bug:
27263531
Change-Id: I7e38a9e3356ca43ed936de1e6f8190eba4d4773e
Julia Reynolds [Tue, 8 Mar 2016 21:41:59 +0000 (21:41 +0000)]
Merge "Don't reference framework strings." into nyc-dev
Julia Reynolds [Tue, 8 Mar 2016 21:37:32 +0000 (16:37 -0500)]
Don't reference framework strings.
Bug:
27513548
Change-Id: Ia459d540ebcb81c8a6d6b045e71141aef849d1f1
Julia Reynolds [Tue, 8 Mar 2016 21:26:39 +0000 (21:26 +0000)]
Merge "Don't reference the notification led if it doesn't exist." into nyc-dev
Julia Reynolds [Tue, 8 Mar 2016 21:23:03 +0000 (16:23 -0500)]
Don't reference the notification led if it doesn't exist.
Bug:
27318491
Change-Id: Ic43f1e8c0c7cf376b19278ab6c2661abc1052ddb
Julia Reynolds [Tue, 8 Mar 2016 21:08:54 +0000 (21:08 +0000)]
Merge "Notification summary updates." into nyc-dev
Julia Reynolds [Tue, 8 Mar 2016 20:39:03 +0000 (15:39 -0500)]
Notification summary updates.
Change-Id: I6b824acf27743637ca661b38b51c639ecf099208
Anna Galusza [Tue, 8 Mar 2016 20:37:33 +0000 (20:37 +0000)]
Merge "Make sure Action Bar title does not revert to original title (Vision Settings) after Display Size or Text Size is changed. Bug:
27326637" into nyc-dev
Jason Monk [Tue, 8 Mar 2016 18:05:31 +0000 (13:05 -0500)]
Fix SummaryLoader lifecycle second and for all
Mostly hypothetical fix for weird circumstance where listening
lifecycle gets broken. To fix this, track the current state
of listening in the SummaryLoader and force it into the non-listening
state when released.
Bug:
26027137
Bug:
26731143
Change-Id: I7299749230924eafa3e6e7d5b0de6e48ff014a38
Udam Saini [Tue, 8 Mar 2016 01:55:00 +0000 (01:55 +0000)]
Merge "Fixes a crash in setup wizard when adding a lock screen." into nyc-dev
Udam Saini [Tue, 8 Mar 2016 01:50:40 +0000 (17:50 -0800)]
Fixes a crash in setup wizard when adding a lock screen.
bug:
27528834
Change-Id: Idc06850740695669162e239f28c30a1ddad6d2df
Ruben Brunk [Tue, 8 Mar 2016 00:14:55 +0000 (00:14 +0000)]
Merge "Add settings VR listener service." into nyc-dev
Philip P. Moltmann [Mon, 7 Mar 2016 23:28:25 +0000 (15:28 -0800)]
Deal with the case that no print services are installed.
Bug:
27530312
Change-Id: Idd709e66d72efcca4928b471f138f8be66e7ab00
Rebecca Silberstein [Mon, 7 Mar 2016 23:29:39 +0000 (23:29 +0000)]
Merge "Save WifiAp config changes when hotspot is enabled" into nyc-dev
Fyodor Kupolov [Mon, 7 Mar 2016 21:20:18 +0000 (21:20 +0000)]
Merge "First time populate user list in onCreate" into nyc-dev
Fyodor Kupolov [Mon, 7 Mar 2016 19:49:35 +0000 (11:49 -0800)]
First time populate user list in onCreate
Call updateUserList from onCreate instead of onResume during initialization.
This will suppress unnecessary animations.
Bug:
27527929
Change-Id: Ia420f41894b2033fb7f02de01168ccd2c6331588
Jim Miller [Mon, 7 Mar 2016 20:55:38 +0000 (20:55 +0000)]
Merge "Fix crash in fingerprint enrollment due to async transaction" into nyc-dev
Adrian Roos [Mon, 7 Mar 2016 20:50:05 +0000 (20:50 +0000)]
Merge "Fix SUW redaction interstitial crash" into nyc-dev
Adrian Roos [Mon, 7 Mar 2016 19:14:16 +0000 (11:14 -0800)]
Fix SUW redaction interstitial crash
Bug:
27518157
Change-Id: Id0c2eae88db41080e35200ee8f94ee74ea0a9a1f
Ido Ofir [Mon, 7 Mar 2016 20:05:24 +0000 (20:05 +0000)]
Merge "mark categories as complete when disabled." into nyc-dev
Rebecca Silberstein [Fri, 4 Mar 2016 23:47:43 +0000 (15:47 -0800)]
Save WifiAp config changes when hotspot is enabled
We need to properly handle asynchronous events when WifiAp for hotspot
is enabled and the user changes the config. This CL changes the
behavior to:
1 - mark local boolean indicating a restart is needed
2 - trigger the WifiAp to stop
3 - save the new config
4 - when the stop is complete (and the boolean is set), restart the
WifiAp.
Also fix a few style issues in the file.
BUG:
27460194
Change-Id: I7e49ab9c49e125017cf83866a396701e440bf383
Philip P. Moltmann [Wed, 24 Feb 2016 20:11:05 +0000 (12:11 -0800)]
Make Print Settings use the new PrintManager.getPrintServices loader
This makes sure that all data always stays up to date.
printer_dropdown_item.xml:
- Reduce the amount of overriden properties
PrintServiceSettingsFragment:
- Instead receiving most data from PrintSettingsFragment have own loader
and keep data up to date
- Also the updating of the print service state now has a dedicated
PrintManager call instead of relying of the Settings-ContentObserver
to transport this information. No more race-conditions, whohoo!
DynamicIndexableContentMonitor:
- To not rewrite too much code the update logic has to live here but the
reading of the actual data is in PrintSettingsFragment.
Change-Id: I60715cda8952565d7f68cb24fb7da61a37085887
Oleksandr Peletskyi [Mon, 7 Mar 2016 16:43:38 +0000 (16:43 +0000)]
Merge "Block "Screen lock" menu if password is managed." into nyc-dev
Geoff Mendal [Mon, 7 Mar 2016 15:39:40 +0000 (15:39 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 7 Mar 2016 15:37:10 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I066af915c57a99077bb8c2eba2193707154f0b90
Auto-generated-cl: translation import
Jason Monk [Mon, 7 Mar 2016 15:19:47 +0000 (10:19 -0500)]
Fix add network alignment
Bug:
26759951
Change-Id: I5ba657b5a4099d9f2f1ecf2f27a6a25908bc4a86
Jason Monk [Mon, 7 Mar 2016 15:02:35 +0000 (10:02 -0500)]
Fix missing bluetooth settings items
In the off/turning on state all items were being removed, but never
re-added to the preference screen.
Bug:
27347029
Change-Id: I8f47ee79f428fc8555a0dc6574244c81aa85c6c8
Jim Miller [Sat, 5 Mar 2016 00:57:18 +0000 (16:57 -0800)]
Fix crash in fingerprint enrollment due to async transaction
Fixes bug
27424654
Change-Id: I667374330fee00abc2f4ef7f881f8e98fd91567e
Clara Bayarri [Sat, 5 Mar 2016 02:01:57 +0000 (02:01 +0000)]
Merge "Fix issue with unlock attempts for the Work Challenge" into nyc-dev
Clara Bayarri [Sat, 5 Mar 2016 01:55:43 +0000 (17:55 -0800)]
Fix issue with unlock attempts for the Work Challenge
The failed attempts to unlock were not being reported due to a small
bug.
Bug:
26677759
Change-Id: Ie03593ba38ba118e1c030135037e15400e7af8a2
Anna Galusza [Fri, 4 Mar 2016 19:39:02 +0000 (11:39 -0800)]
Make sure Action Bar title does not revert to original title (Vision Settings)
after Display Size or Text Size is changed.
Bug:
27326637
Change-Id: I1d6d5a9dc4a6ab1c57772753b543483fec84cad8
Ruben Brunk [Wed, 24 Feb 2016 02:58:56 +0000 (18:58 -0800)]
Add settings VR listener service.
Bug:
22855417
Bug:
26724891
- Adds a settings panel allowing users to toggle the
enabled/disabled state of each VrListenerService
component installed.
- If disabled, a VrListenerService will not be bound
from the framework, even when requested by a VR
application.
Change-Id: I606eb712c011d160b9fbdd3c0e8fd744c653ef07
Sudheer Shanka [Fri, 4 Mar 2016 22:27:44 +0000 (22:27 +0000)]
Merge "Avoid checking the restricted items in the list." into nyc-dev
Sudheer Shanka [Fri, 4 Mar 2016 21:53:24 +0000 (13:53 -0800)]
Avoid checking the restricted items in the list.
Since we are not auto-closing the dialog any more, need to
make sure the restricted item in not checked when selected by user.
Change-Id: I7c02844d3071ae62222cdbdbda96780bd5d922de
Udam Saini [Fri, 4 Mar 2016 19:19:49 +0000 (19:19 +0000)]
Merge "Use the layout for calculating IME inset." into nyc-dev
Noah Wang [Fri, 4 Mar 2016 18:52:49 +0000 (18:52 +0000)]
Merge "Make preview pager and pager indicator screenreader-enabled" into nyc-dev
Mahaver Chopra [Fri, 4 Mar 2016 18:01:07 +0000 (18:01 +0000)]
Merge "Fix: 'Make profile pattern visible'" into nyc-dev
Mahaver Chopra [Fri, 4 Mar 2016 17:17:59 +0000 (17:17 +0000)]
Fix: 'Make profile pattern visible'
'Make profile pattern visible' turns itself back on.
Bug:
27331363
Change-Id: I0c9520c89b5f56e78fc51ac9b42320b66cc9df38
Andres Morales [Fri, 4 Mar 2016 16:23:09 +0000 (16:23 +0000)]
Merge "Use getFlashLockState API to check lock state" into nyc-dev
Julia Reynolds [Fri, 4 Mar 2016 14:44:34 +0000 (09:44 -0500)]
Remove DND & Notification access screen links.
These should only be available from 'special access.'
Change-Id: I9e49be9263b3e880031906345422459a5ad23d7f
Michal Karpinski [Fri, 4 Mar 2016 10:04:48 +0000 (10:04 +0000)]
Merge "New activity for handling dialogs of remote bugreports" into nyc-dev
Noah Wang [Fri, 4 Mar 2016 04:05:14 +0000 (20:05 -0800)]
Make preview pager and pager indicator screenreader-enabled
Bug:
27127738
Change-Id: I11a8589f4d8e1f15e895831dc3bd0cb7472e0591
Fyodor Kupolov [Fri, 4 Mar 2016 02:20:48 +0000 (02:20 +0000)]
Merge "Use the right userId when setting restrictions" into nyc-dev
Fyodor Kupolov [Fri, 4 Mar 2016 02:14:50 +0000 (18:14 -0800)]
Use the right userId when setting restrictions
Bug:
27457164
Change-Id: I9528b637cb0bc3f737458e078725f73666bd0d7d
Andres Morales [Thu, 3 Mar 2016 21:17:23 +0000 (13:17 -0800)]
Use getFlashLockState API to check lock state
Bug:
26039090
Change-Id: Ia90d6ece2dcdd5ed8549044900f79c0bf4902296
Udam Saini [Mon, 22 Feb 2016 22:51:44 +0000 (14:51 -0800)]
Use the layout for calculating IME inset.
We should calculate the offset for the entire layout rather than
just the scroll view. This allows us to not special case the navigation
bar inside SystemBarHelper.setImeInsetView, as the logic before always
assumed the scroll view was passed into setImeInsetView.
bug:
27063940
Change-Id: If3f09e1e07ea584097a050b987c1ab3985b4991c
Ido Ofir [Mon, 29 Feb 2016 22:24:37 +0000 (14:24 -0800)]
mark categories as complete when disabled.
Change-Id: I0a50adf254d28653c8740ad892507db29cd9b0a8
Adrian Roos [Thu, 3 Mar 2016 21:43:59 +0000 (21:43 +0000)]
Merge "Add remote input setting to redaction interstitial" into nyc-dev
Anna Galusza [Thu, 25 Feb 2016 23:50:59 +0000 (15:50 -0800)]
Send Accessibility Events when Fragments change.
Bug:
27326723
Change-Id: Ia7684f7e27cdb69ad8302c9d5c37ccae6333fc92
Adrian Roos [Thu, 3 Mar 2016 20:48:36 +0000 (20:48 +0000)]
Merge "Fix NotificationLockscreenPreference" into nyc-dev
Anna Galusza [Thu, 3 Mar 2016 19:05:16 +0000 (19:05 +0000)]
Merge "Change nav bar style. Bug:
27226956" into nyc-dev
Sudheer Shanka [Thu, 3 Mar 2016 18:31:50 +0000 (18:31 +0000)]
Merge "Update the restricted icon usage." into nyc-dev
Sudheer Shanka [Thu, 3 Mar 2016 18:26:44 +0000 (18:26 +0000)]
Merge "Update custom widget layouts to have a restricted icon." into nyc-dev
Michal Karpinski [Thu, 25 Feb 2016 17:29:43 +0000 (17:29 +0000)]
New activity for handling dialogs of remote bugreports
Presents dialogs when commanded by DPM.
Bug:
26226230
Change-Id: Ia3301592f767ac95f1c073e9401718d717f50c83
Julia Reynolds [Thu, 3 Mar 2016 16:43:58 +0000 (16:43 +0000)]
Merge "Notification filter changes." into nyc-dev
Jason Monk [Thu, 3 Mar 2016 16:21:42 +0000 (11:21 -0500)]
Fix home search
- Remove old home from search
- Fix weird threading problem on new home search indexing
Bug:
27249674
Change-Id: I3cfdde7dd3595f5161b5f8c861041c40e800c7bd
Julia Reynolds [Tue, 1 Mar 2016 16:07:24 +0000 (11:07 -0500)]
Notification filter changes.
Bug:
27403688
Change-Id: I560ab6fc4a46673c0be4244b24f90e7c937b0006
Jason Monk [Thu, 3 Mar 2016 15:49:44 +0000 (10:49 -0500)]
Fix notification setting summary
Bug:
25926406
Change-Id: I503f2d2def095e37f6b16ca345112fe81ef73e29
Sudheer Shanka [Tue, 23 Feb 2016 18:28:45 +0000 (18:28 +0000)]
Update the restricted icon usage.
Bug:
25603665
Bug:
27263775
Change-Id: I72b824d01b462fa5f9f8c15eaaf0108441560f65
Adrian Roos [Wed, 2 Mar 2016 23:37:52 +0000 (15:37 -0800)]
Add remote input setting to redaction interstitial
Bug:
26440855
Change-Id: I8cd16074c63778defab767096261bcc99956b8fc
Jason Monk [Wed, 2 Mar 2016 20:45:46 +0000 (20:45 +0000)]
Merge "Actually listen to data saver state" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:42:36 +0000 (15:42 -0500)]
Actually listen to data saver state
Bug:
27445032
Change-Id: Idb9646af9cd82e19b3d4a6add52d349be8015caa
Julia Reynolds [Wed, 2 Mar 2016 20:16:07 +0000 (20:16 +0000)]
Merge "Allow notifications be to hidden from the lockscreen by app." into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:12:11 +0000 (20:12 +0000)]
Merge "SummaryLoader: Make sure all messages are proccessed on release" into nyc-dev
Jason Monk [Wed, 2 Mar 2016 20:08:41 +0000 (15:08 -0500)]
SummaryLoader: Make sure all messages are proccessed on release
Otherwise the receivers don't get unregistered, which causes a warning,
immediately followed by them actually getting unregistered, which
causes a crash.
Bug:
26027137
Change-Id: Ib55edb4490de960d10036c35d98b8a8e31e13ae1
Adrian Roos [Wed, 2 Mar 2016 19:55:45 +0000 (11:55 -0800)]
Fix NotificationLockscreenPreference
Show remote input on lockscreen checkbox
when showing all notification content.
Bug:
26440855
Change-Id: I90475d4c39797858b2dc8cdefab5bca6bb63daef
Clara Bayarri [Wed, 2 Mar 2016 19:36:16 +0000 (19:36 +0000)]
Merge "Fix crash in ConfigureNotificationSettings" into nyc-dev
Julia Reynolds [Wed, 2 Mar 2016 13:54:56 +0000 (08:54 -0500)]
Allow notifications be to hidden from the lockscreen by app.
Bug:
26642033
Change-Id: I932defebe00c566c0a930a0cabc118238c349272
Noah Wang [Wed, 2 Mar 2016 18:30:20 +0000 (18:30 +0000)]
Merge "Remove spammy debug logging from MessageBubbleBackground." into nyc-dev
Clara Bayarri [Wed, 2 Mar 2016 17:21:41 +0000 (09:21 -0800)]
Fix crash in ConfigureNotificationSettings
Bug:
27445698
Change-Id: I1d0f99731b0b5abe1b34c7dfab4daeecf236e889
Oleksandr Peletskyi [Mon, 29 Feb 2016 15:12:04 +0000 (16:12 +0100)]
Block "Screen lock" menu if password is managed.
"Screen lock" menu item is completely disabled in case, if
PASSWORD_QUALITY_MANAGED is set.
BUG:
25549437
Change-Id: I1958157946d29c013465e995af2226e061d5c726
Geoff Mendal [Wed, 2 Mar 2016 15:37:57 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I7fc9058af79321a65e11880ace9e808312799994
Auto-generated-cl: translation import
Sudheer Shanka [Tue, 23 Feb 2016 17:25:53 +0000 (17:25 +0000)]
Update custom widget layouts to have a restricted icon.
Bug:
25603665
Bug:
27263775
Change-Id: Ic80377229de977b6f7c5f653974e8f926fb8ac1d
Noah Wang [Tue, 1 Mar 2016 23:42:53 +0000 (15:42 -0800)]
Remove spammy debug logging from MessageBubbleBackground.
Bug:
27363534
Change-Id: If8ff8bf0540f4e031a9092026adce8296ef4b6e1
Anna Galusza [Sat, 27 Feb 2016 00:06:54 +0000 (16:06 -0800)]
Change nav bar style.
Bug:
27226956
Change-Id: I16e2234e44bf1d22f8b41de9d28c35226152d0ee
Fyodor Kupolov [Tue, 1 Mar 2016 23:21:26 +0000 (23:21 +0000)]
Merge "Do not allow removing current user if it's in a call" into nyc-dev
Clara Bayarri [Tue, 1 Mar 2016 23:11:59 +0000 (23:11 +0000)]
Merge "Add Work Challenge Notifications Setting" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:43:57 +0000 (20:43 +0000)]
Merge "Wifi p2p fix?" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 20:27:38 +0000 (15:27 -0500)]
Wifi p2p fix?
Bug:
27431029
Change-Id: Ic9661dbb75d633d4b6e778cde796785aa33c04e0
Clara Bayarri [Tue, 1 Mar 2016 18:22:55 +0000 (18:22 +0000)]
Merge "Fixes for Work Challenge Fingerprint" into nyc-dev
Clara Bayarri [Thu, 18 Feb 2016 12:09:21 +0000 (12:09 +0000)]
Add Work Challenge Notifications Setting
Bug:
26844582
Change-Id: Ib1eb28cfebcc0c8d23ec8669f2777ccb822d7bf3
Clara Bayarri [Fri, 19 Feb 2016 17:24:28 +0000 (17:24 +0000)]
Fixes for Work Challenge Fingerprint
When enrolling fingerprints on both personal and work and then setting
the lock to none or swipe, the fingerprints for that user were not being
correctly removed due to wrong userIds being passed in.
Also fix the wipe dialog message as it was always querying whether the
main user has fingerprints instead of the user the dialog applies to.
Bug:
27263452,
27199237
Change-Id: I8d170e36f31b5595bc0bb41168a87db9f57eda2f
Clara Bayarri [Tue, 1 Mar 2016 18:07:41 +0000 (18:07 +0000)]
Merge "When un-unifying the personal and work locks, launch lock setup" into nyc-dev
Daniel Sandler [Tue, 1 Mar 2016 16:19:25 +0000 (16:19 +0000)]
Merge "Fix CharSequence nonsense in NotificationStation." into nyc-dev
Jason Monk [Tue, 1 Mar 2016 15:55:11 +0000 (15:55 +0000)]
Merge "Data saver fixes" into nyc-dev
Jason Monk [Tue, 1 Mar 2016 15:44:16 +0000 (10:44 -0500)]
Data saver fixes
- Correct summary for number of apps with unrestricted
- Show system option on unrestricted access page
- general betterness
Bug:
26796370
Bug:
27378294
Bug:
27122309
Change-Id: Ia57b56a25175182cb1a5a1231c20dc3c71cc3427
Julia Reynolds [Tue, 1 Mar 2016 15:11:08 +0000 (10:11 -0500)]
Hide notification asst setting.
Bug:
22960980
Change-Id: If9f28e3944d6a3a450d2607448be9ec25fdcdb85
Julia Reynolds [Tue, 1 Mar 2016 15:05:33 +0000 (15:05 +0000)]
Merge "Api review: AutomaticZenRule" into nyc-dev
Nicolas Prévot [Tue, 1 Mar 2016 11:42:49 +0000 (11:42 +0000)]
Merge "Make some Settings intent filters cross-profile again." into nyc-dev
Dan Sandler [Tue, 1 Mar 2016 03:29:10 +0000 (22:29 -0500)]
Fix CharSequence nonsense in NotificationStation.
Also clean up the lifecycle so we unbind and rebind on pause
and resume, instead of create and destroy.
Bug:
27389947
Change-Id: I2b7b7934a25a6bd528b9d399ffed487ea724b30b
Clara Bayarri [Tue, 1 Mar 2016 01:57:56 +0000 (17:57 -0800)]
When un-unifying the personal and work locks, launch lock setup
When the user decides to have a separate work lock, it makes sense
to send them to set up that lock directly. Also fixes the issue where
we have work fingerprints in a unified state and un-unifying leaves
the work profile with no lock but fingerprints.
Bug:
27199237
Change-Id: I85dab9cdf993af69a661d8f0cd4ad2449a348cac
Felipe Leme [Tue, 1 Mar 2016 01:21:44 +0000 (17:21 -0800)]
Fixed padding on "Take Bug Report" dialog.
BUG:
26324085
Change-Id: If716066d8ebf35e4fb398e7a423c808abd6a159e
Anna Galusza [Mon, 29 Feb 2016 19:47:15 +0000 (19:47 +0000)]
Merge "Change Action Bar title in a11y SUW to match setting name. Bug:
27326637" into nyc-dev
Anna Galusza [Thu, 25 Feb 2016 21:01:28 +0000 (13:01 -0800)]
Change Action Bar title in a11y SUW to match setting name.
Bug:
27326637
Change-Id: Ifddabdfef75707d5cdc164b4415e830539fd962a
Sanket Padawe [Mon, 29 Feb 2016 18:48:51 +0000 (10:48 -0800)]
Resolve merge conflicts of
b9e837bc78 to nyc-dev
+ Fix merge conflict fromm mm-wireless-dev to nyc-dev
Change-Id: I8a604cec65bbe5ed61262771c9fe0489798425ed
Sanket Padawe [Mon, 29 Feb 2016 18:23:56 +0000 (18:23 +0000)]
Merge "Remove displaying of WifiCalling twice in Settings search." into mm-wireless-dev
Geoff Mendal [Mon, 29 Feb 2016 16:46:01 +0000 (16:46 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Geoff Mendal [Mon, 29 Feb 2016 15:37:40 +0000 (07:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I75e4543568e4d74a1cd3804a04ea13d49eb6a6d1
Auto-generated-cl: translation import
Jason Monk [Mon, 29 Feb 2016 14:55:19 +0000 (09:55 -0500)]
Guard against apps with no permissions
Bug:
27355802
Change-Id: Iee8d9898af0e5910319cb47218ceee8da1352554
Nicolas Prevot [Mon, 29 Feb 2016 13:49:31 +0000 (13:49 +0000)]
Make some Settings intent filters cross-profile again.
The intents:
INPUT_METHOD_SETTINGS, MANAGE_DEFAULT_APPS_SETTINGS and HOME_SETTINGS
were not handled in the parent any more. Handle them in the parent.
BUG:
27240411
Change-Id: I42da3ce37901ba3e9f5c8004db53e49bc2f9ed24