OSDN Git Service
Julia Reynolds [Fri, 15 Aug 2014 20:17:27 +0000 (20:17 +0000)]
Merge "Disable disable button according to user restrictions." 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
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
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
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
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
Paul Lawrence [Fri, 8 Aug 2014 22:56:41 +0000 (22:56 +0000)]
Merge "Strings for next change" into lmp-dev
Paul Lawrence [Fri, 8 Aug 2014 21:27:23 +0000 (14:27 -0700)]
Strings for next change
Next change is titled
Bring up factory reset UI when decryption fails but password is correct
Strings need to go in today to catch translation for L
Bug:
11477689
Change-Id: I84ddc2f88917ba9749fe4dc58fb00d4020cfe685
Adam Lesinski [Fri, 8 Aug 2014 22:36:33 +0000 (22:36 +0000)]
Merge "Update to use new UsageStats API" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 20:58:37 +0000 (20:58 +0000)]
Merge "Fix bug #
16578018 Wi-Fi network list items should be centered with icons" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 20:55:58 +0000 (13:55 -0700)]
Fix bug #
16578018 Wi-Fi network list items should be centered with icons
- force correct refresh of the Preference summary
- put some non used code into comment ...
Change-Id: I17fc6fe2cf0717bae613d78cfac2c88d3e160ef4
Adam Lesinski [Thu, 7 Aug 2014 00:53:38 +0000 (17:53 -0700)]
Update to use new UsageStats API
Change-Id: Ic6f9523c4c70f8b832d8f57551417f4f19ea144f
Fabrice Di Meglio [Fri, 8 Aug 2014 19:58:41 +0000 (19:58 +0000)]
Merge "Fix Wi-Fi Assistant padding" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 19:56:51 +0000 (12:56 -0700)]
Fix Wi-Fi Assistant padding
- use the standard list padding instead of a custom one
See bug: #
15703202 Wi-Fi Assistant card needs to appear in Wi-Fi network list
Change-Id: I5816751bf7937807093e5b74b25b84151431fa7b
Fabrice Di Meglio [Fri, 8 Aug 2014 19:35:06 +0000 (19:35 +0000)]
Merge "Fix bug #
16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots" into lmp-dev
Fabrice Di Meglio [Fri, 8 Aug 2014 19:27:57 +0000 (12:27 -0700)]
Fix bug #
16896118 SIM cards should ONLY appear in search results for devices with 2+ SIM slots
- add the proper SearchIndexProvider to SimSettings
- allow indexing only an only if showSimCardTile() is true
- add Utils.showSimCardTile()
Change-Id: I5df2284d32f91fa454e1edebf1139d00593138a0
Jeff Sharkey [Fri, 8 Aug 2014 17:32:39 +0000 (17:32 +0000)]
Merge "Avoid NPE when template rapidly switched." into lmp-dev
Jeff Sharkey [Fri, 8 Aug 2014 17:25:24 +0000 (10:25 -0700)]
Avoid NPE when template rapidly switched.
Monkeys can race and end up swapping template before the dialog
is shown.
Bug:
16660160
Change-Id: I301784d707ee3998c38cf2874f7016a5c5350825
Dan Sandler [Fri, 8 Aug 2014 12:57:33 +0000 (12:57 +0000)]
Merge "Fully deprecate Power Control widget." into lmp-dev
PauloftheWest [Fri, 8 Aug 2014 17:18:56 +0000 (17:18 +0000)]
Merge "Fixed Bluetooth renaming bug." into lmp-dev
PauloftheWest [Fri, 8 Aug 2014 15:36:26 +0000 (08:36 -0700)]
Fixed Bluetooth renaming bug.
+ After renaming your Bluetooth device, the title of the Bluetooth
Activity stays "Bluetooth" instead of changing to the new name.
+ After renaming the device, the status at the bottom Bluetooth Settings
is correctly displayed.
Bug:
16463239
Change-Id: Ifb12df2004fe1f89bd6f918e23c2c64ae08a0191
Alexandra Gherghina [Fri, 8 Aug 2014 17:17:56 +0000 (17:17 +0000)]
Merge "Open the same tab when switching profiles in apps settings" into lmp-dev
Alexandra Gherghina [Thu, 31 Jul 2014 11:46:15 +0000 (12:46 +0100)]
Open the same tab when switching profiles in apps settings
Bug:
16369104
Change-Id: Ibd23824a120541b17a5255952b7cf02d07b62c7b
Dan Sandler [Thu, 7 Aug 2014 16:59:11 +0000 (12:59 -0400)]
Fully deprecate Power Control widget.
Its behavior is obviated by quick settings and battery
saver, and so should not be shipped on any new builds by
default.
Bug:
8415180
Change-Id: Ic941a1e536c0b37c6be62fed876bfa23e34dc84b
Jim Miller [Thu, 7 Aug 2014 22:25:46 +0000 (22:25 +0000)]
Merge "Don't show TrustAgent entries when no security is enabled." into lmp-dev
Jim Miller [Thu, 31 Jul 2014 22:30:29 +0000 (15:30 -0700)]
Don't show TrustAgent entries when no security is enabled.
Fixes bug
16383666
Change-Id: Ia6c3d7563c384269d1e53ef5e2e07099432c8a13
PauloftheWest [Thu, 7 Aug 2014 21:53:44 +0000 (21:53 +0000)]
Merge "Removed infinite loop in Multi-Sim Settings." into lmp-dev
PauloftheWest [Thu, 7 Aug 2014 17:41:41 +0000 (10:41 -0700)]
Removed infinite loop in Multi-Sim Settings.
Change-Id: I1d5e78abcd9b93d8fb4e1b6c14d73f9d23dce38d
Kenny Guy [Thu, 7 Aug 2014 21:05:48 +0000 (21:05 +0000)]
Merge "Move over to CharSequence version of badging method." into lmp-dev
Kenny Guy [Thu, 7 Aug 2014 21:01:22 +0000 (22:01 +0100)]
Move over to CharSequence version of badging method.
Bug:
16484455
Change-Id: Ie5ee010efc439219cb71fd4241fdb798a5f4ea12
Dianne Hackborn [Thu, 7 Aug 2014 02:22:46 +0000 (19:22 -0700)]
Fix issue #
16555033: Battery history overflowing too much
Use new mechanism to retrieve battery stats, now that they
can be much larger.
Make sure these will ever end up going through an IPC.
Change-Id: Ic582a61d736e24bddc905082c1565ece00fcbb29
PauloftheWest [Sun, 3 Aug 2014 22:17:45 +0000 (15:17 -0700)]
Changed a Bluetooth device's settings from an activity to a dialog.
+ Replace the “Paired bluetooth device” screen with a “Pair device” dialog
+ Add device name text field at the top
+ Replace “Unpair” list item with a “Forget" button at bottom of dialog
+ Change “Profiles” section header to “Use for”
+ Remove status under profile titles
+ Move checkboxes to left side of labels
Bug:
15719219
Change-Id: I3b0e8c82c761fae98f16508b9fd9c58aff651f80
Andres Morales [Thu, 7 Aug 2014 17:33:58 +0000 (17:33 +0000)]
Merge "Don't wipe PST partition if OEM unlock is enabled" into lmp-dev