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

Selim Cinek [Tue, 25 Nov 2014 15:21:43 +0000 (15:21 +0000)]

am 51a36c67: am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev

* commit '51a36c67666abd40188fdd182192a78c436c349e':
Fixed build breakage due to api change.

commit | commitdiff | tree

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

am 7a2e5f1b: am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev

* commit '7a2e5f1b0370ce2f84b298659d3220ae592b1f74':
Stop background processes if TrustedCredentialSettings fragment gets detached

commit | commitdiff | tree

Selim Cinek [Tue, 25 Nov 2014 15:08:14 +0000 (15:08 +0000)]

am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev

* commit '2a65b1b105b6b1b0ea8f8b82df6833f2eadca5bd':
Fixed build breakage due to api change.

commit | commitdiff | tree

Zoltan Szatmary-Ban [Tue, 25 Nov 2014 15:08:02 +0000 (15:08 +0000)]

am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev

* commit '4a30d627a25f2e6cf3d699c4949919aae7ca7063':
Stop background processes if TrustedCredentialSettings fragment gets detached

commit | commitdiff | tree

Geoff Mendal [Mon, 24 Nov 2014 18:34:51 +0000 (18:34 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Mon, 24 Nov 2014 18:31:25 +0000 (10:31 -0800)]

Import translations. DO NOT MERGE

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

commit | commitdiff | tree

Wink Saville [Mon, 24 Nov 2014 18:12:18 +0000 (18:12 +0000)]

am c1ded7e2: am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev

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

commit | commitdiff | tree

Lajos Molnar [Mon, 24 Nov 2014 18:12:16 +0000 (18:12 +0000)]

am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

* commit '8b2c19b5780bc2dedb51982b2a40c573e1c86157':
Reword NuPlayer developer settings to say AwesomePlayer

commit | commitdiff | tree

Andres Morales [Mon, 24 Nov 2014 18:12:15 +0000 (18:12 +0000)]

am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev

* commit '877e9de67b69c77bd34452c28b1b0a4739da1d90':
Update enable oem unlock warning

commit | commitdiff | tree

Wink Saville [Mon, 24 Nov 2014 18:05:59 +0000 (18:05 +0000)]

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

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

commit | commitdiff | tree

Lajos Molnar [Mon, 24 Nov 2014 18:05:54 +0000 (18:05 +0000)]

am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
Reword NuPlayer developer settings to say AwesomePlayer

commit | commitdiff | tree

Andres Morales [Mon, 24 Nov 2014 18:05:33 +0000 (18:05 +0000)]

am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev

* commit 'e6d4aba3e1686084833a09d1fcdabf91fc35b0b6':
Update enable oem unlock warning

commit | commitdiff | tree

Narayan Kamath [Mon, 24 Nov 2014 16:11:43 +0000 (16:11 +0000)]

am 0d9fece9: am eb7795ed: Merge "Use shortFormat instead of shortFormat4."

* commit '0d9fece9e82f92e45c118c4b89d02517c05221d8':
Use shortFormat instead of shortFormat4.

commit | commitdiff | tree

Narayan Kamath [Mon, 24 Nov 2014 16:07:21 +0000 (16:07 +0000)]

am eb7795ed: Merge "Use shortFormat instead of shortFormat4."

* commit 'eb7795ed31ee84c5569490b0949ea271865de7d8':
Use shortFormat instead of shortFormat4.

commit | commitdiff | tree

Narayan Kamath [Mon, 24 Nov 2014 15:59:15 +0000 (15:59 +0000)]

Merge "Use shortFormat instead of shortFormat4."

commit | commitdiff | tree

Selim Cinek [Mon, 24 Nov 2014 13:39:38 +0000 (13:39 +0000)]

am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev

* commit '44b50ad313e827f03391ebac47f3db6308b52d42':
Fixed build breakage due to api change.

commit | commitdiff | tree

Selim Cinek [Mon, 24 Nov 2014 13:35:53 +0000 (13:35 +0000)]

Merge "Fixed build breakage due to api change." into lmp-mr1-dev

commit | commitdiff | tree

Selim Cinek [Mon, 24 Nov 2014 13:09:51 +0000 (14:09 +0100)]

Fixed build breakage due to api change.

Bug: 16239208
Change-Id: I9c2b13d3687f9f61307e0c13b6940425faebfa9f

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:13:10 +0000 (12:13 +0000)]

am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev

* commit '6ad8579262dbc059472a2cbe1ff4b675f01e4268':
Stop background processes if TrustedCredentialSettings fragment gets detached

commit | commitdiff | tree

Zoltan Szatmary-Ban [Mon, 24 Nov 2014 12:08:00 +0000 (12:08 +0000)]

Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev

commit | commitdiff | tree

Wink Saville [Sat, 22 Nov 2014 20:22:57 +0000 (20:22 +0000)]

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

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

commit | commitdiff | tree

Wink Saville [Sat, 22 Nov 2014 20:19:54 +0000 (20:19 +0000)]

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

commit | commitdiff | tree

Wink Saville [Sat, 22 Nov 2014 18:11:39 +0000 (10:11 -0800)]

Additional changes to SubscriptionManager API as per API council.

bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62

commit | commitdiff | tree

Lajos Molnar [Sat, 22 Nov 2014 06:51:13 +0000 (06:51 +0000)]

am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer

* commit 'c3245a0555fbd9b02407edebfdac386a62a4af0a':
Reword NuPlayer developer settings to say AwesomePlayer

commit | commitdiff | tree

Lajos Molnar [Sat, 22 Nov 2014 05:01:40 +0000 (21:01 -0800)]

Reword NuPlayer developer settings to say AwesomePlayer

Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c

commit | commitdiff | tree

Andres Morales [Sat, 22 Nov 2014 03:32:52 +0000 (03:32 +0000)]

am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev

* commit '7090c92f3933238a06a6d799e49ae6b13d09cbb4':
Update enable oem unlock warning

commit | commitdiff | tree

Andres Morales [Sat, 22 Nov 2014 03:28:44 +0000 (03:28 +0000)]

Merge "Update enable oem unlock warning" into lmp-mr1-dev

commit | commitdiff | tree

Andres Morales [Wed, 19 Nov 2014 21:55:44 +0000 (13:55 -0800)]

Update enable oem unlock warning

updating the strings from bug previously fixed

Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6

commit | commitdiff | tree

Sanket Padawe [Sat, 22 Nov 2014 00:00:31 +0000 (00:00 +0000)]

am ed98052c: am db494098: am 9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev

* commit 'ed98052cf2a104b650a00d13ac0ee2334fbc8af3':
Changing sim selection dialog in Settings to use phoneAccount

commit | commitdiff | tree

Sanket Padawe [Sat, 22 Nov 2014 00:00:30 +0000 (00:00 +0000)]

am 626d1fc0: am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev

* commit '626d1fc0f78aa634778b7cc1ac860c35f6a83213':
Changing hint string inside sim name editor dialog in settings.

commit | commitdiff | tree

Sanket Padawe [Fri, 21 Nov 2014 23:42:07 +0000 (23:42 +0000)]

am db494098: am 9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev

* commit 'db4940988ddabb8f6c1768cb56ed3e7fa62a990d':
Changing sim selection dialog in Settings to use phoneAccount

commit | commitdiff | tree

Sanket Padawe [Fri, 21 Nov 2014 23:42:05 +0000 (23:42 +0000)]

am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev

* commit 'c7e62cf149e98fe9da6f17e1dc43a7bb9ba256dc':
Changing hint string inside sim name editor dialog in settings.

commit | commitdiff | tree

Sanket Padawe [Fri, 21 Nov 2014 23:37:47 +0000 (23:37 +0000)]

am 9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev

* commit '9209ce852ab7fbed10772af20aa7ff75ec69a96c':
Changing sim selection dialog in Settings to use phoneAccount

commit | commitdiff | tree

Sanket Padawe [Fri, 21 Nov 2014 23:37:46 +0000 (23:37 +0000)]

am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev

* commit 'cd1846fa6bed76532bc66182fe6a9a87e6e7edd6':
Changing hint string inside sim name editor dialog in settings.

commit | commitdiff | tree

Sanket Padawe [Fri, 21 Nov 2014 23:34:31 +0000 (23:34 +0000)]

Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev

commit | commitdiff | tree

Sanket Padawe [Fri, 21 Nov 2014 23:32:50 +0000 (23:32 +0000)]

Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev

commit | commitdiff | tree

Lucky Zhang [Fri, 21 Nov 2014 23:13:37 +0000 (23:13 +0000)]

am d0d76e56: am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev

* commit 'd0d76e56af9c75b75d8f08c2ba77577e2745a382':
[SetupWizard] Warn user of missing FRP if skipping wi-fi

commit | commitdiff | tree

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

Lucky Zhang [Fri, 21 Nov 2014 21:48:06 +0000 (21:48 +0000)]

am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev

* commit '37c3cd63a83a5e49686fc1eae25b2b2fc188991f':
[SetupWizard] Warn user of missing FRP if skipping wi-fi

commit | commitdiff | tree

Lucky Zhang [Fri, 21 Nov 2014 21:44:47 +0000 (21:44 +0000)]

am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev

* commit '0e606a2a301b91669af59e61f3e607463d49ed56':
[SetupWizard] Warn user of missing FRP if skipping wi-fi

commit | commitdiff | tree

Lucky Zhang [Fri, 21 Nov 2014 21:40:43 +0000 (21:40 +0000)]

Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev

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

Lucky Zhang [Thu, 20 Nov 2014 04:36:48 +0000 (20:36 -0800)]

[SetupWizard] Warn user of missing FRP if skipping wi-fi

Change the skip string in wifi settings to warn user of missing
out on device protection.

Bug: 18391349
Change-Id: Ica2434589ece60205cd9a06088a8eb65d5edfd0d

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

Sanket Padawe [Thu, 20 Nov 2014 00:50:28 +0000 (16:50 -0800)]

Changing hint string inside sim name editor dialog in settings.

Chaning hint string from "Enter SSID" to "Enter SIM name" inside sim name
editor dialog in sim settings.

Bug: 18455476
Change-Id: I3ac58e23a23d6afa31b84ec1296623e0443f3cff

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

Sanket Padawe [Wed, 19 Nov 2014 18:38:20 +0000 (10:38 -0800)]

Changing sim selection dialog in Settings to use phoneAccount

Changing sim selection dialog in Settings UI to select Call to display icons using
phoneAccount.

Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb

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