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

Maurice Lam [Fri, 21 Nov 2014 23:13:32 +0000 (23:13 +0000)]

am 80e29675: am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev

* commit '80e2967529cf0bb75cb43881931bf4516e28bbd2':
[WifiSetup] Update title string

commit | commitdiff | tree

Maurice Lam [Fri, 21 Nov 2014 21:40:38 +0000 (21:40 +0000)]

am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev

* commit '3b1baf4b18c8176ba76d4527cb5740c0ace2cf91':
[WifiSetup] Update title string

commit | commitdiff | tree

Maurice Lam [Fri, 21 Nov 2014 21:36:22 +0000 (21:36 +0000)]

am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev

* commit '485a7e5989823ff30e6ef61064a592d42f49a1f0':
[WifiSetup] Update title string

commit | commitdiff | tree

Maurice Lam [Fri, 21 Nov 2014 21:33:40 +0000 (21:33 +0000)]

Merge "[WifiSetup] Update title string" into lmp-mr1-dev

commit | commitdiff | tree

Maurice Lam [Fri, 21 Nov 2014 19:59:34 +0000 (11:59 -0800)]

[WifiSetup] Update title string

Bug: 17887844
Change-Id: I08df121e2c5a6bcb919d3b372df71c9df0983f43

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:37:25 +0000 (15:37 +0000)]

am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev

* commit '3da30aabf18dcb0107894d7ef400f417cc665f5d':
Remove backup preferences if backup service is inactive

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:32:33 +0000 (15:32 +0000)]

am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev

* commit '208a8490c9fe6cfa3899c8c41f95afa539863711':
Remove backup preferences if backup service is inactive

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:29:01 +0000 (15:29 +0000)]

am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev

* commit '5875aefa8a48cd90a1245303c42c171c2f4962b4':
Remove backup preferences if backup service is inactive

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:28:04 +0000 (15:28 +0000)]

am cf8255a0: am ad8191d9: am b85025d9: Strings for multiprofile Location Settings.

* commit 'cf8255a0b150118a4c1f8703fe49d333d3fe0298':
Strings for multiprofile Location Settings.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:23:31 +0000 (15:23 +0000)]

am ad8191d9: am b85025d9: Strings for multiprofile Location Settings.

* commit 'ad8191d95e4dfa296f276e68647e216502bf4d36':
Strings for multiprofile Location Settings.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:21:34 +0000 (15:21 +0000)]

Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:18:59 +0000 (15:18 +0000)]

am b85025d9: Strings for multiprofile Location Settings.

* commit 'b85025d98b7c9d28c9ee2b26ce3c9d11929aeb3a':
Strings for multiprofile Location Settings.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:10:23 +0000 (15:10 +0000)]

Strings for multiprofile Location Settings.

Bug: 17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3

commit | commitdiff | tree

Amith Yamasani [Fri, 21 Nov 2014 03:27:36 +0000 (03:27 +0000)]

am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev
automerge: 0775058

* commit '07750584c8c20dc220b5ed66756bb0a31508e1c9':
Watch out for deleted user when exiting async task

commit | commitdiff | tree

Wink Saville [Fri, 21 Nov 2014 02:57:10 +0000 (02:57 +0000)]

am 14d486de: am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev automerge: 514b6e8

* commit '14d486de9553e2adddd937616a7895d4301f2417':
Revert "Additional changes to SubscriptionManager API as per API council."

commit | commitdiff | tree

Wink Saville [Fri, 21 Nov 2014 02:57:08 +0000 (02:57 +0000)]

am 75730eac: am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev automerge: b8b8bb2

* commit '75730eacb893f141c0da2bed0eeb06c71b3ffa04':
Additional changes to SubscriptionManager API as per API council.

commit | commitdiff | tree

Amith Yamasani [Fri, 21 Nov 2014 02:48:18 +0000 (02:48 +0000)]

am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev

* commit 'aa96cbec46dc2fce7eabd660ad08c1ef8326dbb3':
Watch out for deleted user when exiting async task

commit | commitdiff | tree

Wink Saville [Fri, 21 Nov 2014 02:41:26 +0000 (02:41 +0000)]

am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev
automerge: 514b6e8

* commit '514b6e8bb8d4893498f0f1b5c35d70cd77ceecac':
Revert "Additional changes to SubscriptionManager API as per API council."

commit | commitdiff | tree

Wink Saville [Fri, 21 Nov 2014 02:40:46 +0000 (02:40 +0000)]

am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev
automerge: b8b8bb2

* commit 'b8b8bb2fa8e086bfe95e024eee39b4e742c53a77':
Additional changes to SubscriptionManager API as per API council.

commit | commitdiff | tree

Jeff Davidson [Fri, 21 Nov 2014 01:55:01 +0000 (01:55 +0000)]

am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev
automerge: 32b7def

* commit '32b7def42f912ea527427892f4d95d277e4851fc':
Final strings for Wi-Fi Assistant in platform settings.

commit | commitdiff | tree

Amith Yamasani [Fri, 21 Nov 2014 01:50:50 +0000 (01:50 +0000)]

am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev

* commit '0cc764beed2b816ee7e092591c7f205601e1b596':
Watch out for deleted user when exiting async task

commit | commitdiff | tree

Amith Yamasani [Fri, 21 Nov 2014 01:47:20 +0000 (01:47 +0000)]

Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev

commit | commitdiff | tree

Jeff Davidson [Fri, 21 Nov 2014 00:44:02 +0000 (00:44 +0000)]

am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev

* commit '9503a00c587bff45d09206af309abc87b8f138df':
Final strings for Wi-Fi Assistant in platform settings.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 20 Nov 2014 21:29:12 +0000 (21:29 +0000)]

am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985

* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
Show managed profile accounts on Settings > Factory Reset

commit | commitdiff | tree

Paul Crowley [Thu, 20 Nov 2014 21:29:11 +0000 (21:29 +0000)]

am a41edb6c: am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev automerge: 50c67366

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

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 20 Nov 2014 21:25:42 +0000 (21:25 +0000)]

am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev
automerge: 72b1985

* commit '72b198508a3e2db38541e49a85229d363fdef3ae':
Show managed profile accounts on Settings > Factory Reset

commit | commitdiff | tree

Paul Crowley [Thu, 20 Nov 2014 21:23:50 +0000 (21:23 +0000)]

am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev
automerge: 50c67366

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

commit | commitdiff | tree

Amith Yamasani [Thu, 20 Nov 2014 01:12:46 +0000 (17:12 -0800)]

Watch out for deleted user when exiting async task

Fixes a problem where the async task can take a while to execute
and in the meantime the user can be removed. On exiting the async
task and updating the UI, make sure the user hasn't been deleted.

Bug: 18411181
Change-Id: I1831f3e53084c49e27557cb7aacec78c753a611b

commit | commitdiff | tree

Fyodor Kupolov [Thu, 20 Nov 2014 21:13:25 +0000 (21:13 +0000)]

am 158717ed: am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev automerge: 4a0d6f3

* commit '158717edaaa7b74787cd3e1ae6bf1f23e7dc854f':
Added a check if a custom activity can be started

commit | commitdiff | tree

Fyodor Kupolov [Thu, 20 Nov 2014 21:06:20 +0000 (21:06 +0000)]

am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev
automerge: 4a0d6f3

* commit '4a0d6f3e1196a545d56337e2934b273d7d0655a6':
Added a check if a custom activity can be started

commit | commitdiff | tree

Wink Saville [Thu, 20 Nov 2014 20:34:30 +0000 (20:34 +0000)]

am b9b69faf: Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev

* commit 'b9b69faf5ff4ba1a944b180b7240ad1f95e9acea':
Revert "Additional changes to SubscriptionManager API as per API council."

commit | commitdiff | tree

Wink Saville [Thu, 20 Nov 2014 20:30:47 +0000 (20:30 +0000)]

Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev

commit | commitdiff | tree

Wink Saville [Thu, 20 Nov 2014 20:27:46 +0000 (20:27 +0000)]

am db2e05d8: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

* commit 'db2e05d89e0b99b226fce9cc3af8552745f5e4ca':
Additional changes to SubscriptionManager API as per API council.

commit | commitdiff | tree

Wink Saville [Thu, 20 Nov 2014 20:27:34 +0000 (20:27 +0000)]

Revert "Additional changes to SubscriptionManager API as per API council."

This reverts commit 1285f74fcb6a8bf080c224e5a36db00ab1167d4c.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e

commit | commitdiff | tree

Wink Saville [Thu, 20 Nov 2014 20:21:28 +0000 (20:21 +0000)]

Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Wed, 12 Nov 2014 23:46:52 +0000 (23:46 +0000)]

Remove backup preferences if backup service is inactive

Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff

commit | commitdiff | tree

Jeff Davidson [Thu, 20 Nov 2014 18:43:00 +0000 (18:43 +0000)]

am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev

* commit '101743f9ecccae0054ba5867ae0585750a0a8bd2':
Final strings for Wi-Fi Assistant in platform settings.

commit | commitdiff | tree

Jeff Davidson [Thu, 20 Nov 2014 18:37:52 +0000 (18:37 +0000)]

Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 20 Nov 2014 14:10:14 +0000 (14:10 +0000)]

am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev

* commit '548460bda5d37b22165b8e9e4e6349699910795a':
Show managed profile accounts on Settings > Factory Reset

commit | commitdiff | tree

Zoltan Szatmary-Ban [Thu, 20 Nov 2014 14:06:12 +0000 (14:06 +0000)]

Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev

commit | commitdiff | tree

Paul Crowley [Thu, 20 Nov 2014 10:49:27 +0000 (10:49 +0000)]

am 67b4af14: Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev

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

commit | commitdiff | tree

Paul Crowley [Thu, 20 Nov 2014 10:16:50 +0000 (10:16 +0000)]

Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev

Conflicts:
src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da

commit | commitdiff | tree

Fyodor Kupolov [Wed, 19 Nov 2014 22:22:57 +0000 (22:22 +0000)]

am 5925e191: Merge "Added a check if a custom activity can be started" into lmp-mr1-dev

* commit '5925e1912e576e90d96a61403d658d70ca95bfce':
Added a check if a custom activity can be started

commit | commitdiff | tree

Fyodor Kupolov [Wed, 19 Nov 2014 22:20:24 +0000 (22:20 +0000)]

Merge "Added a check if a custom activity can be started" into lmp-mr1-dev

commit | commitdiff | tree

Paul Crowley [Wed, 19 Nov 2014 20:49:13 +0000 (20:49 +0000)]

Prevent factory reset for short passwords in CryptKeeper
automerge: 8fca3fc

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

commit | commitdiff | tree

Jeff Davidson [Wed, 19 Nov 2014 19:59:11 +0000 (11:59 -0800)]

Final strings for Wi-Fi Assistant in platform settings.

Bug: 13780935
Change-Id: I70a22b3f439d05570d2508f8e05ed3aa9627e8f1

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:40:39 +0000 (19:40 +0000)]

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

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

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:36:27 +0000 (19:36 +0000)]

am d15068d1: (-s ours) am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:36:06 +0000 (19:36 +0000)]

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

* commit '6ed3dc44b6a7abca582f2e05656562c09af369b0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:32:17 +0000 (19:32 +0000)]

am 328483aa: (-s ours) am 36d2656f: (-s ours) Import translations. DO NOT MERGE

* commit '328483aa1bd64ec1275dc543f8e67f868e3f6122':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:31:02 +0000 (19:31 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:19:12 +0000 (11:19 -0800)]

Import translations. DO NOT MERGE

Change-Id: Iab22f476ee0efb824690089ee1b12efe44eba77f
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Wed, 19 Nov 2014 19:08:37 +0000 (11:08 -0800)]

Import translations. DO NOT MERGE

Change-Id: I6ac6d662765779e610a210ad7ac792e7543af3fc
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

Wink Saville [Wed, 19 Nov 2014 18:34:28 +0000 (10:34 -0800)]

Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653

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

Conflicts:
src/com/android/settings/CryptKeeper.java

commit | commitdiff | tree

Fyodor Kupolov [Tue, 18 Nov 2014 23:08:12 +0000 (15:08 -0800)]

Added a check if a custom activity can be started

AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2

commit | commitdiff | tree

Alexandra Gherghina [Tue, 18 Nov 2014 20:20:27 +0000 (20:20 +0000)]

am fbf9642b: am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev

* commit 'fbf9642bee2e0aaa24770c282e21be674cb4b5b5':
Fix NPE caused by status update outside activity lifecycle

commit | commitdiff | tree

Sanket Padawe [Tue, 18 Nov 2014 20:17:51 +0000 (20:17 +0000)]

am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev

* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
Adding icons to sim color selection in settings UI.

commit | commitdiff | tree

PauloftheWest [Tue, 18 Nov 2014 20:17:50 +0000 (20:17 +0000)]

am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev

* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
Created Multi-SIM notifications.

commit | commitdiff | tree

Geoff Mendal [Tue, 18 Nov 2014 20:17:48 +0000 (20:17 +0000)]

am 450d9c33: (-s ours) am ab247fa4: (-s ours) am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE

* commit '450d9c33d0df63ddff5e4775b42178cd60b62446':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 18 Nov 2014 20:17:47 +0000 (20:17 +0000)]

am be2d4f99: (-s ours) am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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

commit | commitdiff | tree

Alexandra Gherghina [Tue, 18 Nov 2014 10:12:49 +0000 (10:12 +0000)]

am c11a94e9: am 3a84d401: Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev

* commit 'c11a94e98a911756e645216d36dbf0a438a3fb3e':
Fix NPE caused by status update outside activity lifecycle

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Sanket Padawe [Tue, 18 Nov 2014 02:08:01 +0000 (02:08 +0000)]

am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev

* commit '1ec6807a11b92ceca43e09d8517641150ccb826a':
Adding icons to sim color selection in settings UI.

commit | commitdiff | tree

PauloftheWest [Tue, 18 Nov 2014 02:06:55 +0000 (02:06 +0000)]

am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev

* commit 'a41e40ec3039f77bbe7c02714d7a2abef24c0a6d':
Created Multi-SIM notifications.

commit | commitdiff | tree

Geoff Mendal [Tue, 18 Nov 2014 02:06:54 +0000 (02:06 +0000)]

am ab247fa4: (-s ours) am 2321682d: (-s ours) am f0450338: (-s ours) Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Geoff Mendal [Tue, 18 Nov 2014 02:06:53 +0000 (02:06 +0000)]

am f17620e3: (-s ours) am 383d2ab6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 17 Nov 2014 23:01:59 +0000 (23:01 +0000)]

am 56491f29: (-s ours) am 6c30eb97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '56491f296c17f5cd1119f743d45c4f7a49e3e4a6':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 17 Nov 2014 22:54:23 +0000 (22:54 +0000)]

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

* commit '6c30eb976a32d21cd65a0281f24544a609657594':
Import translations. DO NOT MERGE

commit | commitdiff | tree

PauloftheWest [Mon, 17 Nov 2014 22:50:07 +0000 (22:50 +0000)]

Merge "Created Multi-SIM notifications." into lmp-mr1-dev

commit | commitdiff | tree

Geoff Mendal [Mon, 17 Nov 2014 22:27:37 +0000 (22:27 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 17 Nov 2014 22:24:08 +0000 (14:24 -0800)]

Import translations. DO NOT MERGE

Change-Id: Ie927e25029960f1ed0c8858e9162f4d2f235b687
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 17 Nov 2014 22:13:18 +0000 (22:13 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Mon, 17 Nov 2014 22:06:47 +0000 (22:06 +0000)]

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Elliott Hughes [Mon, 17 Nov 2014 20:26:26 +0000 (20:26 +0000)]

am 0bfe9ac1: am 661cbce8: am 02c4c517: Remove vestigial "Choose date format" option.

* commit '0bfe9ac100d2b573d422ed5a42514630d4dd2ade':
Remove vestigial "Choose date format" option.

commit | commitdiff | tree

Elliott Hughes [Mon, 17 Nov 2014 19:47:55 +0000 (19:47 +0000)]

am 661cbce8: am 02c4c517: Remove vestigial "Choose date format" option.

* commit '661cbce865f16186579ef21eaca03baa46c8908b':
Remove vestigial "Choose date format" option.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Elliott Hughes [Mon, 17 Nov 2014 17:44:24 +0000 (17:44 +0000)]

am ba586392: am 3dd51556: Merge "Remove vestigial "Choose date format" option."

* commit 'ba5863929a5679b14e8dcc70c9d6f777a675459a':
Remove vestigial "Choose date format" option.

commit | commitdiff | tree

Elliott Hughes [Mon, 17 Nov 2014 17:37:35 +0000 (17:37 +0000)]

am 3dd51556: Merge "Remove vestigial "Choose date format" option."

* commit '3dd51556bcbf7addcc17d29dd360165ee7ede1ee':
Remove vestigial "Choose date format" option.

commit | commitdiff | tree

Elliott Hughes [Mon, 17 Nov 2014 17:28:39 +0000 (17:28 +0000)]

Merge "Remove vestigial "Choose date format" option."

commit | commitdiff | tree

PauloftheWest [Mon, 17 Nov 2014 16:23:47 +0000 (16:23 +0000)]

am 5cf2b43f: am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev

* commit '5cf2b43f914fa3268d1adf8abace74f34d651baf':
Added tabs for Multi-SIM SIM Lock.

commit | commitdiff | tree

PauloftheWest [Mon, 17 Nov 2014 16:20:14 +0000 (16:20 +0000)]

am de16eb6e: am acb160ba: Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev

* commit 'de16eb6e5346714a57973095f4d1854aa13f54bd':
Added tabs for Multi-SIM SIM Lock.

commit | commitdiff | tree

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.

commit | commitdiff | tree

PauloftheWest [Mon, 17 Nov 2014 16:12:43 +0000 (16:12 +0000)]

Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev

commit | commitdiff | tree

Paul Crowley [Mon, 17 Nov 2014 13:42:16 +0000 (13:42 +0000)]

am e722c375: am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev

* commit 'e722c375df0155c581cb3eb79f4fcc5f8891d738':
Force power cycle on cooldown.

commit | commitdiff | tree

Paul Crowley [Mon, 17 Nov 2014 13:38:37 +0000 (13:38 +0000)]

am 807386b7: am bf88566d: Merge "Force power cycle on cooldown." into lmp-mr1-dev

* commit '807386b79097369136e1c00c5a4a56e99659fa94':
Force power cycle on cooldown.