OSDN Git Service
Paul Lawrence [Tue, 19 Aug 2014 15:55:26 +0000 (08:55 -0700)]
Change decryption strings
Bug:
17062716
Change-Id: Ib7d0ee77a4a2bab1fc44c041382bc819035333f1
Lifu Tang [Tue, 19 Aug 2014 04:24:09 +0000 (04:24 +0000)]
Merge "Set switch to the correct enabling state" into lmp-dev
Lifu Tang [Mon, 18 Aug 2014 23:46:48 +0000 (16:46 -0700)]
Set switch to the correct enabling state
- Fix b/
16951708
Change-Id: I4f9a2a374a771fd353fca436a0d34644f9bc8320
PauloftheWest [Mon, 18 Aug 2014 20:00:36 +0000 (20:00 +0000)]
Merge "Fixed a crash when rotating a saved networks dialog." into lmp-dev
PauloftheWest [Mon, 18 Aug 2014 16:25:03 +0000 (09:25 -0700)]
Fixed a crash when rotating a saved networks dialog.
Bug:
16972819
Change-Id: I83d00df974f8c6692697d59ea71e93f193fa5066
PauloftheWest [Mon, 18 Aug 2014 20:00:11 +0000 (20:00 +0000)]
Merge "Fixed a bug were AdvanceWifiSettings would crash on resume." into lmp-dev
PauloftheWest [Mon, 18 Aug 2014 18:49:09 +0000 (11:49 -0700)]
Fixed a bug were AdvanceWifiSettings would crash on resume.
Bug:
17059286
Change-Id: I9c2b03806a45c739cfb4edf64a1518d60e74cdf5
Alexandra Gherghina [Mon, 18 Aug 2014 16:50:04 +0000 (16:50 +0000)]
Merge "Switch to listening for USER_INITIALIZE broadcast in the Settings app." into lmp-dev
Alexandra Gherghina [Mon, 18 Aug 2014 12:16:17 +0000 (13:16 +0100)]
Switch to listening for USER_INITIALIZE broadcast in the Settings app.
The PRE_BOOT_COMPLETED broadcast is no longer sent when creating a new
profile.
Also, we no longer listen to BOOT_COMPLETED as that adds too much overload.
Bug:
17102460
Change-Id: I05eb56c7a05748e8a91b9717966c20ac586d90ef
Alexandra Gherghina [Mon, 18 Aug 2014 13:34:08 +0000 (14:34 +0100)]
Fix Account Settings crash
Bug:
17020198
Change-Id: I9d4a18381ebb0f57a0e9917c3b7579b0a7feeaf4
Baligh Uddin [Sun, 17 Aug 2014 13:49:40 +0000 (13:49 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Sat, 16 Aug 2014 07:01:16 +0000 (00:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I988fe5d15b0bc0468a637030be9b77c4ca543979
Auto-generated-cl: translation import
Adam Lesinski [Sat, 16 Aug 2014 06:43:23 +0000 (06:43 +0000)]
Merge "Added Warning dialog when enabling usage access for app" into lmp-dev
Adam Lesinski [Tue, 12 Aug 2014 03:54:12 +0000 (20:54 -0700)]
Added Warning dialog when enabling usage access for app
The user is now thoroughly warned about enabling third party
app access to device history.
Change-Id: If8d49a47cae76e06f19cba117d3ec60075966541
Baligh Uddin [Sat, 16 Aug 2014 04:02:06 +0000 (04:02 +0000)]
am
2719eebf: (-s ours) am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
2719eebfc5e7fcfdac417be9a4ae07e25abcaaea':
Import translations. DO NOT MERGE
Christopher Tate [Fri, 15 Aug 2014 16:20:46 +0000 (09:20 -0700)]
Disallow downgrade of bundled home apps
Bug
14162565
Change-Id: I754721178722edbf0765039bc9669ed24b92633c
Baligh Uddin [Fri, 15 Aug 2014 22:36:02 +0000 (22:36 +0000)]
am
b3b64705: (-s ours) Import translations. DO NOT MERGE
* commit '
b3b647054e8610a29536ccee7be3aa2483e16431':
Import translations. DO NOT MERGE
Jim Miller [Fri, 15 Aug 2014 21:36:38 +0000 (21:36 +0000)]
Merge "Remove temporary workaround for GMS TrustAgent while API changed." into lmp-dev
Jim Miller [Fri, 15 Aug 2014 21:28:58 +0000 (14:28 -0700)]
Remove temporary workaround for GMS TrustAgent while API changed.
Fixes bug
16401527
Change-Id: I2e892664ecbdd1cd893f521f2181bc6840ba027e
Fabrice Di Meglio [Fri, 15 Aug 2014 21:14:17 +0000 (14:14 -0700)]
Update NFC to use a SwitchPreference
- do the switch
See bug: #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I78ab5b86fe6b541f9f3dc3d77115fde656d40c80
Baligh Uddin [Fri, 15 Aug 2014 21:21:56 +0000 (14:21 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33188a7df715a4accf49444b4e182a64a94aa880
Auto-generated-cl: translation import
arete [Fri, 15 Aug 2014 19:04:48 +0000 (12:04 -0700)]
Keep SwitchPreference status until user makes choice in confirmation dialog.
Bug:
17062433
Change-Id: I2c52be1921e1eefa3b2b2868cc526675c9215a41
Fabrice Di Meglio [Wed, 6 Aug 2014 17:22:52 +0000 (10:22 -0700)]
Update Airplane mode to use a SwitchPreference
- do the switch
See bug: #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Change-Id: I7addc48a90d74c105b2f0275ae80874b9324f589
Glenn Kasten [Fri, 15 Aug 2014 21:01:17 +0000 (21:01 +0000)]
Merge "Increase character limit for translation" into lmp-dev
Glenn Kasten [Fri, 15 Aug 2014 20:24:45 +0000 (13:24 -0700)]
Increase character limit for translation
Bug:
17033153
Change-Id: Iac0b695cee1ee7dd6c66898b8c5bf68cff5efa75
Maurice Lam [Fri, 15 Aug 2014 20:29:32 +0000 (20:29 +0000)]
Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
Maurice Lam [Fri, 15 Aug 2014 19:04:12 +0000 (12:04 -0700)]
[WifiSetup] Use framework AutoMirrored
Use framework autoMirrored and override onResolveDrawables to
propagate the layout direction to the drawables.
Bug:
17047609
Change-Id: Ic4a764510e3a89c897d4e243f8fa2a690ac71899
Julia Reynolds [Fri, 15 Aug 2014 20:17:27 +0000 (20:17 +0000)]
Merge "Disable disable button according to user restrictions." into lmp-dev
John Spurlock [Thu, 14 Aug 2014 17:03:13 +0000 (13:03 -0400)]
Settings: Update to follow NotificationManager aidl change.
Depends on frameworks/base:
I1d8269a4e6fe170ce776bf932dbbdfb29dd25dd7
Change-Id: I4015b60d84541a1f3d9e9c506ab8f44f1d18f71f
Baligh Uddin [Fri, 15 Aug 2014 05:48:03 +0000 (05:48 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Fabrice Di Meglio [Fri, 15 Aug 2014 18:37:33 +0000 (18:37 +0000)]
Merge "Fix bug #
16703191 APN settings shows back button even when you intent into it" into lmp-dev
Fabrice Di Meglio [Wed, 13 Aug 2014 23:22:38 +0000 (16:22 -0700)]
Fix bug #
16703191 APN settings shows back button even when you intent into it
- change a bit the way we recognize a SubSetting. Now we can pass the new
":settings:show_fragment_as_subsetting" Intent extra for forcing it.
- convert ApnSettings to a SettingsPreferenceFragment
Change-Id: I22167ad317530c0a58c4d522a72826f9d34ad2d3
Fabrice Di Meglio [Wed, 13 Aug 2014 17:45:19 +0000 (10:45 -0700)]
Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings.
SettingsPreferenceFragment$1@
273c8fdb was not registered
- add override for onUnbindPreferences() that will unregister the observer
if needed
- keep track of the root adapter so that we can unregister / register with
the correct one (by having a new PreferenceScreen the root adapter would not
be the same and thus unregistering the Observer on the new one would not work
and create the current bug)
Change-Id: I2cef0398c2ae0ab4f5ffd67ca20e8874be997bf6
Julia Reynolds [Fri, 8 Aug 2014 16:22:42 +0000 (12:22 -0400)]
Disable disable button according to user restrictions.
Bug:
16891777
Change-Id: I5223af905dc43d259c5fd3e03eedf8c71bf23ae9
Maurice Lam [Fri, 15 Aug 2014 02:46:37 +0000 (02:46 +0000)]
Merge "[WifiSetup] Update illustrations" into lmp-dev
Maurice Lam [Wed, 13 Aug 2014 22:52:15 +0000 (15:52 -0700)]
[WifiSetup] Update illustrations
Update illustration assets and support for auto-mirroring for RTL
languages.
Bug:
16888091
Change-Id: I828a13558aff42f2ddb12b9afe123f463c4c1522
Jim Miller [Fri, 15 Aug 2014 01:01:50 +0000 (01:01 +0000)]
Merge "API review - move confirm credential constants from Intent" into lmp-dev
Selim Gurun [Thu, 14 Aug 2014 22:19:15 +0000 (15:19 -0700)]
Remove logic to read the key from GServices
Bug:
12492817
The key is now stored in webview apk so remove the logic
to read from GServices.
Change-Id: I9f9b57d59885d93023be307a80d5a7db143ffbfe
arete [Thu, 14 Aug 2014 20:45:36 +0000 (13:45 -0700)]
Cannot cancel in the "Warn app installation" dialog in security settings.
Bug:
16900059
Change-Id: Ie4e335b000350632bffc5740939b46b21357e298
Jim Miller [Wed, 13 Aug 2014 21:52:52 +0000 (14:52 -0700)]
API review - move confirm credential constants from Intent
Moves constants from Intent to KeyguardManager.
Fixes bug
17006280
Change-Id: I8ee1f534816a3fe823ad44479e227ba6d3675389
Dianne Hackborn [Tue, 12 Aug 2014 22:08:04 +0000 (15:08 -0700)]
Add action targets for voice input and usage access settings.
Change-Id: I5ea0b34ed440b2cfdce0c63e2c4976c89202eb64
PauloftheWest [Thu, 14 Aug 2014 15:39:57 +0000 (15:39 +0000)]
Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev
Zoltan Szatmary-Ban [Thu, 7 Aug 2014 13:02:41 +0000 (14:02 +0100)]
Fix app icons on some Settings screens
App icons appeared as the default icon and sometimes without the corp badge on
Data Usage and Battery screens for applications that were only installed for
the managed profile. This CL fixes the issue.
Bug:
16705204
Change-Id: I778d36554feb19f28f3cb9321a291cab3d3e17bb
PauloftheWest [Tue, 12 Aug 2014 20:05:33 +0000 (13:05 -0700)]
Fixed a bug were secure Wi-Fi connections would show unsecured.
- Also removed secure summary code as the UX teams has determined it is
superfluous.
Bug:
16297100
Change-Id: Ib02bc2c0433f5354a8f8cf01f4d8785762a762ad
Zoltan Szatmary-Ban [Thu, 14 Aug 2014 09:50:31 +0000 (09:50 +0000)]
Merge "Remove spinner in Settings > VPN" into lmp-dev
Zoltan Szatmary-Ban [Wed, 13 Aug 2014 10:11:42 +0000 (11:11 +0100)]
Remove spinner in Settings > VPN
This CL reverses an earlier change https://googleplex-android-review.git.corp.google.com/#/c/515209
Bug:
16030111
Change-Id: I981bd8a5ab03c56b78f38c6016277aa15548adba
Adam Powell [Thu, 14 Aug 2014 20:23:39 +0000 (20:23 +0000)]
Merge "Use material alert dialog item view layout" into lmp-dev
Adam Powell [Tue, 12 Aug 2014 01:28:56 +0000 (18:28 -0700)]
Use material alert dialog item view layout
Bug
16552638
Change-Id: I6d0d5c2c3d8cc7064828d223134b020a3a0ca828
arete [Tue, 12 Aug 2014 23:33:52 +0000 (16:33 -0700)]
Change checkboxes to switches in "Settings->Backup&Reset"
Change-Id: I92b5d0051b717c66bc456a0864c3068b13112dd3
Bug:
16982604
Amith Yamasani [Wed, 13 Aug 2014 23:27:30 +0000 (23:27 +0000)]
Merge "Make sure profile owner is system app" into lmp-dev
Amith Yamasani [Wed, 13 Aug 2014 18:11:44 +0000 (11:11 -0700)]
Make sure profile owner is system app
For cases where an app wants to become the profile owner after
setup has completed, make sure that it is a system app.
Bug:
17004847
Change-Id: I88249f1ce3bf841ca4d87f33acfd07a7db906332
Amith Yamasani [Wed, 13 Aug 2014 20:10:14 +0000 (20:10 +0000)]
Merge "Allow creating last user even if a guest exists." into lmp-dev
Paul Lawrence [Wed, 13 Aug 2014 19:47:52 +0000 (19:47 +0000)]
Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
Jim Miller [Sat, 9 Aug 2014 01:30:20 +0000 (18:30 -0700)]
Use SwitchPreference in TrustAgentSettings.
Fixes bug
16900059
Change-Id: I52dcfd2a2651f8f770477df3c72176303a9d1b39
Jason Monk [Wed, 13 Aug 2014 17:32:31 +0000 (17:32 +0000)]
Merge "Handle default properly to avoid scary logging." into lmp-dev
Jason Monk [Wed, 13 Aug 2014 13:43:58 +0000 (09:43 -0400)]
Handle default properly to avoid scary logging.
Lock-to-app enabled should default to false and not bother logging
about it not being set yet.
Bug:
16958525
Change-Id: If0d595107d4d40a62ac5d2cc461a8aa18ff80e19
Glenn Kasten [Wed, 13 Aug 2014 22:52:06 +0000 (22:52 +0000)]
Merge "Add setting to disable automatic USB audio routing" into lmp-dev
Michael Wright [Tue, 12 Aug 2014 01:39:23 +0000 (18:39 -0700)]
Remove indexes for removed hard keyboard options.
Bug:
16027438
Change-Id: If668024e3b7073b49142de7e9aae4a46b4969d40
Glenn Kasten [Tue, 22 Jul 2014 16:14:08 +0000 (09:14 -0700)]
Add setting to disable automatic USB audio routing
Bug:
16381952
Change-Id: I7335ed4c3ec8d5f9cb9a9bd2a9d2f9e0f3a63c43
PauloftheWest [Wed, 13 Aug 2014 17:12:35 +0000 (17:12 +0000)]
Merge "Changed PBAP's default permission from allow to UNKNOWN." into lmp-dev
PauloftheWest [Wed, 13 Aug 2014 14:43:46 +0000 (14:43 +0000)]
Merge "Revert "Add BT message access"" into lmp-dev
Fabrice Di Meglio [Tue, 12 Aug 2014 21:57:29 +0000 (14:57 -0700)]
Fix bug #
16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
- remove the indexing offending part from InputMethodAndLanguageSettings as the strings
has been changed
- add indexing for VoiceInputSettings
Change-Id: Ib8da55c935e00538ad6fff2f2590b0d525140734
PauloftheWest [Tue, 12 Aug 2014 21:44:53 +0000 (14:44 -0700)]
Changed PBAP's default permission from allow to UNKNOWN.
Bug:
16956658
Change-Id: Ib08bb873a22b8f6b3fb25172aa8612a132257d66
PauloftheWest [Tue, 12 Aug 2014 21:03:39 +0000 (14:03 -0700)]
Revert "Add BT message access"
- removed Message Access screen from Bluetooth overflow
Bug:
15720425
Change-Id: I68191a4639ea7e6b6cd3a60e88160443fab2ba0e
Maurice Lam [Tue, 12 Aug 2014 20:23:22 +0000 (20:23 +0000)]
Merge "[WifiSetup] Fix colors during setup" into lmp-dev
Baligh Uddin [Tue, 12 Aug 2014 04:11:12 +0000 (21:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0470d9e27435942ef7b8712baadb1eb728641eec
Auto-generated-cl: translation import
Maurice Lam [Sun, 10 Aug 2014 23:22:59 +0000 (16:22 -0700)]
[WifiSetup] Fix colors during setup
Fixed background color for dark theme, Wi-Fi icon color for light
and dark themes, "Add another network" button color for light and
dark themes. Created wifi_signal_colored which uses wifi_signal_color
to tint the Wi-Fi icon.
Also fixed theme extra propagation.
Bug:
16903606
Change-Id: Iab24828f888d7827184762d0d63d139d0a2c381e
Amith Yamasani [Tue, 12 Aug 2014 00:17:29 +0000 (17:17 -0700)]
Allow creating last user even if a guest exists.
Bug:
15934700
Also fix missing icon when user has no icon.
Change-Id: I07c76043df9cda8aeccecb09289d570845dc4560
Paul Lawrence [Fri, 8 Aug 2014 22:11:36 +0000 (15:11 -0700)]
Bring up factory reset UI when decryption fails but password is correct
Needs string change
Bug:
11477689
Change-Id: I1dcca59483bff32a939b8a7d052eafebd8a1eef0
Michael Wright [Mon, 11 Aug 2014 20:47:39 +0000 (20:47 +0000)]
Merge "Remove non-functional hardware keyboard options." into lmp-dev
Michael Wright [Sun, 10 Aug 2014 03:41:33 +0000 (20:41 -0700)]
Remove non-functional hardware keyboard options.
Bug:
16027438
Bug:
16486654
Change-Id: Ia53d5d98c05586bbbd232519d8094706877ecaaf
Michael Wright [Sun, 10 Aug 2014 03:35:11 +0000 (20:35 -0700)]
Show physical keyboard settings even when IME is enabled.
The WindowManager lies about the configuration in order to get the
IME to show but the Settings page should still show the physical
keyboard options if one is connected though, so remove the
configuration check and just always check to see if there's a full
keyboard connected.
Bug:
14066881
Change-Id: I085fe4160f3524f3c95737a6809ee03fec5230b4
Michael Wright [Mon, 11 Aug 2014 20:47:19 +0000 (20:47 +0000)]
Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
Jim Miller [Tue, 12 Aug 2014 00:49:10 +0000 (00:49 +0000)]
Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
Etan Cohen [Mon, 11 Aug 2014 20:30:14 +0000 (13:30 -0700)]
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
Superseded by "Enhanced 4G LTE Mode" official setting.
This reverts commit
572d25398297049a4da3042d58b1ccecf3514e4d.
Jim Miller [Fri, 8 Aug 2014 22:25:31 +0000 (15:25 -0700)]
Update SecuritySettings to use SwitchPreference
Fixes bug
16900059
Change-Id: Ic3d498c3c4da32f1ba75559073957bb1087912f1
Fabrice Di Meglio [Mon, 11 Aug 2014 22:32:10 +0000 (22:32 +0000)]
Merge "Fix bug #
16951566 Switchbar color needs to change to
ff37474f" into lmp-dev
Fabrice Di Meglio [Mon, 11 Aug 2014 19:11:53 +0000 (12:11 -0700)]
Fix bug #
16951566 Switchbar color needs to change to
ff37474f
- change the SwitchBar color as requested by UX
Change-Id: I3ca81e8ac0276fa9aab205f0045cd8b14855ddf7
Paul Lawrence [Mon, 11 Aug 2014 22:10:46 +0000 (22:10 +0000)]
Merge "Fix UI to mocks" into lmp-dev
Paul Lawrence [Mon, 11 Aug 2014 21:05:33 +0000 (14:05 -0700)]
Fix UI to mocks
Bug:
16034329
Change-Id: I6746baeee3f49ad1df2524d690c870f49afedb48
PauloftheWest [Mon, 11 Aug 2014 20:06:58 +0000 (20:06 +0000)]
Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
PauloftheWest [Mon, 11 Aug 2014 18:49:31 +0000 (11:49 -0700)]
Removed the white icon from Bluetooth rename dialog.
Bug:
15538917
Change-Id: I4e3bca9e8ff6c348af22cdfb17ee3b047ae12d2c
PauloftheWest [Tue, 12 Aug 2014 20:20:18 +0000 (20:20 +0000)]
Merge "Added WiFi Assistant settings." into lmp-dev
PauloftheWest [Sun, 3 Aug 2014 18:34:45 +0000 (11:34 -0700)]
Added WiFi Assistant settings.
+ Added ability to setup Wifi Assistant.
- Removed 'Avoid poor connections' from WiFi Advance Settings.
- Removed 'Optimize Wi-Fi' from WiFi Advance Settings.
+ Replaced checkboxes with switches in WifFI Advance Settings.
+ Added horizontal rule to seperate MAC/IP address text.
Bug:
15698824
Change-Id: Ia319ff5fb2566854666a07d0e77c8816a49fd3d6
Jeff Davidson [Mon, 11 Aug 2014 21:30:18 +0000 (21:30 +0000)]
Merge "Clean up Wi-Fi Assistant card." into lmp-dev
Jeff Davidson [Sat, 9 Aug 2014 00:42:12 +0000 (17:42 -0700)]
Clean up Wi-Fi Assistant card.
Use a ListView header instead of a Preference to display the card at
the top of the list.
Also clean some dead code.
Bug:
16378017
Change-Id: I5a7f1d197cde071c45395b6d7f6016aa7201187a
PauloftheWest [Tue, 12 Aug 2014 18:29:37 +0000 (18:29 +0000)]
Merge "Revised Bluetooth discoverability string." into lmp-dev
PauloftheWest [Tue, 12 Aug 2014 13:23:07 +0000 (06:23 -0700)]
Revised Bluetooth discoverability string.
Bug:
16882911
Change-Id: I89ec10c42747079e9714ae618294d06997059159
PauloftheWest [Mon, 11 Aug 2014 13:18:32 +0000 (06:18 -0700)]
Refreshing Bluetooth devices will clear all available devices.
Bug:
16851309
Change-Id: I9ffb1ddaeb8e785be145ea79467fc361a022d8d7
Jason Monk [Mon, 11 Aug 2014 17:13:47 +0000 (17:13 +0000)]
Merge "Don't allow creating guest when can't create user" into lmp-dev
Dianne Hackborn [Mon, 11 Aug 2014 17:08:16 +0000 (17:08 +0000)]
Merge "Fix issues in Settings:
16660423,
13172381,
16868094" into lmp-dev
Jason Monk [Thu, 7 Aug 2014 20:02:03 +0000 (16:02 -0400)]
Don't allow creating guest when can't create user
When user restriction is on to disable adding user also stop the
user from creating guests.
Bug:
16782635
Change-Id: I0396172867e2e217ada9ef747ea62d0c0382c5dd
Dianne Hackborn [Sun, 10 Aug 2014 23:32:08 +0000 (16:32 -0700)]
Fix issues in Settings:
16660423,
13172381,
16868094
Issue #
16660423: Stability: ArrayIndexOutOfBoundsException in settings:
at com.android.settings.fuelgauge.BatteryHistoryChart$ChartData.draw(
BatteryHistoryChart.java:109)
Issue #
13172381: No content description in Battery charging section
Issue #
16868094: Settings crash on switching to landscape mode with
"Google Text-to-speech" settings icon selected
Change-Id: I94d0e83f72d571eb90aad6742acabce56c0298ec
Barnaby James [Sat, 9 Aug 2014 04:01:01 +0000 (21:01 -0700)]
Add voice-only settings activities for airplane mode.
This activity can only be triggered through the Voice Interaction API - e.g. from calling VoiceInterationSession.startVoiceActivity()
Change-Id: I39ac409824693bc82e53d707a1ece2b23a89f3a3
Zoltan Szatmary-Ban [Mon, 11 Aug 2014 12:10:46 +0000 (12:10 +0000)]
Merge "Increase CHAR_LIMIT on Device Admins Settings message" into lmp-dev
Zoltan Szatmary-Ban [Mon, 11 Aug 2014 10:50:39 +0000 (11:50 +0100)]
Increase CHAR_LIMIT on Device Admins Settings message
Increased CHAR_LIMIT to 120 on @string/managed_profile_device_admin_info to
accomodate translation.
Bug:
16838113
Change-Id: I111ed73d6ff546387c4a2b5df5f4edf8a3932be7
Alexandra Gherghina [Mon, 11 Aug 2014 09:26:51 +0000 (09:26 +0000)]
Merge "Show managed profile under accounts rather than users" into lmp-dev
Alexandra Gherghina [Thu, 31 Jul 2014 18:30:41 +0000 (19:30 +0100)]
Show managed profile under accounts rather than users
Also fixes overflow menu to update on remove/add managed profile.
Bug:
16234745
Bug:
16727076
Change-Id: I3283a8fa0096edfce5aad633e09ba3eed6d2174c
Alexandra Gherghina [Mon, 11 Aug 2014 08:54:29 +0000 (08:54 +0000)]
Merge "Fix updating view flow of Account Sync Settings" into lmp-dev
Alexandra Gherghina [Fri, 8 Aug 2014 17:14:32 +0000 (18:14 +0100)]
Fix updating view flow of Account Sync Settings
Bug:
16785070 Account sync settings page doesn't refresh after removing account
Change-Id: Iddbe9d73f4d6fcb55829f8bb6ab2fe6ffa147cf3