Geoff Mendal
19b8aaa5e1
am 72895bc5: (-s ours) am abece484: (-s ours) am 14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '72895bc5f088dc92ea158f628827e0ed1c6f08a3':
Import translations. DO NOT MERGE
2014-11-11 00:44:46 +00:00
Geoff Mendal
0e0e44bcb4
am bfa92ff2: (-s ours) am 305acf38: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'bfa92ff27d0bcb416274c4dcb73c84ddfd0ebb10':
Import translations. DO NOT MERGE
2014-11-11 00:44:44 +00:00
Geoff Mendal
61fe962f90
am cafcb70a: (-s ours) Import translations. DO NOT MERGE
...
* commit 'cafcb70a685d00c7cbbbfe477e1dad0f2fd980e6':
Import translations. DO NOT MERGE
2014-11-11 00:37:35 +00:00
Fabrice Di Meglio
c66a878813
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
2014-11-10 16:35:06 -08:00
Geoff Mendal
72895bc5f0
am abece484: (-s ours) am 14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit 'abece484b682c426b864ec877f352435db5f531c':
Import translations. DO NOT MERGE
2014-11-11 00:30:26 +00:00
Geoff Mendal
bfa92ff27d
am 305acf38: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit '305acf388ae93e312d7e51392b73ac02c8869b19':
Import translations. DO NOT MERGE
2014-11-11 00:30:25 +00:00
Geoff Mendal
632b08f4d0
Merge "Import translations. DO NOT MERGE"
2014-11-11 00:19:14 +00:00
Geoff Mendal
abece484b6
am 14343ad9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
...
* commit '14343ad9b81797b5b7c04373329e2a3de87bac12':
Import translations. DO NOT MERGE
2014-11-11 00:17:41 +00:00
Geoff Mendal
305acf388a
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-11-11 00:14:38 +00:00
Geoff Mendal
14343ad9b8
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
2014-11-11 00:12:27 +00:00
Geoff Mendal
0bda36df16
Import translations. DO NOT MERGE
...
Change-Id: I937efd74232d29cf16ddf148661da8e0f2f6896e
Auto-generated-cl: translation import
2014-11-10 14:33:04 -08:00
Geoff Mendal
cafcb70a68
Import translations. DO NOT MERGE
...
Change-Id: I6d7b0e7986c8ea87e557cda85144a3501f86fc29
Auto-generated-cl: translation import
2014-11-10 14:21:23 -08:00
Geoff Mendal
fa0ed7a83f
Import translations. DO NOT MERGE
...
Change-Id: I239d9e96f7a88bb558ec2f14955ae98af32fab23
Auto-generated-cl: translation import
2014-11-10 14:17:52 -08:00
Geoff Mendal
c0c56cad2b
Import translations. DO NOT MERGE
...
Change-Id: I89de05dbac32f4acf541a4a2d6cb3225652fd39b
Auto-generated-cl: translation import
2014-11-10 14:12:28 -08:00
John Spurlock
49300d19ab
Settings: Update preference summary per new downtime behavior.
...
Bug: 16373455
Change-Id: I399b23ed09973c32c60b37612fd714198297b1a7
2014-11-10 14:49:10 -05:00
Jeff Davidson
f9c285896c
am a8b154f2: am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev
...
* commit 'a8b154f2f04c6130a65c0b45947e01a896e47cd9':
Don't allow secondary users to change Wi-Fi assistants.
2014-11-10 17:50:08 +00:00
Jeff Davidson
a8b154f2f0
am d39dc5c3: am 76f01338: Merge "Don\'t allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev
...
* commit 'd39dc5c36b6f7a356f488f94fad74cd8c2ea6125':
Don't allow secondary users to change Wi-Fi assistants.
2014-11-10 17:45:46 +00:00
Jeff Davidson
d39dc5c36b
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.
2014-11-10 17:40:09 +00:00
Jeff Davidson
76f0133831
Merge "Don't allow secondary users to change Wi-Fi assistants." into lmp-mr1-dev
2014-11-10 17:35:29 +00:00
Alexandra Gherghina
513b2cb97e
am ac62d700: am ba1eba04: am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev
...
* commit 'ac62d70080140b8068e93ba43d3de167f5ac16d2':
Update sync state immediately after accounts are shown
2014-11-10 10:28:47 +00:00
Alexandra Gherghina
ac62d70080
am ba1eba04: am 095521b2: Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev
...
* commit 'ba1eba04cc52fbf941f9d6977f47aafcb4b80993':
Update sync state immediately after accounts are shown
2014-11-10 10:24:06 +00:00
Alexandra Gherghina
ba1eba04cc
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
2014-11-10 10:19:12 +00:00
Alexandra Gherghina
095521b287
Merge "Update sync state immediately after accounts are shown" into lmp-mr1-dev
2014-11-10 10:13:00 +00:00
Paul Crowley
74d7841f24
am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f
...
automerge: 2e6a170
2014-11-08 13:58:42 +00:00
Paul Crowley
2e6a170aa5
am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f
...
* commit 'c1fcf22026d55d9f2cd6d0d354312e00b4081d4c':
Prevent factory reset for short passwords in CryptKeeper
2014-11-08 13:50:14 +00:00
Paul Crowley
c1fcf22026
Prevent factory reset for short passwords in CryptKeeper
...
automerge: 2555e5f
2014-11-08 03:36:30 +00:00
Paul Crowley
6bd45c0eba
am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35
...
automerge: 0475a3c
2014-11-08 03:18:47 +00:00
vandwalle
8be7ee3aac
dont blacklist wifi config that have had validated internet status in the past
...
Change-Id: I66f7fffe33b5dbe861445775dcc6135c6cbedf62
2014-11-07 19:01:58 -08:00
Paul Crowley
0475a3ccc5
am 40597ca0: Merge "Use the right message for pattern/password." into lmp-mr1-dev automerge: c44ad35
...
* commit '40597ca0e14dc3b5be90ff1d0c344316cffe0274':
Use the right message for pattern/password.
2014-11-08 03:00:06 +00:00
Paul Crowley
40597ca0e1
Merge "Use the right message for pattern/password." into lmp-mr1-dev
...
automerge: c44ad35
2014-11-08 02:27:33 +00:00
Paul Crowley
2555e5f104
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
2014-11-08 01:43:45 +00:00
Paul Crowley
c44ad35e51
Merge "Use the right message for pattern/password." into lmp-mr1-dev
2014-11-08 01:13:11 +00:00
Stuart Scott
928052ebe8
am 48471e39: am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev
...
* commit '48471e397e6e63a72e0ff80df5bba9700d6f9cba':
Update SubInfoRecord usage
2014-11-08 00:25:17 +00:00
Stuart Scott
48471e397e
am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev
...
* commit 'fca698cbeba3e9a18d388a9d627be2c28ac96d61':
Update SubInfoRecord usage
2014-11-08 00:21:10 +00:00
Stuart Scott
fca698cbeb
am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev
...
* commit 'ab82c090d1f4549a256d4550b71c540b216e0a65':
Update SubInfoRecord usage
2014-11-08 00:15:54 +00:00
Stuart Scott
ab82c090d1
Merge "Update SubInfoRecord usage" into lmp-mr1-dev
2014-11-08 00:09:21 +00:00
Paul Crowley
a8c760691d
Use the right message for pattern/password.
...
Bug: 17875087
Change-Id: I7729a4fcb993def912e950ad0ea59fd64bfc34d3
2014-11-07 23:54:56 +00:00
Stuart Scott
4d1a0165b4
Update SubInfoRecord usage
...
bug: 17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d
2014-11-07 23:53:56 +00:00
Fabrice Di Meglio
1515051537
am 8a343c44: am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev
...
* commit '8a343c44215db5d8099ab0ace8b5a4a123ce62e8':
Fix bug #18289076 Storage graph colors don't match Material design spec
2014-11-07 23:22:00 +00:00
Fabrice Di Meglio
8a343c4421
am 3c05c164: am d9966523: Merge "Fix bug #18289076 Storage graph colors don\'t match Material design spec" into lmp-mr1-dev
...
* commit '3c05c164bfb640990102734e73884252b803abe8':
Fix bug #18289076 Storage graph colors don't match Material design spec
2014-11-07 23:18:02 +00:00
Fabrice Di Meglio
3c05c164bf
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
2014-11-07 23:12:30 +00:00
Fabrice Di Meglio
d9966523f0
Merge "Fix bug #18289076 Storage graph colors don't match Material design spec" into lmp-mr1-dev
2014-11-07 23:07:05 +00:00
PauloftheWest
2d17937e10
am cd16c4bb: am 7be19184: am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
...
* commit 'cd16c4bb0404b4e2e90ac3f802b4fc71e55055a4':
Migrated search for SubInfoRecord to Utils.
2014-11-07 22:48:04 +00:00
Fabrice Di Meglio
e7ed65602b
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
2014-11-07 14:46:20 -08:00
PauloftheWest
cd16c4bb04
am 7be19184: am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
...
* commit '7be191843ad6b2c84d054fe7a665fcb2e768b954':
Migrated search for SubInfoRecord to Utils.
2014-11-07 22:40:13 +00:00
PauloftheWest
7be191843a
am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
...
* commit '5aafdda85ccfb0e3ad46a7ab0bac592893bddde8':
Migrated search for SubInfoRecord to Utils.
2014-11-07 22:36:01 +00:00
PauloftheWest
5aafdda85c
Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev
2014-11-07 22:28:47 +00:00
PauloftheWest
0a0dacaf17
Migrated search for SubInfoRecord to Utils.
...
Bug: 18293625
Bug: 18293168
Bug: 18291246
Change-Id: Iad01a01d9b60ca010943447b00c1394471e93d5a
2014-11-07 14:26:22 -08:00
Jeff Davidson
739ae972d0
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
2014-11-07 13:26:56 -08:00
Sanket Padawe
4f8844057f
am a66826e3: am 80b7a2e4: am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev
...
* commit 'a66826e387d158ac9e018aab0d82782377269756':
Set default sim name and carrier name from subinforecord object.
2014-11-07 20:09:38 +00:00
