OSDN Git Service
Geoff Mendal [Mon, 1 Dec 2014 14:49:25 +0000 (06:49 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ibcb289b8a0129d1c7c56151febfecd991ccf534e
Auto-generated-cl: translation import
Jeff Davidson [Wed, 26 Nov 2014 23:46:46 +0000 (23:46 +0000)]
am
2d93f36f: Add string for "Connected via Wi-Fi assistant".
* commit '
2d93f36f00226a45adf9ad2f001e599f95e61692':
Add string for "Connected via Wi-Fi assistant".
Jeff Davidson [Wed, 26 Nov 2014 23:37:07 +0000 (15:37 -0800)]
Add string for "Connected via Wi-Fi assistant".
Bug:
18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
Geoff Mendal [Wed, 26 Nov 2014 14:57:45 +0000 (14:57 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Wed, 26 Nov 2014 14:50:01 +0000 (14:50 +0000)]
am
645cf17f: (-s ours) Import translations. DO NOT MERGE
* commit '
645cf17f68bbf8580d9cc01a0527445c1c78e74d':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 26 Nov 2014 14:38:44 +0000 (06:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: Id6429feb2f156602b611e6578f624f30ff1997b7
Auto-generated-cl: translation import
Geoff Mendal [Wed, 26 Nov 2014 14:25:44 +0000 (06:25 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ic5aaf08bc81e92023a18aafa0e5dde54adf8ea05
Auto-generated-cl: translation import
Maurice Lam [Wed, 26 Nov 2014 01:46:27 +0000 (01:46 +0000)]
am
3f9d8b60: Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
* commit '
3f9d8b60ca9d3815736a4e11d17565fe18524a28':
[Setup] Theme ChooseLockGeneric for setup wizard
Maurice Lam [Wed, 26 Nov 2014 01:15:35 +0000 (01:15 +0000)]
Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev
Maurice Lam [Tue, 25 Nov 2014 22:06:38 +0000 (14:06 -0800)]
[Setup] Theme ChooseLockGeneric for setup wizard
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.
ag/594000 is a much more comprehensive change for what the final
change will look like.
Bug:
18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
Fabrice Di Meglio [Wed, 26 Nov 2014 00:37:43 +0000 (00:37 +0000)]
am
09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
* commit '
09d276371560a8e20e80a7f05a6807b5b8f0ace3':
IllegalStateException fixed in print service settings
Fabrice Di Meglio [Wed, 26 Nov 2014 00:31:49 +0000 (00:31 +0000)]
Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev
Raju Yadav [Tue, 25 Nov 2014 12:26:17 +0000 (13:26 +0100)]
IllegalStateException fixed in print service settings
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).
Change-Id: I96052f95689ae17dd1b4e9d1c313100b7b47a599
Adrian Roos [Tue, 25 Nov 2014 15:04:25 +0000 (15:04 +0000)]
am
647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev
* commit '
647f9752ce1bdd4c02cd44028dac769369140764':
Don't show RedactionInterstitial when changing password
Adrian Roos [Tue, 25 Nov 2014 14:59:59 +0000 (14:59 +0000)]
Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev
Lucky Zhang [Mon, 24 Nov 2014 20:01:20 +0000 (20:01 +0000)]
am
74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
* commit '
74896d6f1d6e2b5507f3e1b2c6d40d6ae1bfde37':
[WifiSetup] Wifi setup text wrapping problem
Lucky Zhang [Mon, 24 Nov 2014 19:33:12 +0000 (19:33 +0000)]
Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev
Geoff Mendal [Mon, 24 Nov 2014 18:27:37 +0000 (18:27 +0000)]
am
faf1dd20: (-s ours) Import translations. DO NOT MERGE
* commit '
faf1dd2062390250f4622583dc651e5dd0685f6b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 24 Nov 2014 18:20:28 +0000 (10:20 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1f4c7ef53f323dfab3afc7978d7c90c05e5865a3
Auto-generated-cl: translation import
Geoff Mendal [Mon, 24 Nov 2014 18:07:28 +0000 (10:07 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib35d3ce45d8d18a16ea37d1348a64ac621a54b1f
Auto-generated-cl: translation import
Adrian Roos [Mon, 24 Nov 2014 16:17:13 +0000 (17:17 +0100)]
Don't show RedactionInterstitial when changing password
Only show when going from an insecure to secure lock.
Bug:
18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7
Paul Crowley [Mon, 24 Nov 2014 15:26:56 +0000 (15:26 +0000)]
am
95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
* commit '
95a28c3f10b3f9a2fdcebcd1019f97989e2393c5':
Reduce number of attempts before factory reset to 30.
Paul Crowley [Mon, 24 Nov 2014 15:21:55 +0000 (15:21 +0000)]
Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev
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.
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
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
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
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
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.
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
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
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
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
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
Andres Morales [Sat, 22 Nov 2014 03:28:44 +0000 (03:28 +0000)]
Merge "Update enable oem unlock warning" into lmp-mr1-dev
Lucky Zhang [Sat, 22 Nov 2014 02:33:50 +0000 (18:33 -0800)]
[WifiSetup] Wifi setup text wrapping problem
Fixed the text orientation for items in wifi settings on 600dp screens
in portrait mode. This bug only happens in such a setup, because
there is a mistake in the corresponding style file.
Bug:
18323509
Change-Id: I7ca6a3b27c8ab32481e02590f7ea78d452ab8090
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
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
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.
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
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
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
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
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
Maurice Lam [Fri, 21 Nov 2014 21:33:40 +0000 (21:33 +0000)]
Merge "[WifiSetup] Update title string" into lmp-mr1-dev
Maurice Lam [Fri, 21 Nov 2014 19:59:34 +0000 (11:59 -0800)]
[WifiSetup] Update title string
Bug:
17887844
Change-Id: I08df121e2c5a6bcb919d3b372df71c9df0983f43
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
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
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
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.
Zoltan Szatmary-Ban [Fri, 21 Nov 2014 15:10:23 +0000 (15:10 +0000)]
Strings for multiprofile Location Settings.
Bug:
17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
Paul Crowley [Fri, 21 Nov 2014 09:43:17 +0000 (09:43 +0000)]
Reduce number of attempts before factory reset to 30.
Bug:
18292029
Change-Id: I2a78775d0505a3064838443ea631fee0ad612e5c
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
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
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
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."
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
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.
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
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
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
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.
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
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
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
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
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
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
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
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
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
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
Geoff Mendal [Wed, 19 Nov 2014 19:31:02 +0000 (19:31 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
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
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
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
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
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
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
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
Zoltan Szatmary-Ban [Wed, 15 Oct 2014 12:01:05 +0000 (13:01 +0100)]
Stop background processes if TrustedCredentialSettings fragment gets detached
Otherwise getActivity() returns null and other nasty null pointer dereferencings happen.
Bug:
17976307
Change-Id: If867785f991217267e0bf0ad3058a62177509852
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
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
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.
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
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.
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
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
PauloftheWest [Mon, 17 Nov 2014 22:50:07 +0000 (22:50 +0000)]
Merge "Created Multi-SIM notifications." into lmp-mr1-dev
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
Geoff Mendal [Mon, 17 Nov 2014 22:13:18 +0000 (22:13 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
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
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
Geoff Mendal [Mon, 17 Nov 2014 22:06:47 +0000 (22:06 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
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
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.
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
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
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.
PauloftheWest [Mon, 17 Nov 2014 16:12:43 +0000 (16:12 +0000)]
Merge "Added tabs for Multi-SIM SIM Lock." into lmp-mr1-dev