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

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: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: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 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

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: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: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: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: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 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

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: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 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: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: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: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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

Paul Crowley [Mon, 17 Nov 2014 13:29:48 +0000 (13:29 +0000)]

Merge "Force power cycle on cooldown." into lmp-mr1-dev

commit | commitdiff | tree

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

am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-dev
automerge: ce52a4b

* commit 'ce52a4bcbb267c1a7e526787f0a8f92e12e1d406':
Fix Sim Setting OOB error.

am b4e9a055: Merge "Fix Sim Setting OOB error." into lmp-mr1-dev

* commit 'b4e9a055bf5c59c1b7f42f73c7572f865d318994':
Fix Sim Setting OOB error.

Merge "Fix Sim Setting OOB error." into lmp-mr1-dev

commit | commitdiff | tree

Amith Yamasani [Sat, 15 Nov 2014 01:25:33 +0000 (01:25 +0000)]

am c395b9f3: Merge "Don\'t show SMS app settings for restricted profiles" into lmp-mr1-dev
automerge: 0fc76ae

* commit '0fc76aea99aae033e6d213c673b7d4b0460d91ab':
Don't show SMS app settings for restricted profiles

commit | commitdiff | tree

Jeff Davidson [Sat, 15 Nov 2014 01:24:18 +0000 (01:24 +0000)]

am c01754ba: Merge "Final UX for Wi-Fi assistant platform settings." into lmp-mr1-dev
automerge: 0ae8d5c

* commit '0ae8d5caa854199cbf727e89940b8a408b34dc8c':
Final UX for Wi-Fi assistant platform settings.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

John Spurlock [Fri, 14 Nov 2014 22:56:18 +0000 (22:56 +0000)]

am fdebfc35: Settings: Add effects suppression text to Ring volume.
automerge: d099aa6

* commit 'd099aa62ef1437dd5bb71e7b8e68885f7a1d7cc0':
Settings: Add effects suppression text to Ring volume.

commit | commitdiff | tree

Jeff Sharkey [Fri, 14 Nov 2014 21:47:04 +0000 (21:47 +0000)]

am c88cdea2: Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev
automerge: f685335

* commit 'f6853357ac029ad82e99442066d5b6adc1286a06':
Migrate license display to HTMLViewer.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

Jeff Sharkey [Fri, 14 Nov 2014 19:24:42 +0000 (19:24 +0000)]

Merge "Migrate license display to HTMLViewer." into lmp-mr1-dev

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
Change-Id: Ic9e903eceab3c096426f313bf4ef3a38644774e1

commit | commitdiff | tree

PauloftheWest [Tue, 11 Nov 2014 14:42:54 +0000 (06:42 -0800)]

Added tabs for Multi-SIM SIM Lock.

Bug: 18147652
Change-Id: I89d3ffb0b1451d263d7c913ac210d52d5308f3c0

commit | commitdiff | tree

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

commit | commitdiff | tree

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

am 983253d1: am e464d9b9: Merge "Forward wifi cert install intents to primary user" into lmp-mr1-dev

* commit '983253d18acef74ea1f35e20085e8fb1b5fe2265':
Forward wifi cert install intents to primary user

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