OSDN Git Service
Robin Lee [Fri, 14 Nov 2014 11:28:43 +0000 (11:28 +0000)]
am
e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev
* commit '
e464d9b9ee133d366bec1b6c879889572c9996d8':
Forward wifi cert install intents to primary user
Robin Lee [Fri, 14 Nov 2014 11:26:38 +0000 (11:26 +0000)]
Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev
PauloftheWest [Thu, 13 Nov 2014 15:08:03 +0000 (15:08 +0000)]
am
26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
* commit '
26104298eb53d2dfa693eec32934f9ac0aa3d525':
Adding Sim Status menu to Settings.
PauloftheWest [Thu, 13 Nov 2014 13:57:08 +0000 (13:57 +0000)]
Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev
Robin Lee [Thu, 6 Nov 2014 20:57:11 +0000 (20:57 +0000)]
Forward wifi cert install intents to primary user
Wifi certificates need to be installed on behalf of UID 1010 which
belongs to user 0, even if the installer is another user. This
requires a cross-profile switch before performing the install.
Bug:
17605542
Change-Id: Ib3dfb4c280f1686d29005c7a044bf80dc00e963a
Geoff Mendal [Wed, 12 Nov 2014 23:41:23 +0000 (23:41 +0000)]
am
c5079a06: (-s ours) am
827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
c5079a06dc2f57718cd781ae855b687a14cc1c2f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Nov 2014 23:34:27 +0000 (23:34 +0000)]
am
827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
827ad0c38c76b932237fc22ecfcb35bff8de148f':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Nov 2014 23:30:09 +0000 (23:30 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
PauloftheWest [Mon, 10 Nov 2014 16:07:39 +0000 (08:07 -0800)]
Adding Sim Status menu to Settings.
+ Added tabs for Multi-SIM devices.
+ Most of the code was taken from MediaTek
(https://partner-android-review.googlesource.com/#/c/181417)
Bug:
18195254
Change-Id: If6f7d5cfa4d41adb52dfc1bd035b4ff79d926bd8
Geoff Mendal [Wed, 12 Nov 2014 22:48:49 +0000 (14:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I99007a120d90a442a65f31ab35b8da3d1aa8524e
Auto-generated-cl: translation import
Sanket Padawe [Wed, 12 Nov 2014 22:46:03 +0000 (22:46 +0000)]
am
6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev
* commit '
6416bec01de67492ac761ba84c8b86c59e4dee28':
UI changes for icons in sim settings
Geoff Mendal [Wed, 12 Nov 2014 22:45:59 +0000 (22:45 +0000)]
am
fbce961b: (-s ours) am
9ae3bf2d: (-s ours) Import translations. DO NOT MERGE
* commit '
fbce961b80d731e6eb473de4c1ae5e683bed5566':
Import translations. DO NOT MERGE
Sanket Padawe [Wed, 12 Nov 2014 22:08:52 +0000 (22:08 +0000)]
Merge "UI changes for icons in sim settings" into lmp-mr1-dev
Geoff Mendal [Wed, 12 Nov 2014 22:04:57 +0000 (22:04 +0000)]
am
9ae3bf2d: (-s ours) Import translations. DO NOT MERGE
* commit '
9ae3bf2d3fca27966328e68263880080a1bdd79e':
Import translations. DO NOT MERGE
Sanket Padawe [Wed, 12 Nov 2014 20:41:35 +0000 (12:41 -0800)]
UI changes for icons in sim settings
+ UI changes relate to displaying sim icons in sim settings
+ Correcting way to display phone number inside sim settings dialog
Bug:
18356419
Change-Id: I1fe025fac52f20b607d4492b99cfef9588ec9416
Geoff Mendal [Wed, 12 Nov 2014 20:07:20 +0000 (12:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8170fefa7733e2feddad643069cc0407631a2b96
Auto-generated-cl: translation import
Geoff Mendal [Wed, 12 Nov 2014 18:23:10 +0000 (18:23 +0000)]
am
cdbba048: (-s ours) Import translations. DO NOT MERGE
* commit '
cdbba0489bec3a889c457312183ab9ab855cfc51':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 12 Nov 2014 17:53:14 +0000 (09:53 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id80c19a2c80275ea0c63e12d23761e5bed47f0b8
Auto-generated-cl: translation import
Geoff Mendal [Wed, 12 Nov 2014 17:48:33 +0000 (09:48 -0800)]
Import translations. DO NOT MERGE
Change-Id: I628e96983ed2224fb17081a509a7de379b89b88b
Auto-generated-cl: translation import
vandwalle [Wed, 12 Nov 2014 02:25:43 +0000 (02:25 +0000)]
Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev
automerge:
53ad50b
* commit '
53ad50b05bd95157c1b0bcefe321b2a561dc2696':
dont blacklist wifi config that have had validated internet status in the past
Wink Saville [Wed, 12 Nov 2014 02:24:06 +0000 (02:24 +0000)]
Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
automerge:
588611e
* commit '
588611eea55ee3ef617d17ea89c16174935a6a1a':
Update SubscriptionManager API as per API council.
vandwalle [Wed, 12 Nov 2014 01:18:37 +0000 (01:18 +0000)]
Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev
Amith Yamasani [Wed, 12 Nov 2014 01:13:42 +0000 (01:13 +0000)]
Fix a regression in enabling unknown sources toggle
automerge:
ceceb2a
* commit '
ceceb2ab07aab457a4229d051de222ad88ed62a1':
Fix a regression in enabling unknown sources toggle
Wink Saville [Wed, 12 Nov 2014 01:13:26 +0000 (01:13 +0000)]
Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev
Amith Yamasani [Tue, 11 Nov 2014 23:36:15 +0000 (15:36 -0800)]
Fix a regression in enabling unknown sources toggle
In Security Settings, allow unknown sources to be
toggled for primary and secondary users unless it
is a restricted profile or there is a device policy
restriction to disallow installing apps or installing
from unknown sources.
Bug:
18277370
Change-Id: I9f0b6cd603c4c8deb77d36af1b82cace43ba195f
Alexandra Gherghina [Tue, 11 Nov 2014 22:48:25 +0000 (22:48 +0000)]
am
aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev
* commit '
aa762831729e7c91c10184f11b978bd501b94e71':
Reorganize sync state menu options for accounts settings
Alexandra Gherghina [Tue, 11 Nov 2014 22:27:45 +0000 (22:27 +0000)]
Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev
John Spurlock [Tue, 11 Nov 2014 18:18:20 +0000 (18:18 +0000)]
am
0193911e: Settings: Tweak doze settings description.
* commit '
0193911ea5a81e772a3d07e62af768559c36f1d5':
Settings: Tweak doze settings description.
John Spurlock [Tue, 11 Nov 2014 18:07:09 +0000 (13:07 -0500)]
Settings: Tweak doze settings description.
Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759
Wink Saville [Sat, 8 Nov 2014 18:47:12 +0000 (10:47 -0800)]
Update SubscriptionManager API as per API council.
bug:
17575308
Change-Id: Ib39a60e4f75981a466e9d606ec627756efad018d
Alexandra Gherghina [Tue, 11 Nov 2014 11:47:54 +0000 (11:47 +0000)]
Reorganize sync state menu options for accounts settings
Fixes inverted condition for displaying the buttons, updates
at the right time and removes the useless dependence on mFirstAccount
Bug:
18310988
Change-Id: Id55e11a210aa58a10ee9613891470862d42b65ad
John Spurlock [Tue, 11 Nov 2014 02:33:20 +0000 (02:33 +0000)]
Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev
automerge:
64cb79b
* commit '
64cb79bb6982ebe2907daed761d829dea4fef081':
Settings: Update preference summary per new downtime behavior.
John Spurlock [Tue, 11 Nov 2014 02:22:18 +0000 (02:22 +0000)]
Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev
Fabrice Di Meglio [Tue, 11 Nov 2014 00:52:49 +0000 (00:52 +0000)]
am
ded5a85a: Merge "Fix bug #
18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev
* commit '
ded5a85aad2262d71fead6533901eee96abf9378':
Fix bug #
18104271 Tapping *name* of service in Voice input services does not fill in radio button
Fabrice Di Meglio [Tue, 11 Nov 2014 00:48:18 +0000 (00:48 +0000)]
Merge "Fix bug #
18104271 Tapping *name* of service in Voice input services does not fill in radio button" into lmp-mr1-dev
Geoff Mendal [Tue, 11 Nov 2014 00:47:47 +0000 (00:47 +0000)]
am
61fe962f: (-s ours) am
cafcb70a: (-s ours) Import translations. DO NOT MERGE
* commit '
61fe962f9072dffd6ebbe9be2870b55ddd9617c5':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 11 Nov 2014 00:37:35 +0000 (00:37 +0000)]
am
cafcb70a: (-s ours) Import translations. DO NOT MERGE
* commit '
cafcb70a685d00c7cbbbfe477e1dad0f2fd980e6':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Tue, 11 Nov 2014 00:35:06 +0000 (16:35 -0800)]
Fix bug #
18104271 Tapping *name* of service in Voice input services does not fill in radio button
- prevent sending onRadioButtonClicked() if the radio button is already checked
- check the new current radio button
Change-Id: I7e4457bcba6eb1abf51fbe3902bc0f6df0f4bdcf
Geoff Mendal [Tue, 11 Nov 2014 00:17:41 +0000 (00:17 +0000)]
am
14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
14343ad9b81797b5b7c04373329e2a3de87bac12':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 11 Nov 2014 00:14:37 +0000 (00:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Tue, 11 Nov 2014 00:12:26 +0000 (00:12 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 10 Nov 2014 22:21:23 +0000 (14:21 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6d7b0e7986c8ea87e557cda85144a3501f86fc29
Auto-generated-cl: translation import
Geoff Mendal [Mon, 10 Nov 2014 22:17:52 +0000 (14:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I239d9e96f7a88bb558ec2f14955ae98af32fab23
Auto-generated-cl: translation import
Geoff Mendal [Mon, 10 Nov 2014 22:12:28 +0000 (14:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I89de05dbac32f4acf541a4a2d6cb3225652fd39b
Auto-generated-cl: translation import
John Spurlock [Mon, 10 Nov 2014 19:49:10 +0000 (14:49 -0500)]
Settings: Update preference summary per new downtime behavior.
Bug:
16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
Jeff Davidson [Mon, 10 Nov 2014 17:40:09 +0000 (17:40 +0000)]
am
76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev
* commit '
76f0133831693c9a932b8fb336401303fbadfc66':
Don't allow secondary users to change Wi-Fi assistants.
Jeff Davidson [Mon, 10 Nov 2014 17:35:28 +0000 (17:35 +0000)]
Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev
Alexandra Gherghina [Mon, 10 Nov 2014 10:19:12 +0000 (10:19 +0000)]
am
095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev
* commit '
095521b2874b38d2de0d9dd5e4a1a70e628c58bb':
Update sync state immediately after accounts are shown
Alexandra Gherghina [Mon, 10 Nov 2014 10:12:58 +0000 (10:12 +0000)]
Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev
Paul Crowley [Sat, 8 Nov 2014 03:36:30 +0000 (03:36 +0000)]
Prevent factory reset for short passwords in CryptKeeper
automerge:
2555e5f
* commit '
2555e5f1040984a3422c5a4db43421e87d4ca0ce':
Prevent factory reset for short passwords in CryptKeeper
vandwalle [Sat, 8 Nov 2014 01:29:38 +0000 (17:29 -0800)]
dont blacklist wifi config that have had validated internet status in the past
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
Paul Crowley [Sat, 8 Nov 2014 02:27:33 +0000 (02:27 +0000)]
Merge "Use the right message for pattern/password." into lmp-mr1-dev
automerge:
c44ad35
* commit '
c44ad35e51db79721821817e1b8e52dce632d2bf':
Use the right message for pattern/password.
Paul Crowley [Fri, 7 Nov 2014 08:52:57 +0000 (00:52 -0800)]
Prevent factory reset for short passwords in CryptKeeper
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device. If we do, we risk resetting the device
due to stray input.
Bug:
18211475
Bug:
18273380
Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57
Conflicts:
src/com/android/settings/CryptKeeper.java
Paul Crowley [Sat, 8 Nov 2014 01:13:10 +0000 (01:13 +0000)]
Merge "Use the right message for pattern/password." into lmp-mr1-dev
Stuart Scott [Sat, 8 Nov 2014 00:15:54 +0000 (00:15 +0000)]
am
ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev
* commit '
ab82c090d1f4549a256d4550b71c540b216e0a65':
Update SubInfoRecord usage
Stuart Scott [Sat, 8 Nov 2014 00:09:20 +0000 (00:09 +0000)]
Merge "Update SubInfoRecord usage" into lmp-mr1-dev
Paul Crowley [Fri, 7 Nov 2014 23:39:43 +0000 (23:39 +0000)]
Use the right message for pattern/password.
Bug:
17875087
Change-Id: I7729a4fcb993def912e950ad0ea59fd64bfc34d3
Stuart Scott [Wed, 5 Nov 2014 22:47:08 +0000 (14:47 -0800)]
Update SubInfoRecord usage
bug:
17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
Fabrice Di Meglio [Fri, 7 Nov 2014 23:12:30 +0000 (23:12 +0000)]
am
d9966523: Merge "Fix bug #
18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev
* commit '
d9966523f0c5dc3c3a68c5e0ecfb1a0b1f2bca70':
Fix bug #
18289076 Storage graph colors don't match Material design spec
Fabrice Di Meglio [Fri, 7 Nov 2014 23:07:04 +0000 (23:07 +0000)]
Merge "Fix bug #
18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev
Fabrice Di Meglio [Fri, 7 Nov 2014 22:46:20 +0000 (14:46 -0800)]
Fix bug #
18289076 Storage graph colors don't match Material design spec
- update colors per UX request for matching Material Design colors spec
Change-Id: Ibee52ee0edef2d678d86e3960cd7ff058476a25e
PauloftheWest [Fri, 7 Nov 2014 22:36:01 +0000 (22:36 +0000)]
am
5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
* commit '
5aafdda85ccfb0e3ad46a7ab0bac592893bddde8':
Migrated search for SubInfoRecord to Utils.
PauloftheWest [Fri, 7 Nov 2014 22:28:46 +0000 (22:28 +0000)]
Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
PauloftheWest [Thu, 6 Nov 2014 23:02:58 +0000 (15:02 -0800)]
Migrated search for SubInfoRecord to Utils.
Bug:
18293625
Bug:
18293168
Bug:
18291246
Change-Id: Iad01a01d9b60ca010943447b00c1394471e93d5a
Jeff Davidson [Fri, 7 Nov 2014 20:39:13 +0000 (12:39 -0800)]
Don't allow secondary users to change Wi-Fi assistants.
This is not ideal but better than the current situation given that the
rest of the connectivity stack does not properly support multi-user.
Bug:
17320659
Change-Id: Ia0d4c746b4ebe6ce90df7ff39f0398ca78fd61f6
Sanket Padawe [Fri, 7 Nov 2014 19:58:11 +0000 (19:58 +0000)]
am
b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev
* commit '
b58119b709acd370b722659a12ebc75bd9a32a4c':
Set default sim name and carrier name from subinforecord object.
Sanket Padawe [Fri, 7 Nov 2014 19:47:45 +0000 (19:47 +0000)]
Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev
Fabrice Di Meglio [Fri, 7 Nov 2014 19:18:17 +0000 (19:18 +0000)]
am
293d9744: Merge "Fix bug #
17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev
* commit '
293d974482c89b9886f9451423f4619e23b5b186':
Fix bug #
17526111 Keyboard should dismiss when Settings search query is submitted
Fabrice Di Meglio [Fri, 7 Nov 2014 19:18:16 +0000 (19:18 +0000)]
am
2a4f034d: Merge "Fix bug #
17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev
* commit '
2a4f034da4fa1a51e5a254942436d57facd4005b':
Fix bug #
17936169 subsettings activity crashes on emulator for android-21
Fabrice Di Meglio [Fri, 7 Nov 2014 19:14:03 +0000 (19:14 +0000)]
Merge "Fix bug #
17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev
Fabrice Di Meglio [Fri, 7 Nov 2014 19:13:27 +0000 (19:13 +0000)]
Merge "Fix bug #
17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev
Sanket Padawe [Thu, 6 Nov 2014 19:44:46 +0000 (11:44 -0800)]
Set default sim name and carrier name from subinforecord object.
Changes for retrieving display name and carrier name from subinforecord
object.
Bug:
18247211
Bug:
17732079
Bug:
17321641
Change-Id: I718700648ddd5a2646c720591ce776bd30a03543
Conflicts:
src/com/android/settings/sim/SimSettings.java
Jason Monk [Fri, 7 Nov 2014 17:02:03 +0000 (17:02 +0000)]
am
cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
* commit '
cc0a2c554a8a576df2dbf4f564970cd67cd34e77':
Screen pinning: fix strings and add scrollview
Jason Monk [Fri, 7 Nov 2014 16:58:37 +0000 (16:58 +0000)]
Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev
Jason Monk [Fri, 7 Nov 2014 16:23:02 +0000 (11:23 -0500)]
Screen pinning: fix strings and add scrollview
Update strings as requested from ewong, and add scrollview around
description for large-text/small-device case.
Bug:
18287056
Bug:
17177672
Change-Id: Ie34007d263a1fbc77fc8f435dbcd23a36f1766c3
Alexandra Gherghina [Fri, 7 Nov 2014 15:24:27 +0000 (15:24 +0000)]
Update sync state immediately after accounts are shown
Bug:
18251114
Change-Id: I13791ff3979ce862e11989a3819f2356be32a0f4
Baligh Uddin [Fri, 7 Nov 2014 15:15:36 +0000 (15:15 +0000)]
am
5d6b47c1: (-s ours) am
960c98f9: (-s ours) Import translations. DO NOT MERGE
* commit '
5d6b47c1a21bd3d283f95aae4671b3667f511515':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Nov 2014 15:08:07 +0000 (15:08 +0000)]
am
960c98f9: (-s ours) Import translations. DO NOT MERGE
* commit '
960c98f91d44a9f9dfa5276f62e55f16e557e685':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Nov 2014 15:06:32 +0000 (15:06 +0000)]
am
449dc733: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
449dc733e313b889a159a8776bd09cacbc0c34ae':
Import translations. DO NOT MERGE
Baligh Uddin [Fri, 7 Nov 2014 15:03:14 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Baligh Uddin [Fri, 7 Nov 2014 15:03:00 +0000 (15:03 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Alexandra Gherghina [Fri, 7 Nov 2014 10:39:43 +0000 (10:39 +0000)]
am
c66eb698: Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
* commit '
c66eb698a9e5e4b6e684ba38a92e7c0ce8bd596a':
Disable app notifications checkbox for uninstalled apps
Alexandra Gherghina [Fri, 7 Nov 2014 10:39:42 +0000 (10:39 +0000)]
am
ee70c699: Merge "Update text for apps installed for other users" into lmp-mr1-dev
* commit '
ee70c69919d3e49ba76d2710850fd70be5c09998':
Update text for apps installed for other users
Alexandra Gherghina [Fri, 7 Nov 2014 10:35:52 +0000 (10:35 +0000)]
Merge "Disable app notifications checkbox for uninstalled apps" into lmp-mr1-dev
Alexandra Gherghina [Fri, 7 Nov 2014 10:35:37 +0000 (10:35 +0000)]
Merge "Update text for apps installed for other users" into lmp-mr1-dev
Alexandra Gherghina [Wed, 5 Nov 2014 13:20:56 +0000 (13:20 +0000)]
Disable app notifications checkbox for uninstalled apps
Bug:
18253810
Change-Id: I99fb2ae34b16944fd839db4e7c380b2d32f3b85d
Alexandra Gherghina [Wed, 29 Oct 2014 15:29:17 +0000 (15:29 +0000)]
Update text for apps installed for other users
This also refactors the layout to accommodate longer text
Bug:
16364316
Change-Id: I41eacba5b09a4f13af9695594c1a53eae075554f
Fabrice Di Meglio [Fri, 7 Nov 2014 01:46:20 +0000 (01:46 +0000)]
am
fff7e020: Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
* commit '
fff7e020e83b1f23de11a842c56728f8a739a8d1':
Update synonyms and fix some issues related to them
Fabrice Di Meglio [Fri, 7 Nov 2014 01:39:24 +0000 (01:39 +0000)]
Merge "Update synonyms and fix some issues related to them" into lmp-mr1-dev
Fabrice Di Meglio [Fri, 7 Nov 2014 01:36:28 +0000 (17:36 -0800)]
Fix bug #
17526111 Keyboard should dismiss when Settings search query is submitted
- dismiss keyboard when the query is submitted by returning the correct value to
onQueryTextSubmit()
Change-Id: I3da0606ea7c5e65c860784a867a54ad30589b3a7
Fabrice Di Meglio [Fri, 7 Nov 2014 00:57:04 +0000 (16:57 -0800)]
Update synonyms and fix some issues related to them
- update synonyms definitions
- fix issue with L release regression for indexing "Backup & reset":
was missing the marker interface "Indexable"
- fix non working synonyms for "Language & input": their declaration
was done in the XML preference file but was not used because the
SearchIndexProvider was built "by hand"
See bug #
17474866 Settings search synonyms needs an update
Change-Id: Iceab71a0e3214f3a8ba0dcd77756c3632609c5ce
Paul Crowley [Fri, 7 Nov 2014 00:33:42 +0000 (00:33 +0000)]
am
41c19779: Merge "Add a new flow for decryption checking." into lmp-mr1-dev
* commit '
41c197797832efd2acee013c0079fe7850559795':
Add a new flow for decryption checking.
Paul Crowley [Fri, 7 Nov 2014 00:26:44 +0000 (00:26 +0000)]
Merge "Add a new flow for decryption checking." into lmp-mr1-dev
Jeff Davidson [Fri, 7 Nov 2014 00:09:36 +0000 (00:09 +0000)]
am
99f191f5: Remove the Wi-Fi Assistant card.
* commit '
99f191f5856bb266854d7b08a50523626eb70f72':
Remove the Wi-Fi Assistant card.
Fabrice Di Meglio [Thu, 6 Nov 2014 23:16:09 +0000 (15:16 -0800)]
Fix bug #
17936169 subsettings activity crashes on emulator for android-21
- prevent the NPE by checking if the UsbManager is not null
Change-Id: I65114ffe66f90d6de66bb98ad841df64840278ce
Jeff Davidson [Thu, 6 Nov 2014 21:30:34 +0000 (13:30 -0800)]
Remove the Wi-Fi Assistant card.
Per the latest mocks, advanced wireless settings will be the only
location in platform settings where Wi-Fi Assistants are configured.
The card is no longer being used.
Bug:
13780935
Change-Id: Idddf971404532256165045665bd0a6b19966d2bd
Stuart Scott [Thu, 6 Nov 2014 18:54:42 +0000 (18:54 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
automerge:
ac61828
* commit '
ac61828bed8219b94afe4fe2f32cae6ef70130c0':
Fix NPE when parceling SubInfoRecord
Stuart Scott [Thu, 6 Nov 2014 18:25:49 +0000 (18:25 +0000)]
Merge "Fix NPE when parceling SubInfoRecord" into lmp-mr1-dev
Baligh Uddin [Thu, 6 Nov 2014 17:49:04 +0000 (09:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: I18ddc7f1f2104dad793af6e7a8978b0d36758258
Auto-generated-cl: translation import
Baligh Uddin [Thu, 6 Nov 2014 17:42:35 +0000 (09:42 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3b866f948797d2f710f53ce51aaa54b373a346e0
Auto-generated-cl: translation import
OSDN Git Service
