git.osdn.net Git - android-x86/packages-apps-Settings.git/log

PauloftheWest [Thu, 13 Nov 2014 15:15:46 +0000 (15:15 +0000)]

am 0f4254fa: am 26104298: Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev

* commit '0f4254fab38fc7b47e4532446dd13338aa4c2cf0':
Adding Sim Status menu to Settings.

commit | commitdiff | tree

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.

commit | commitdiff | tree

PauloftheWest [Thu, 13 Nov 2014 13:57:08 +0000 (13:57 +0000)]

Merge "Adding Sim Status menu to Settings." into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Thu, 13 Nov 2014 00:00:37 +0000 (00:00 +0000)]

am 28408035: (-s ours) am c5079a06: (-s ours) am 827ad0c3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '28408035173a5e15f6ccc119bc61127cfd989f0c':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Sanket Padawe [Wed, 12 Nov 2014 23:50:34 +0000 (23:50 +0000)]

am f722ff93: am 6416bec0: Merge "UI changes for icons in sim settings" into lmp-mr1-dev

* commit 'f722ff93fc2c2e6799970a29e59d5db0a152b1e4':
UI changes for icons in sim settings

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Nov 2014 23:50:33 +0000 (23:50 +0000)]

am 15034064: (-s ours) am fbce961b: (-s ours) am 9ae3bf2d: (-s ours) Import translations. DO NOT MERGE

* commit '1503406487bb2f0412fce00c83533093006b04d7':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Nov 2014 23:30:09 +0000 (23:30 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Nov 2014 18:25:16 +0000 (18:25 +0000)]

am 7897993b: (-s ours) am cdbba048: (-s ours) Import translations. DO NOT MERGE

* commit '7897993b6175d605dcf6d3318388005ea693ad4a':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 12 Nov 2014 18:25:15 +0000 (18:25 +0000)]

am a1486acf: (-s ours) Import translations. DO NOT MERGE

* commit 'a1486acfeff910751b255b597383e5465670cdf0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

vandwalle [Wed, 12 Nov 2014 03:24:47 +0000 (03:24 +0000)]

Merge "dont blacklist wifi config that have had validated internet status in the past" into lmp-mr1-dev automerge: 53ad50b
automerge: 4f2c003

* commit '4f2c003d6ae0db4b6d929e2de5e40d7ab01a76dc':
dont blacklist wifi config that have had validated internet status in the past

commit | commitdiff | tree

Wink Saville [Wed, 12 Nov 2014 03:23:15 +0000 (03:23 +0000)]

Merge "Update SubscriptionManager API as per API council." into lmp-mr1-dev automerge: 588611e
automerge: 754da43

* commit '754da436c9ccae525af19a590533307f0ec9c6c5':
Update SubscriptionManager API as per API council.

commit | commitdiff | tree

Amith Yamasani [Wed, 12 Nov 2014 03:12:40 +0000 (03:12 +0000)]

Fix a regression in enabling unknown sources toggle automerge: ceceb2a
automerge: 8b955d1

* commit '8b955d1d47e1bcf1e989fb437f50dd7f82f1e567':
Fix a regression in enabling unknown sources toggle

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Wed, 12 Nov 2014 00:25:54 +0000 (00:25 +0000)]

am aa762831: Merge "Reorganize sync state menu options for accounts settings" into lmp-mr1-dev
automerge: 5fc5de1

* commit '5fc5de1f6acdc255ae1f9b21380fe8adad791080':
Reorganize sync state menu options for accounts settings

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Tue, 11 Nov 2014 18:51:45 +0000 (18:51 +0000)]

am 0193911e: Settings: Tweak doze settings description.
automerge: 9259316

* commit '925931601d48a0cdec885f1a381339f78c282bcf':
Settings: Tweak doze settings description.

commit | commitdiff | tree

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.

commit | commitdiff | tree

John Spurlock [Tue, 11 Nov 2014 18:07:09 +0000 (13:07 -0500)]

Settings: Tweak doze settings description.

Change-Id: If9241fabf8e097ef57049cfb2c7f75513f978759

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Tue, 11 Nov 2014 02:43:47 +0000 (02:43 +0000)]

Merge "Settings: Update preference summary per new downtime behavior." into lmp-mr1-dev automerge: 64cb79b
automerge: 28c275e

* commit '28c275ed7035deb99154eb7c1ded6f289f515a24':
Settings: Update preference summary per new downtime behavior.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 11 Nov 2014 00:59:27 +0000 (00:59 +0000)]

am 668b0e27: 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 '668b0e2756b98dc8c2096586c342c1ffa1eb5bbb':
Fix bug #18104271 Tapping *name* of service in Voice input services does not fill in radio button

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Tue, 11 Nov 2014 00:51:02 +0000 (00:51 +0000)]

am 13da7679: (-s ours) am 61fe962f: (-s ours) am cafcb70a: (-s ours) Import translations. DO NOT MERGE

* commit '13da7679407ad0a69e7f055689b3e502864697f2':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Tue, 11 Nov 2014 00:30:26 +0000 (00:30 +0000)]

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

commit | commitdiff | tree

Geoff Mendal [Tue, 11 Nov 2014 00:30:25 +0000 (00:30 +0000)]

am 305acf38: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '305acf388ae93e312d7e51392b73ac02c8869b19':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Tue, 11 Nov 2014 00:14:37 +0000 (00:14 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Tue, 11 Nov 2014 00:12:26 +0000 (00:12 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jeff Davidson [Mon, 10 Nov 2014 17:45:46 +0000 (17:45 +0000)]

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Alexandra Gherghina [Mon, 10 Nov 2014 10:24:06 +0000 (10:24 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Paul Crowley [Sat, 8 Nov 2014 13:50:14 +0000 (13:50 +0000)]

am c1fcf220: Prevent factory reset for short passwords in CryptKeeper automerge: 2555e5f

* commit 'c1fcf22026d55d9f2cd6d0d354312e00b4081d4c':
Prevent factory reset for short passwords in CryptKeeper

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Paul Crowley [Sat, 8 Nov 2014 03:00:06 +0000 (03:00 +0000)]

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Stuart Scott [Sat, 8 Nov 2014 00:21:10 +0000 (00:21 +0000)]

am fca698cb: am ab82c090: Merge "Update SubInfoRecord usage" into lmp-mr1-dev

* commit 'fca698cbeba3e9a18d388a9d627be2c28ac96d61':
Update SubInfoRecord usage

commit | commitdiff | tree

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

commit | commitdiff | tree

Stuart Scott [Sat, 8 Nov 2014 00:09:20 +0000 (00:09 +0000)]

Merge "Update SubInfoRecord usage" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Stuart Scott [Wed, 5 Nov 2014 22:47:08 +0000 (14:47 -0800)]

Update SubInfoRecord usage

bug: 17575308
Change-Id: Id854afd609d58bb63ed8d42bf5e641a15589f79d

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 7 Nov 2014 23:18:02 +0000 (23:18 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

PauloftheWest [Fri, 7 Nov 2014 22:40:13 +0000 (22:40 +0000)]

am 7be19184: am 5aafdda8: Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev

* commit '7be191843ad6b2c84d054fe7a665fcb2e768b954':
Migrated search for SubInfoRecord to Utils.

commit | commitdiff | tree

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.

commit | commitdiff | tree

PauloftheWest [Fri, 7 Nov 2014 22:28:46 +0000 (22:28 +0000)]

Merge "Migrated search for SubInfoRecord to Utils." into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sanket Padawe [Fri, 7 Nov 2014 20:03:51 +0000 (20:03 +0000)]

am 80b7a2e4: am b58119b7: Merge "Set default sim name and carrier name from subinforecord object." into lmp-mr1-dev

* commit '80b7a2e4224195ab41a9098b7f8217dd2626fc41':
Set default sim name and carrier name from subinforecord object.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 7 Nov 2014 19:24:10 +0000 (19:24 +0000)]

am 330fc418: am 293d9744: Merge "Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted" into lmp-mr1-dev

* commit '330fc41823e3982d183b6c96bf794f63476bb856':
Fix bug #17526111 Keyboard should dismiss when Settings search query is submitted

commit | commitdiff | tree

Fabrice Di Meglio [Fri, 7 Nov 2014 19:24:09 +0000 (19:24 +0000)]

am d762aaab: am 2a4f034d: Merge "Fix bug #17936169 subsettings activity crashes on emulator for android-21" into lmp-mr1-dev

* commit 'd762aaabd28242a50ec6493151b8f2dbb74e0edb':
Fix bug #17936169 subsettings activity crashes on emulator for android-21

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Fri, 7 Nov 2014 17:07:02 +0000 (17:07 +0000)]

am dac36faf: am cc0a2c55: Merge "Screen pinning: fix strings and add scrollview" into lmp-mr1-dev

* commit 'dac36fafbe5757bdfc44d50e93c4e2771fbc71e0':
Screen pinning: fix strings and add scrollview

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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