OSDN Git Service
Geoff Mendal [Wed, 19 Nov 2014 19:27:37 +0000 (19:27 +0000)]
am
36d2656f: (-s ours) Import translations. DO NOT MERGE
* commit '
36d2656f963e29b3290c50664677bd95fe51240b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 19 Nov 2014 19:03:40 +0000 (11:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id90b273276938939b6e68b00149e54e8ec146ca6
Auto-generated-cl: translation import
Alexandra Gherghina [Tue, 18 Nov 2014 10:08:49 +0000 (10:08 +0000)]
am
3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev
* commit '
3a84d40133e7a4f74fd1df091ba43fb85859b169':
Fix NPE caused by status update outside activity lifecycle
Alexandra Gherghina [Tue, 18 Nov 2014 10:02:36 +0000 (10:02 +0000)]
Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev
Sanket Padawe [Mon, 17 Nov 2014 23:57:18 +0000 (23:57 +0000)]
am
d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
* commit '
d85aa17894db4928d010c1590c2c6ea781546230':
Adding icons to sim color selection in settings UI.
Sanket Padawe [Mon, 17 Nov 2014 23:53:12 +0000 (23:53 +0000)]
Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev
PauloftheWest [Mon, 17 Nov 2014 22:59:24 +0000 (22:59 +0000)]
am
79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev
* commit '
79381a928b998cc45ffeeea624d8bc4b77c6529a':
Created Multi-SIM notifications.
Geoff Mendal [Mon, 17 Nov 2014 22:59:15 +0000 (22:59 +0000)]
am
2321682d: (-s ours) am
f0450338: (-s ours) Import translations. DO NOT MERGE
* commit '
2321682d5ac67eb3d2d6cfd71ef6f4ddfd3cd9e6':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Nov 2014 22:59:04 +0000 (22:59 +0000)]
am
383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '
383d2ab6bd9a0e3755a40a3b0b98e939cc017a6c':
Import translations. DO NOT MERGE
PauloftheWest [Mon, 17 Nov 2014 22:50:07 +0000 (22:50 +0000)]
Merge "Created Multi-SIM notifications." into lmp-mr1-dev
Geoff Mendal [Mon, 17 Nov 2014 22:16:23 +0000 (22:16 +0000)]
am
f0450338: (-s ours) Import translations. DO NOT MERGE
* commit '
f04503387498337787e315979dd30bfeedb88b68':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 17 Nov 2014 22:13:18 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 17 Nov 2014 22:12:53 +0000 (14:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8742961e8d64b9b83cb3e3583c4316cd31399621
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Nov 2014 22:09:21 +0000 (14:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia2caaac61701db1f431df0fa44827e1b6f617bcd
Auto-generated-cl: translation import
Geoff Mendal [Mon, 17 Nov 2014 22:06:47 +0000 (22:06 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 17 Nov 2014 22:04:27 +0000 (14:04 -0800)]
Import translations. DO NOT MERGE
Change-Id: Idcf2d15fa650fc675efa5b7e5dbc0d86ed8aa4b8
Auto-generated-cl: translation import
Elliott Hughes [Mon, 17 Nov 2014 19:25:35 +0000 (19:25 +0000)]
am
02c4c517: Remove vestigial "Choose date format" option.
* commit '
02c4c517df0a7a7df617bddc3f48aa45d53006b2':
Remove vestigial "Choose date format" option.
Sanket Padawe [Mon, 17 Nov 2014 18:43:37 +0000 (10:43 -0800)]
Adding icons to sim color selection in settings UI.
Adding icons to sim color selection of sim settings UI.
Bug:
18380838
Change-Id: I98f07721aa234ff58a64a0c694206b085385bdec
Elliott Hughes [Fri, 14 Nov 2014 19:16:16 +0000 (11:16 -0800)]
Remove vestigial "Choose date format" option.
Almost all of our date formatting goes via icu these days, so this is
a no-op almost everywhere. (And should be a no-op everywhere soon.)
There's no obvious way to fix it, so remove it. UI guidelines say we
should use spelled out month names anyway.
Bug:
18322220
(cherry picked from commit
30cc30864b2b41d73e187ba9a0f75ea1fa64b538)
Change-Id: I2a84d69a1f21f71d8bce5b69202b07f1b422aa57
PauloftheWest [Mon, 17 Nov 2014 16:15:45 +0000 (16:15 +0000)]
am
acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev
* commit '
acb160baa3662b1e4d969005c476ab07d4a2825e':
Added tabs for Multi-SIM SIM Lock.
PauloftheWest [Mon, 17 Nov 2014 16:12:43 +0000 (16:12 +0000)]
Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev
Paul Crowley [Mon, 17 Nov 2014 13:34:26 +0000 (13:34 +0000)]
am
bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev
* commit '
bf88566dc77f01f5c5a4cd038a9e96e22fbf84fb':
Force power cycle on cooldown.
Paul Crowley [Mon, 17 Nov 2014 13:29:48 +0000 (13:29 +0000)]
Merge "Force power cycle on cooldown." into lmp-mr1-dev
Alexandra Gherghina [Fri, 14 Nov 2014 12:29:28 +0000 (12:29 +0000)]
Fix NPE caused by status update outside activity lifecycle
Bug:
18373656
Change-Id: I3c7db15df7c47b65a42a13fc7a3a077c3ad48f77
Prem Kumar [Sat, 15 Nov 2014 02:28:17 +0000 (02:28 +0000)]
am
b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-dev
* commit '
b4e9a055bf5c59c1b7f42f73c7572f865d318994':
Fix Sim Setting OOB error.
Prem Kumar [Sat, 15 Nov 2014 02:15:09 +0000 (02:15 +0000)]
Merge "Fix Sim Setting OOB error." into lmp-mr1-dev
Amith Yamasani [Sat, 15 Nov 2014 00:57:07 +0000 (00:57 +0000)]
am
c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" into lmp-mr1-dev
* commit '
c395b9f37a525f1cd26654c41f7fe4f401af085a':
Don't show SMS app settings for restricted profiles
Amith Yamasani [Sat, 15 Nov 2014 00:50:14 +0000 (00:50 +0000)]
Merge "Don't show SMS app settings for restricted profiles" into lmp-mr1-dev
Jeff Davidson [Sat, 15 Nov 2014 00:21:59 +0000 (00:21 +0000)]
am
c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev
* commit '
c01754bac9dffb58221f418d0b8418862b43b117':
Final UX for Wi-Fi assistant platform settings.
Jeff Davidson [Sat, 15 Nov 2014 00:17:02 +0000 (00:17 +0000)]
Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev
Jeff Davidson [Thu, 13 Nov 2014 02:36:41 +0000 (18:36 -0800)]
Final UX for Wi-Fi assistant platform settings.
When one app is available, the toggle works as before. When multiple
apps are available, we allow the user to choose the app in a dialog
before turning on the setting.
Bug:
13780935
Change-Id: I1c4391bf97a53febe580fb2b896b4850372062e7
John Spurlock [Fri, 14 Nov 2014 21:44:47 +0000 (21:44 +0000)]
am
fdebfc35: Settings: Add effects suppression text to Ring volume.
* commit '
fdebfc35c43c445afcd39077f5cbcf72902b1d6e':
Settings: Add effects suppression text to Ring volume.
John Spurlock [Fri, 14 Nov 2014 19:32:01 +0000 (14:32 -0500)]
Settings: Add effects suppression text to Ring volume.
If the effects are being muted by a notification listener, display
a "Muted by <x>" msg instead of an active slider inside the
Ring/Notification volume setting pref.
Update volume pref design to optimize for this new custom appearance.
Depends on frameworks/base:
Icdb5f85eb4bcaa1ead7d77c1460e06ad3f0604d5
Bug:
17461563
Change-Id: I6da871e16009370402451a2ff507de4762644a80
Jeff Sharkey [Fri, 14 Nov 2014 19:29:31 +0000 (19:29 +0000)]
am
c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev
* commit '
c88cdea2bb6f830abb8f1fe3b422368d3275f88c':
Migrate license display to HTMLViewer.
Jeff Sharkey [Fri, 14 Nov 2014 19:24:42 +0000 (19:24 +0000)]
Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev
PauloftheWest [Tue, 11 Nov 2014 14:42:54 +0000 (06:42 -0800)]
Added tabs for Multi-SIM SIM Lock.
Bug:
18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0
PauloftheWest [Fri, 14 Nov 2014 16:38:44 +0000 (08:38 -0800)]
Fix Sim Setting OOB error.
+ Cleanup: deleted dead code.
Bug:
18380862
Change-Id: Ie5dc44c6c0fe50cd9243a19050b6d79732d2d014
Jeff Sharkey [Fri, 14 Nov 2014 02:02:31 +0000 (18:02 -0800)]
Migrate license display to HTMLViewer.
For security purposes, we're no longer allowing WebView to be loaded
when running as system UID. Instead, we now launch HTMLViewer to
show the details.
Bug:
18376908
Change-Id: I3c6a7897ab4ad0fc2c5463e5d69c7f53fb934e31
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, 30 Oct 2014 15:01:30 +0000 (08:01 -0700)]
Created Multi-SIM notifications.
+ On Multi-SIM devices a notificaiton will pop up when a SIM card is
added, removed, or replaced.
+ The notification informs the user there has been a change in SIMs and
they can tap the notification to go SIM Card Settings.
Bug:
18293625
Change-Id: Iad1e5e0cf469e7bdfc43b2c18dd0586d042bb784
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.
Paul Crowley [Wed, 12 Nov 2014 12:06:38 +0000 (12:06 +0000)]
Force power cycle on cooldown.
Bug:
18292029
Change-Id: I02b6eff56902859ae3aba4909656553f4b322b0c
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
Amith Yamasani [Wed, 12 Nov 2014 21:46:43 +0000 (13:46 -0800)]
Don't show SMS app settings for restricted profiles
Restricted profiles might not have an SMS app and there is
currently no UI to enable/disable SMS for restricted profiles. SMS
is disabled by default in this case. So hide the SMS app picker
option in restricted profiles.
Bug:
17521457
Change-Id: Id2bb3e4690a4afba75ebcec8531727ec150c5632
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
OSDN Git Service
