OSDN Git Service
Martijn Coenen [Mon, 8 Jun 2015 08:02:28 +0000 (08:02 +0000)]
Merge "Add NFC payment "how it works" screens." into mnc-dev
Martijn Coenen [Mon, 8 Jun 2015 08:01:45 +0000 (08:01 +0000)]
Merge "NFC: don't use dynamic resources." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:58:18 +0000 (01:58 +0000)]
Merge "Fix wifi network strings shown in Settings." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:49:12 +0000 (18:49 -0700)]
Fix wifi network strings shown in Settings.
Bug:
21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
Ruben Brunk [Sat, 6 Jun 2015 00:04:17 +0000 (00:04 +0000)]
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
Ruben Brunk [Thu, 4 Jun 2015 01:53:40 +0000 (18:53 -0700)]
Add UI for camera + flashlight battery reporting.
Bug:
11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
Martijn Coenen [Fri, 5 Jun 2015 19:28:17 +0000 (21:28 +0200)]
Add NFC payment "how it works" screens.
Bug:
21239081
Bug:
21305138
Bug:
21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
Maurice Lam [Fri, 5 Jun 2015 19:13:17 +0000 (19:13 +0000)]
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 18:12:16 +0000 (18:12 +0000)]
Merge "Fix lockpattern weirdness" into mnc-dev
ztenghui [Fri, 5 Jun 2015 16:37:04 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
Merge "Settings > Apps list style updates" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:23:12 +0000 (13:23 +0000)]
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
Martijn Coenen [Fri, 5 Jun 2015 09:36:50 +0000 (11:36 +0200)]
NFC: don't use dynamic resources.
Also fixed talk-back for the default
payment app selection.
Bug:
21343778
Bug:
21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
Jorim Jaggi [Fri, 5 Jun 2015 01:00:34 +0000 (18:00 -0700)]
Fix lockpattern weirdness
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.
Bug:
21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0
Maurice Lam [Fri, 5 Jun 2015 00:17:07 +0000 (17:17 -0700)]
Update Setup Wizard redaction interstitial styles
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug:
21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
Ye Wen [Tue, 2 Jun 2015 23:02:23 +0000 (16:02 -0700)]
Enhance change default SMS app dialog to show list of apps
Settings shows a dialog to android.provider.Telephony.ACTION_CHANGE_DEFAULT
intent to confirm if user wants to change default SMS app to a new one.
This is used by SMS apps to obtain default status. In the opposite direction,
i.e. giving up default status, SMS apps have to bring up the wireless
settings page where the default SMS app setting was originally located.
MNC moved this setting to a different location therefore broke the
function. This change enhances the SmsDefaultDialog to display a list of
SMS apps so that user can choose a different default SMS app, when the
new default SMS app package name is not specified within the above
intent.
b/
20430567
Change-Id: I75d518900a7cf17f51b0d466bc2d062c470790bb
ztenghui [Tue, 26 May 2015 21:53:41 +0000 (14:53 -0700)]
Setup the animation callback for AnimatedVectorDrawable
b/
21341096
Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4
Jason Monk [Thu, 4 Jun 2015 19:17:16 +0000 (15:17 -0400)]
Settings > Apps list style updates
Bug:
21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c
Jason Monk [Wed, 3 Jun 2015 14:53:03 +0000 (10:53 -0400)]
Fix some dark theme issues (Take 2)
Now with visible lock patterns! Both light and dark!
Bug:
21117509
Bug:
21077345
Bug:
21480587
Bug:
21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
Jason Monk [Thu, 4 Jun 2015 18:09:08 +0000 (18:09 +0000)]
Merge "Fix apps/memory screen's spinner alignment" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 17:54:06 +0000 (13:54 -0400)]
Fix apps/memory screen's spinner alignment
Bug:
21587762
Change-Id: I80d7f2622330b02e63281aca8bd53261c0ad4d9b
Jason Monk [Thu, 4 Jun 2015 16:14:31 +0000 (16:14 +0000)]
Merge "Fix dashboard shadows on tablets" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 16:04:30 +0000 (12:04 -0400)]
Fix dashboard shadows on tablets
Bug:
19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
John Spurlock [Thu, 4 Jun 2015 15:41:58 +0000 (15:41 +0000)]
Merge "Settings: Add zen rule name warning text." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 15:37:36 +0000 (11:37 -0400)]
Settings: Add zen rule name warning text.
Bug:
21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
Jason Monk [Thu, 4 Jun 2015 15:24:27 +0000 (15:24 +0000)]
Merge "Fix updates of the enable/disable button" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 14:58:57 +0000 (14:58 +0000)]
Merge "Fix crash in battery screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 14:57:31 +0000 (10:57 -0400)]
Fix updates of the enable/disable button
Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.
ApplicationsState could use some refactoring.
Bug:
21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4
Jason Monk [Thu, 4 Jun 2015 14:50:25 +0000 (10:50 -0400)]
Fix crash in battery screen
Also add a fake app item
Bug:
21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400
John Spurlock [Thu, 4 Jun 2015 14:48:01 +0000 (14:48 +0000)]
Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 14:44:45 +0000 (10:44 -0400)]
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
Bug:
21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76
Jason Monk [Thu, 4 Jun 2015 13:08:48 +0000 (13:08 +0000)]
Merge "Disable owner info when no lock screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 12:55:44 +0000 (12:55 +0000)]
Merge "Protect against monkey crash" into mnc-dev
The Android Automerger [Thu, 4 Jun 2015 08:05:02 +0000 (01:05 -0700)]
merge in mnc-release history after reset to mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:52:11 +0000 (02:52 +0000)]
Merge "Revert "Fix some dark theme issues"" into mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:45:40 +0000 (02:45 +0000)]
Revert "Fix some dark theme issues"
This breaks the pattern entry screens of SecuritySettings. Reverting until we can take a closer look.
This reverts commit
cb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb.
Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
Sanket Padawe [Thu, 4 Jun 2015 01:47:49 +0000 (01:47 +0000)]
Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
Sanket Padawe [Thu, 4 Jun 2015 01:47:25 +0000 (18:47 -0700)]
Display softKeyboard when entering pin for pairing BT device.
Bug:
18784238
Change-Id: I73bec83aa099a4f63fa055cb67afb095f37dee28
Stuart Scott [Thu, 4 Jun 2015 00:51:13 +0000 (00:51 +0000)]
Merge "Re-add a string which was accidently removed." into mnc-dev
Stuart Scott [Thu, 4 Jun 2015 00:01:42 +0000 (17:01 -0700)]
Re-add a string which was accidently removed.
bug:
20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
Nicolas Prevot [Wed, 3 Jun 2015 22:17:10 +0000 (22:17 +0000)]
Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev
Nicolas Prevot [Wed, 3 Jun 2015 21:36:35 +0000 (14:36 -0700)]
In Settings, don't allow to disable an app which is profile/device owner.
In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.
BUG:
20831525
Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0
Sanket Padawe [Wed, 3 Jun 2015 21:16:13 +0000 (14:16 -0700)]
Fix Wifi Settings crash on continuous wifi toggling.
Bug:
21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
Jason Monk [Wed, 3 Jun 2015 20:37:07 +0000 (16:37 -0400)]
Disable owner info when no lock screen
Bug:
20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e
Jason Monk [Wed, 3 Jun 2015 19:43:46 +0000 (15:43 -0400)]
Protect against monkey crash
Bug:
19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb
Sanket Padawe [Wed, 3 Jun 2015 18:57:39 +0000 (18:57 +0000)]
Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
Sanket Padawe [Wed, 3 Jun 2015 18:54:41 +0000 (11:54 -0700)]
Fix Wifi Signal strength icon issues in WifiSettings.
Bug:
21591392
Bug:
21592509
Change-Id: I6612ef62c17e6279b06f80a67bee345e913f1927
Geoff Mendal [Wed, 3 Jun 2015 18:18:43 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Geoff Mendal [Wed, 3 Jun 2015 18:04:23 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0f8d1901b248c78ee0903628bde034c9f8addd5
Auto-generated-cl: translation import
Jason Monk [Wed, 3 Jun 2015 17:30:54 +0000 (17:30 +0000)]
Merge "Fix some dark theme issues" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 14:53:03 +0000 (10:53 -0400)]
Fix some dark theme issues
Bug:
21117509
Bug:
21077345
Bug:
21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe
Nicolas Prevot [Wed, 3 Jun 2015 17:28:34 +0000 (17:28 +0000)]
Merge "Don't allow secondary users apps to start restricted Settings fragment." into mnc-dev
Jason Monk [Wed, 3 Jun 2015 17:21:59 +0000 (17:21 +0000)]
Merge "Reorder device category" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 17:18:07 +0000 (13:18 -0400)]
Reorder device category
Bug:
21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c
Barnaby James [Wed, 3 Jun 2015 17:09:45 +0000 (17:09 +0000)]
Merge "Fix TTS for Zen mode voice activity." into mnc-dev
Xiyuan Xia [Wed, 3 Jun 2015 16:07:41 +0000 (16:07 +0000)]
Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
The Android Automerger [Wed, 3 Jun 2015 08:04:06 +0000 (01:04 -0700)]
merge in mnc-release history after reset to mnc-dev
Nicolas Prevot [Tue, 2 Jun 2015 21:27:49 +0000 (22:27 +0100)]
Don't allow secondary users apps to start restricted Settings fragment.
On a secondary user, the fragments ApnSettings, TetherSettings and VpnSettings
should not be started.
But an app can still send an intent to start these fragments.
Prevent this by checkin the userId in these fragments.
BUG:
15313261
BUG:
15312781
BUG:
15312494
Change-Id: I2a36bb89a8e37e4440aa28372d7a1800b33dae37
Sanket Padawe [Tue, 2 Jun 2015 23:04:23 +0000 (23:04 +0000)]
Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
Sanket Padawe [Tue, 2 Jun 2015 23:00:43 +0000 (16:00 -0700)]
Fix Bluetooth device Settings checkbox issue on clicking "Input device"
Bug:
19937357
Change-Id: I6f74577a062df407e50972b84dd4e5d7d2da529b
Jason Monk [Tue, 2 Jun 2015 22:39:07 +0000 (22:39 +0000)]
Merge "Hide search from everywhere but the dashboard" into mnc-dev
Xiyuan Xia [Tue, 2 Jun 2015 22:21:51 +0000 (15:21 -0700)]
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
ConfirmLockPassword/Pattern;
Bug:
20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e
Adrian Roos [Tue, 2 Jun 2015 20:50:34 +0000 (20:50 +0000)]
Merge "Only show emergency app preference if enabled" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 20:46:34 +0000 (16:46 -0400)]
Hide search from everywhere but the dashboard
Because it is too confusing what it does/doesn't search.
Bug:
21556767
Change-Id: Ib162177ce3eea816344d8d0fd5d71f85bfc94183
Jason Monk [Tue, 2 Jun 2015 18:05:55 +0000 (14:05 -0400)]
Change DeviceProfilesSettings to DialogFragment
This makes the lifecycle simpler to fix a crash after rotation.
Also do some adjusting of alignment while here.
Bug:
21444336
Bug:
21205689
Change-Id: I67eccf4833f53b5e5088ae5e6038d041e8653565
Jason Monk [Tue, 2 Jun 2015 20:09:16 +0000 (20:09 +0000)]
Merge "Fix battery usage screen issues" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 17:03:24 +0000 (13:03 -0400)]
Fix battery usage screen issues
Tint icons properly
Bug:
21077770
Show better icons for wifi and bt (remove the old ones)
Bug:
21172936
Also add a way to show fake items in power list for testing.
Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2
Sanket Padawe [Tue, 2 Jun 2015 18:14:30 +0000 (18:14 +0000)]
Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
Sanket Padawe [Tue, 2 Jun 2015 18:13:01 +0000 (11:13 -0700)]
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
Bug:
18048121
Change-Id: If837a58a4840be3d5b9f3cc16ecb261d9ab4420a
Xiyuan Xia [Tue, 2 Jun 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 15:37:19 +0000 (15:37 +0000)]
Merge "Clear connected legacy VPN during rescan" into mnc-dev
Hemant Gupta [Thu, 17 Apr 2014 14:40:28 +0000 (20:10 +0530)]
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
This patch acquires a wakelock to turn on the LCD display if the screen
is off during an access request for MAP. Without this patch it was
observed that if the screen was off, the LCD remained off for incoming
connection access request from remote devices and the user only heard
the notification sound without the LDC being lit up.
Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
Andre Eisenbach [Tue, 2 Jun 2015 09:00:29 +0000 (09:00 +0000)]
Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
Andre Eisenbach [Tue, 2 Jun 2015 08:48:29 +0000 (01:48 -0700)]
Bluetooth PAN: Set isPreferred to true (2/2)
isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.
Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.
Change-Id: I3d52d89136269508ac6416b695b22842f4bb557a
The Android Automerger [Tue, 2 Jun 2015 08:03:58 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Robin Lee [Tue, 2 Jun 2015 01:45:40 +0000 (18:45 -0700)]
Clear connected legacy VPN during rescan
Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
Andres Morales [Tue, 2 Jun 2015 01:09:31 +0000 (01:09 +0000)]
Merge "[MasterClear] fix race in showing dialog" into mnc-dev
Andres Morales [Mon, 1 Jun 2015 23:23:41 +0000 (16:23 -0700)]
[MasterClear] fix race in showing dialog
Wiping the PDB effectively starves all other threads from
accessing flash, and freezes the UI. We throw up a dialog
but there's a race between drawing the dialog and starting the
wipe.
Show the dialog in onPreExecute to fix this.
Bug:
20854355
Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
Sanket Padawe [Mon, 1 Jun 2015 22:21:51 +0000 (22:21 +0000)]
Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 22:18:48 +0000 (15:18 -0700)]
Fix scrolling issue for Wifi hotspot setup layout.
Bug:
19856113
Change-Id: Id49ac7c452f10e0de43b18ecdecc68619faecbc3
Xiyuan Xia [Mon, 1 Jun 2015 22:05:54 +0000 (15:05 -0700)]
Add announceForAccessibility to ConfirmLockPattern
This makes Talkback in ConfirmLockPattern works similarly as
in ConfirmLockPassword to read out error messages.
Bug:
20282779
Change-Id: Ied05c284e959539cfbff965f33edd51c3bdfc9f9
Jason Monk [Mon, 1 Jun 2015 19:54:52 +0000 (19:54 +0000)]
Merge "Make Theme a DropDownPreference" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:12:22 +0000 (15:12 -0400)]
Make Theme a DropDownPreference
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.
Bug:
21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
Jason Monk [Mon, 1 Jun 2015 19:45:26 +0000 (19:45 +0000)]
Merge "Change name of search menu item to be more descriptive" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:21:07 +0000 (15:21 -0400)]
Change name of search menu item to be more descriptive
(for accessibility)
Bug:
20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
Maurice Lam [Mon, 1 Jun 2015 18:40:46 +0000 (18:40 +0000)]
Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 17:55:10 +0000 (17:55 +0000)]
Merge "Send sim change notification based on sim state change." into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 17:25:46 +0000 (10:25 -0700)]
Send sim change notification based on sim state change.
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.
Bug:
20739298
Bug:
18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
Maurice Lam [Mon, 1 Jun 2015 17:17:17 +0000 (17:17 +0000)]
Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
Stuart Scott [Mon, 20 Apr 2015 18:05:43 +0000 (11:05 -0700)]
Network Reset should have a lockdown like Factory Reset.
bug:
20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit
176f512c5ad8d8478db88fad4c14ffca52102ade)
Geoff Mendal [Mon, 1 Jun 2015 16:09:54 +0000 (09:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c
Auto-generated-cl: translation import
The Android Automerger [Sun, 31 May 2015 08:03:46 +0000 (01:03 -0700)]
merge in mnc-release history after reset to mnc-dev
Geoff Mendal [Sat, 30 May 2015 22:28:38 +0000 (17:28 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
The Android Automerger [Sat, 30 May 2015 08:06:23 +0000 (01:06 -0700)]
merge in mnc-release history after reset to mnc-dev
Maurice Lam [Mon, 4 May 2015 03:08:43 +0000 (20:08 -0700)]
[WifiSettings] Remove unused Wi-Fi icon
wifi_signal_light was replaced by wifi_signal (which can take any
color via theme attributes). Remove the unused assets.
Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
Maurice Lam [Wed, 20 May 2015 22:16:47 +0000 (15:16 -0700)]
[WifiSetup] Add + icon to Add another network
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.
Bug:
21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
Xiyuan Xia [Sat, 30 May 2015 03:28:49 +0000 (03:28 +0000)]
Merge "Ignore fp error message when not listening" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 23:17:24 +0000 (16:17 -0700)]
Ignore fp error message when not listening
Bug:
21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
Fyodor Kupolov [Fri, 22 May 2015 01:31:45 +0000 (18:31 -0700)]
Hide guest entry if the user is not allowed to create guest
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.
Bug:
19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
Fyodor Kupolov [Fri, 29 May 2015 20:42:55 +0000 (20:42 +0000)]
Merge "Use DimmableIconPreference for Add user action" into mnc-dev