OSDN Git Service
Glenn Kasten [Fri, 15 Aug 2014 21:07:10 +0000 (21:07 +0000)]
am
2be2a8a4: Merge "Increase character limit for translation" into lmp-dev
* commit '
2be2a8a47f5ef585301479268752aa3d7d3a9261':
Increase character limit for translation
arete [Fri, 15 Aug 2014 20:56:44 +0000 (20:56 +0000)]
am
300e920f: Keep SwitchPreference status until user makes choice in confirmation dialog.
* commit '
300e920f66c03b390ce738ccf4d4646ffa039d40':
Keep SwitchPreference status until user makes choice in confirmation dialog.
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 [Fri, 15 Aug 2014 20:45:12 +0000 (20:45 +0000)]
am
e3bced2c: Update Airplane mode to use a SwitchPreference
* commit '
e3bced2cdaf70812f658c45c170e4943ed79dfaf':
Update Airplane mode to use a SwitchPreference
Maurice Lam [Fri, 15 Aug 2014 20:36:35 +0000 (20:36 +0000)]
am
cd93d141: Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev
* commit '
cd93d141302ee374285d5a8dcd97bc7ab61298cc':
[WifiSetup] Use framework AutoMirrored
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
Julia Reynolds [Fri, 15 Aug 2014 20:23:20 +0000 (20:23 +0000)]
am
fad2b09d: Merge "Disable disable button according to user restrictions." into lmp-dev
* commit '
fad2b09db8cf65478db35f9a8265c948ccffeabc':
Disable disable button according to user restrictions.
Julia Reynolds [Fri, 15 Aug 2014 20:17:27 +0000 (20:17 +0000)]
Merge "Disable disable button according to user restrictions." into lmp-dev
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
Fabrice Di Meglio [Fri, 15 Aug 2014 18:46:56 +0000 (18:46 +0000)]
am
0ff107e3: Merge "Fix bug #
16703191 APN settings shows back button even when you intent into it" into lmp-dev
* commit '
0ff107e384a6fe99bfa8a5e542f6e0c89b909d85':
Fix bug #
16703191 APN settings shows back button even when you intent into it
John Spurlock [Fri, 15 Aug 2014 15:16:15 +0000 (15:16 +0000)]
am
a7f8addd: Settings: Update to follow NotificationManager aidl change.
* commit '
a7f8addd0982f599105aeb9611477b149860db83':
Settings: Update to follow NotificationManager aidl change.
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:52:16 +0000 (05:52 +0000)]
am
86370f5d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
86370f5dfd3f78e80b9940c31d73975a46080964':
Import translations. DO NOT MERGE
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
Maurice Lam [Fri, 15 Aug 2014 02:55:34 +0000 (02:55 +0000)]
am
3d8dd19c: Merge "[WifiSetup] Update illustrations" into lmp-dev
* commit '
3d8dd19c85ca94e647245a70df9ca6a9c039b7de':
[WifiSetup] Update illustrations
Jim Miller [Fri, 15 Aug 2014 01:37:29 +0000 (01:37 +0000)]
am
bbce34d9: Merge "API review - move confirm credential constants from Intent" into lmp-dev
* commit '
bbce34d9be421effb055fbf1a945ec49dfeef02d':
API review - move confirm credential constants from Intent
Selim Gurun [Fri, 15 Aug 2014 00:08:38 +0000 (00:08 +0000)]
am
ce8d3910: Remove logic to read the key from GServices
* commit '
ce8d39103f51eb418cad61ee3e0a80445307e46a':
Remove logic to read the key from GServices
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 21:52:22 +0000 (21:52 +0000)]
am
17224826: Cannot cancel in the "Warn app installation" dialog in security settings.
* commit '
17224826f896278de0805e6a2fec321701bbb83d':
Cannot cancel in the "Warn app installation" dialog in security settings.
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
Adam Powell [Thu, 14 Aug 2014 20:29:17 +0000 (20:29 +0000)]
am
aa772c95: Merge "Use material alert dialog item view layout" into lmp-dev
* commit '
aa772c9521529d6235aa7be0fb81e75a334c4b82':
Use material alert dialog item view layout
arete [Thu, 14 Aug 2014 20:24:39 +0000 (20:24 +0000)]
am
ce543836: Change checkboxes to switches in "Settings->Backup&Reset"
* commit '
ce543836cea5887484026837f0a4181dca04a733':
Change checkboxes to switches in "Settings->Backup&Reset"
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 [Thu, 14 Aug 2014 18:08:51 +0000 (18:08 +0000)]
am
d83b3c2a: Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment@
273c8fdb was not registered
* commit '
d83b3c2a39e4716b4a4276b8b8ce0db2b9a62b9e':
Fix bug #
16957601 Stability: ISE in Settings: Observer com.android.settings. SettingsPreferenceFragment$1@
273c8fdb was not registered
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
PauloftheWest [Thu, 14 Aug 2014 15:43:59 +0000 (15:43 +0000)]
am
841f760f: Merge "Fixed a bug were secure Wi-Fi connections would show unsecured." into lmp-dev
* commit '
841f760fd7345ef2d84b9409c27e36c2365a3de4':
Fixed a bug were secure Wi-Fi connections would show unsecured.
Zoltan Szatmary-Ban [Thu, 14 Aug 2014 13:06:08 +0000 (13:06 +0000)]
am
3aaf0eb4: Fix app icons on some Settings screens
* commit '
3aaf0eb457639b52228143b84d9624bf73d862ea':
Fix app icons on some Settings screens
Zoltan Szatmary-Ban [Thu, 14 Aug 2014 09:55:19 +0000 (09:55 +0000)]
am
f8be13d8: Merge "Remove spinner in Settings > VPN" into lmp-dev
* commit '
f8be13d8ca29a61a97411d9d30cb4b82bb669bcf':
Remove spinner in Settings > VPN
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
Amith Yamasani [Wed, 13 Aug 2014 23:32:17 +0000 (23:32 +0000)]
am
e73b8ccf: Merge "Make sure profile owner is system app" into lmp-dev
* commit '
e73b8ccf37470869e8acb00946c95737a44d54d0':
Make sure profile owner is system app
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
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
Glenn Kasten [Wed, 13 Aug 2014 22:56:05 +0000 (22:56 +0000)]
am
f51daced: Merge "Add setting to disable automatic USB audio routing" into lmp-dev
* commit '
f51dacedd8ccbe99584e05320a92adbb8e95abfe':
Add setting to disable automatic USB audio routing
Michael Wright [Wed, 13 Aug 2014 22:41:17 +0000 (22:41 +0000)]
am
bf55863b: Remove indexes for removed hard keyboard options.
* commit '
bf55863b41efc3ad29c752f133f8739aac35d103':
Remove indexes for removed hard keyboard options.
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
Amith Yamasani [Wed, 13 Aug 2014 20:13:13 +0000 (20:13 +0000)]
am
561d6bc9: Merge "Allow creating last user even if a guest exists." into lmp-dev
* commit '
561d6bc9bb3f1473ac67f4bef5edac7b3046a901':
Allow creating last user even if a guest exists.
Paul Lawrence [Wed, 13 Aug 2014 19:55:41 +0000 (19:55 +0000)]
am
d6d0cd53: Merge "Bring up factory reset UI when decryption fails but password is correct" into lmp-dev
* commit '
d6d0cd53d00a84619f3f90761ee3907732fac898':
Bring up factory reset UI when decryption fails but password is correct
Jim Miller [Wed, 13 Aug 2014 19:48:21 +0000 (19:48 +0000)]
am
5a10a8df: Use SwitchPreference in TrustAgentSettings.
* commit '
5a10a8df0efcf034077cbfcd28dd2e495b8d0441':
Use SwitchPreference in TrustAgentSettings.
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:35:10 +0000 (17:35 +0000)]
am
b37ad3d0: Merge "Handle default properly to avoid scary logging." into lmp-dev
* commit '
b37ad3d0e903a602272c8ce6e5c51630b5ca063b':
Handle default properly to avoid scary logging.
PauloftheWest [Wed, 13 Aug 2014 17:16:55 +0000 (17:16 +0000)]
am
d8e08e55: Merge "Changed PBAP\'s default permission from allow to UNKNOWN." into lmp-dev
* commit '
d8e08e55cd6669f5c576b58d8ed7c79ff27c8fa6':
Changed PBAP's default permission from allow to UNKNOWN.
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
PauloftheWest [Wed, 13 Aug 2014 14:46:02 +0000 (14:46 +0000)]
am
e1fd76a8: Merge "Revert "Add BT message access"" into lmp-dev
* commit '
e1fd76a85bf86fe5cd6637d3fdfe6420283395ed':
Revert "Add BT message access"
Dianne Hackborn [Wed, 13 Aug 2014 02:09:14 +0000 (02:09 +0000)]
am
b51253cf: Add action targets for voice input and usage access settings.
* commit '
b51253cfed0796b20e03a104aaca4d8d3e2d3024':
Add action targets for voice input and usage access settings.
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
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
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
PauloftheWest [Wed, 13 Aug 2014 14:43:46 +0000 (14:43 +0000)]
Merge "Revert "Add BT message access"" into lmp-dev
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
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
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
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
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
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
Fabrice Di Meglio [Tue, 12 Aug 2014 22:08:09 +0000 (22:08 +0000)]
am
9dc5f808: Fix bug #
16958103 android.content.res.Resources: String resource ID #0x7f080971
* commit '
9dc5f80874709866500744a48d8cf5d734688aaf':
Fix bug #
16958103 android.content.res.Resources$NotFoundException: String resource ID #0x7f080971
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:25:21 +0000 (20:25 +0000)]
am
aea9ae00: Merge "[WifiSetup] Fix colors during setup" into lmp-dev
* commit '
aea9ae000441940842ba3ec9f93562b684eb9053':
[WifiSetup] Fix colors during setup
PauloftheWest [Tue, 12 Aug 2014 20:25:21 +0000 (20:25 +0000)]
am
cccc5def: Merge "Added WiFi Assistant settings." into lmp-dev
* commit '
cccc5defd61d836af3b4d3dbaa8edb4928f2a031':
Added WiFi Assistant settings.
Maurice Lam [Tue, 12 Aug 2014 20:23:22 +0000 (20:23 +0000)]
Merge "[WifiSetup] Fix colors during setup" into lmp-dev
PauloftheWest [Tue, 12 Aug 2014 18:33:29 +0000 (18:33 +0000)]
am
0cfb3c07: Merge "Revised Bluetooth discoverability string." into lmp-dev
* commit '
0cfb3c079f2bcf3cdfb4d8b54ff856ff0228271e':
Revised Bluetooth discoverability string.
PauloftheWest [Tue, 12 Aug 2014 17:45:00 +0000 (17:45 +0000)]
am
f42a0a27: Refreshing Bluetooth devices will clear all available devices.
* commit '
f42a0a27e3b67602f63ab138e78fdefde81a40b6':
Refreshing Bluetooth devices will clear all available devices.
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
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
Jim Miller [Tue, 12 Aug 2014 00:54:00 +0000 (00:54 +0000)]
am
898671f1: Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev
* commit '
898671f14123695d74bd308450a462d11a341d1a':
Update SecuritySettings to use SwitchPreference
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
Etan Cohen [Tue, 12 Aug 2014 00:00:03 +0000 (00:00 +0000)]
am
19465fa3: Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
* commit '
19465fa3eb8f9a4047f83cf422a77c3b0c2e19f6':
Revert "Radio Information UI for enabling/disabling debug settings of MO over VoLTE"
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.
Fabrice Di Meglio [Mon, 11 Aug 2014 22:35:08 +0000 (22:35 +0000)]
am
26d8c0e9: Merge "Fix bug #
16951566 Switchbar color needs to change to
ff37474f" into lmp-dev
* commit '
26d8c0e99e51025b4dd9b50820ed94033fac4d66':
Fix bug #
16951566 Switchbar color needs to change to
ff37474f
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
Paul Lawrence [Mon, 11 Aug 2014 22:14:14 +0000 (22:14 +0000)]
am
ccf49c02: Merge "Fix UI to mocks" into lmp-dev
* commit '
ccf49c0206d84f5b20a98a8a60278c3e357675eb':
Fix UI to mocks
Jeff Davidson [Mon, 11 Aug 2014 21:36:10 +0000 (21:36 +0000)]
am
581af8cf: Merge "Clean up Wi-Fi Assistant card." into lmp-dev
* commit '
581af8cfeee955cdcc0fbf995d3b462d1b1c6cc6':
Clean up Wi-Fi Assistant card.
Michael Wright [Mon, 11 Aug 2014 20:53:16 +0000 (20:53 +0000)]
am
bb76ee92: Merge "Remove non-functional hardware keyboard options." into lmp-dev
* commit '
bb76ee92bc69a6ccae7c9085e23a45504c2c1217':
Remove non-functional hardware keyboard options.
Michael Wright [Mon, 11 Aug 2014 20:53:15 +0000 (20:53 +0000)]
am
ace6dc4f: Merge "Show physical keyboard settings even when IME is enabled." into lmp-dev
* commit '
ace6dc4f28bf3188c85d48ddebcd7c53d6d14079':
Show physical keyboard settings even when IME is enabled.
PauloftheWest [Mon, 11 Aug 2014 20:20:04 +0000 (20:20 +0000)]
am
242b1e51: Merge "Removed the white icon from Bluetooth rename dialog." into lmp-dev
* commit '
242b1e51d45134f150487f60c3c00027737da05a':
Removed the white icon from Bluetooth rename dialog.
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
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: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
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
Jim Miller [Tue, 12 Aug 2014 00:49:10 +0000 (00:49 +0000)]
Merge "Update SecuritySettings to use SwitchPreference" into lmp-dev