OSDN Git Service
Andres Morales [Wed, 7 Jan 2015 16:37:55 +0000 (16:37 +0000)]
am
dfb448d2: am
f58a646b: am
f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
* commit '
dfb448d23ec666f9fdbb1ee44ccaef12ea98a80c':
Don't display Write NFC option if no NFC
Andres Morales [Wed, 7 Jan 2015 16:31:57 +0000 (16:31 +0000)]
am
f58a646b: am
f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
* commit '
f58a646bc01cc8d416d5babae2d06dad5018cc6d':
Don't display Write NFC option if no NFC
Andres Morales [Wed, 7 Jan 2015 16:26:19 +0000 (16:26 +0000)]
am
f11feccf: Merge "Don\'t display Write NFC option if no NFC" into lmp-mr1-dev
* commit '
f11feccf99948d166e6873315252fdaf416ae272':
Don't display Write NFC option if no NFC
Andres Morales [Wed, 7 Jan 2015 16:21:47 +0000 (16:21 +0000)]
Merge "Don't display Write NFC option if no NFC" into lmp-mr1-dev
Geoff Mendal [Wed, 7 Jan 2015 14:40:59 +0000 (14:40 +0000)]
Merge "Import translations. DO NOT MERGE"
Geoff Mendal [Wed, 7 Jan 2015 14:39:51 +0000 (14:39 +0000)]
am
634b1706: (-s ours) am
0347196c: (-s ours) am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
634b17063b79167ae0c0459afa7b528d933c4011':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:34:44 +0000 (14:34 +0000)]
am
620a5bd0: (-s ours) am
51aedf86: (-s ours) Import translations. DO NOT MERGE
* commit '
620a5bd077c7077058f460af5025ad7d2cd94758':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:34:03 +0000 (14:34 +0000)]
am
0347196c: (-s ours) am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
0347196c6992e490be74c2a4015bc6cd64504f15':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:32:58 +0000 (06:32 -0800)]
Import translations. DO NOT MERGE
Change-Id: I1e314926eb51781537d45825f1b2ec7178a73969
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Jan 2015 14:29:23 +0000 (14:29 +0000)]
am
51aedf86: (-s ours) Import translations. DO NOT MERGE
* commit '
51aedf86037f027898ec279befe869c80ef9730c':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:28:07 +0000 (14:28 +0000)]
am
1dcc3e5c: (-s ours) Import translations. DO NOT MERGE
* commit '
1dcc3e5ca900cb8f6d03d018ed2b78c70d057ba0':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 7 Jan 2015 14:22:13 +0000 (06:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I6ad655aeb29d245a44a42ccb3f8d43d84a47d422
Auto-generated-cl: translation import
Geoff Mendal [Wed, 7 Jan 2015 14:14:40 +0000 (06:14 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
Mikhail Naganov [Wed, 7 Jan 2015 12:56:04 +0000 (12:56 +0000)]
am
8ada2c53: am
2399c450: am
59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
* commit '
8ada2c53b9322b7c95aff818e251cb31850ed124':
Add an item to "Legal information" screen for WebView license
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:56:03 +0000 (12:56 +0000)]
am
c374175f: am
d4e7dcb9: am
15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
* commit '
c374175f61aff876f895cf15664ea66f54978aaf':
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
Mikhail Naganov [Wed, 7 Jan 2015 12:50:04 +0000 (12:50 +0000)]
am
2399c450: am
59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
* commit '
2399c4500c5801cead4ce89132751fd21551213a':
Add an item to "Legal information" screen for WebView license
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:50:02 +0000 (12:50 +0000)]
am
d4e7dcb9: am
15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
* commit '
d4e7dcb9d55ae5d5c0196f6e77c05a8d02698e16':
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
Mikhail Naganov [Wed, 7 Jan 2015 12:40:43 +0000 (12:40 +0000)]
am
59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
* commit '
59f4d20b2e818c56e30b9a6e9fa6b693aaad7bbf':
Add an item to "Legal information" screen for WebView license
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:40:42 +0000 (12:40 +0000)]
am
15e2c54a: Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
* commit '
15e2c54a2f4b75812b04bb32c6feb58158f0f318':
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
Mikhail Naganov [Wed, 7 Jan 2015 12:33:28 +0000 (12:33 +0000)]
Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
Zoltan Szatmary-Ban [Wed, 7 Jan 2015 12:31:55 +0000 (12:31 +0000)]
Merge "Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials" into lmp-mr1-dev
Alexandra Gherghina [Wed, 7 Jan 2015 08:59:12 +0000 (08:59 +0000)]
Merge "Remove call to deprecated getBackgroundDataSetting()"
Sanket Padawe [Tue, 6 Jan 2015 21:02:23 +0000 (21:02 +0000)]
am
310b5336: am
2c9d75a7: am
be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
* commit '
310b533689ac9ecd6ee3e9abbd4029882522358f':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Sanket Padawe [Tue, 6 Jan 2015 20:56:36 +0000 (20:56 +0000)]
am
2c9d75a7: am
be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
* commit '
2c9d75a7c379c07bf84bfc87cbe4d1a4666bfc47':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Mikhail Naganov [Mon, 15 Dec 2014 17:09:50 +0000 (17:09 +0000)]
Add an item to "Legal information" screen for WebView license
Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.
Bug:
18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
Sanket Padawe [Tue, 6 Jan 2015 20:51:17 +0000 (20:51 +0000)]
am
be3b0c4e: Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
* commit '
be3b0c4ec09b90bbcc7284f008599479ba52c240':
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Sanket Padawe [Tue, 6 Jan 2015 20:46:16 +0000 (20:46 +0000)]
Merge "Fixed crash caused by non-integer phoneAccountId in SimDialogActivity." into lmp-mr1-dev
Sanket Padawe [Tue, 6 Jan 2015 18:54:55 +0000 (10:54 -0800)]
Fixed crash caused by non-integer phoneAccountId in SimDialogActivity.
Bug:
18834691
Change-Id: I75b5ba4d72523474fe91eaf80f8201d9a53a683a
Andres Morales [Tue, 6 Jan 2015 17:38:53 +0000 (09:38 -0800)]
Don't display Write NFC option if no NFC
Bug:
18830151
Change-Id: Id5a06e6d98380f509307a6819494255524755ab1
Alexandra Gherghina [Mon, 5 Jan 2015 09:58:14 +0000 (09:58 +0000)]
Remove call to deprecated getBackgroundDataSetting()
It seems that the setting is now enforced at the network level (see
NetworkPolicyManagerService).
Bug:
15848128
Change-Id: Ie7d178bab8ebb133f78cb5356ee1c27fbe61ba05
Sanket Padawe [Mon, 5 Jan 2015 22:46:14 +0000 (14:46 -0800)]
Grey out sim select dialog for Calls when only 1 phoneAccount exists
Bug:
18685720
Change-Id: Id7c8f756fd958fc81086a0166f1b0423c62e2569
Amith Yamasani [Mon, 5 Jan 2015 21:10:11 +0000 (21:10 +0000)]
am
0eda0765: am
43bdc5cd: am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
0eda07657aad4a05d50896410ab56b48570e7d57':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 21:03:29 +0000 (21:03 +0000)]
am
43bdc5cd: am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
43bdc5cdcf520fb0cae3b2fb2598d13957f1a770':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 20:57:57 +0000 (20:57 +0000)]
am
10fb4f80: Merge "Fix theme for empty activity" into lmp-mr1-dev
* commit '
10fb4f80ae31b27fb563d3139fa2cc90f0a9aad8':
Fix theme for empty activity
Amith Yamasani [Mon, 5 Jan 2015 20:54:04 +0000 (20:54 +0000)]
Merge "Fix theme for empty activity" into lmp-mr1-dev
Zoltan Szatmary-Ban [Mon, 5 Jan 2015 16:41:35 +0000 (16:41 +0000)]
Check DISALLOW_CONFIG_CREDENTIALS on Settings > Trusted Credentials
Remove the enable/disable button in certificate setting dialog if restriction
has been put on the respective profile. Also catch security exception just in
case.
Bug:
18899182
Change-Id: Ia247ab264c1b2d08b58456519bf471ba8c727745
Geoff Mendal [Mon, 5 Jan 2015 14:36:40 +0000 (14:36 +0000)]
am
08f6d923: (-s ours) am
a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
08f6d92343e0fb8d03aae1b369797166a2e56870':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:36:39 +0000 (14:36 +0000)]
am
cb84797d: (-s ours) am
353c5b50: (-s ours) am
7e669a0a: (-s ours) Import translations. DO NOT MERGE
* commit '
cb84797d86db4e386a477c3ac569c28aee10ddd0':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:34:10 +0000 (06:34 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib29187f3cc18e0b6774a65b7fc34623fd290c0f9
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Jan 2015 14:31:06 +0000 (14:31 +0000)]
am
a5aa9acc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
a5aa9accbf96f3295d086e8e226e30827f70519e':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:31:05 +0000 (14:31 +0000)]
am
353c5b50: (-s ours) am
7e669a0a: (-s ours) Import translations. DO NOT MERGE
* commit '
353c5b5010396152cdc8b9bb7f5717c0ac8a1296':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:29:56 +0000 (14:29 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 5 Jan 2015 14:27:37 +0000 (14:27 +0000)]
am
7e669a0a: (-s ours) Import translations. DO NOT MERGE
* commit '
7e669a0ae5d9590c69aa59806fbce8b53052b46f':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 5 Jan 2015 14:23:03 +0000 (06:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ia39277fe2bc9e2c171eec7349b5e829787311c84
Auto-generated-cl: translation import
Geoff Mendal [Mon, 5 Jan 2015 14:15:47 +0000 (06:15 -0800)]
Import translations. DO NOT MERGE
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
Baligh Uddin [Tue, 30 Dec 2014 12:14:29 +0000 (12:14 +0000)]
am
c0b5d542: (-s ours) Import translations. DO NOT MERGE automerge:
c3068f0 -s ours automerge:
9602ba3 -s ours
* commit '
c0b5d542b6f68dfcd0c90496d487986c9727da84':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 12:14:28 +0000 (12:14 +0000)]
am
617918d6: (-s ours) Import translations. DO NOT MERGE automerge:
ad3b94f -s ours
* commit '
617918d61b3023d2f6910b4097ea1b772612372c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 03:15:42 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE automerge:
c3068f0 -s ours
automerge:
9602ba3 -s ours
* commit '
9602ba376289d130d0e86a454a6740456cec616e':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 03:15:29 +0000 (03:15 +0000)]
Import translations. DO NOT MERGE
automerge:
ad3b94f -s ours
* commit '
ad3b94fbdea2364b3c89e5a8409acf623675a20a':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 00:53:43 +0000 (00:53 +0000)]
Import translations. DO NOT MERGE
automerge:
c3068f0 -s ours
* commit '
c3068f078887f3357b498a0851591c324d3c55d5':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Dec 2014 00:01:35 +0000 (00:01 +0000)]
Merge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 29 Dec 2014 23:23:00 +0000 (15:23 -0800)]
Import translations. DO NOT MERGE
Change-Id: Ib8589ead8d33840685d974638bf09e97ca7ce66d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Dec 2014 23:11:40 +0000 (15:11 -0800)]
Import translations. DO NOT MERGE
Change-Id: I2a95cc3df31da8342436e918b02792d4624e5e88
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Dec 2014 22:59:54 +0000 (14:59 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
Prem Kumar [Mon, 29 Dec 2014 17:33:22 +0000 (17:33 +0000)]
am
5aebac31: am
70c4a7b1: am
531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
* commit '
5aebac31e8b0eb5bf914a822782515969949d507':
SIM Status now shows data connection instead of voice.
Sanket Padawe [Mon, 29 Dec 2014 17:25:33 +0000 (17:25 +0000)]
am
d1724df6: am
9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev automerge:
f128cff
* commit '
d1724df60235b33534a02dd3cc445e6b761f43e3':
Fixed settings crash issue while recovering from phone crash.
Prem Kumar [Mon, 29 Dec 2014 17:24:52 +0000 (17:24 +0000)]
am
70c4a7b1: am
531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
* commit '
70c4a7b145c4949761e0f13642c535d1bf3c810e':
SIM Status now shows data connection instead of voice.
Prem Kumar [Mon, 29 Dec 2014 13:28:18 +0000 (13:28 +0000)]
am
531127a5: Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
* commit '
531127a5c2293e46e16fb9bc013078506c15122e':
SIM Status now shows data connection instead of voice.
Prem Kumar [Mon, 29 Dec 2014 13:23:49 +0000 (13:23 +0000)]
Merge "SIM Status now shows data connection instead of voice." into lmp-mr1-dev
Sanket Padawe [Sun, 28 Dec 2014 05:31:57 +0000 (05:31 +0000)]
am
9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
automerge:
f128cff
* commit '
f128cff21ef7b8e2fa7721b481477ffecd9244ab':
Fixed settings crash issue while recovering from phone crash.
Baligh Uddin [Wed, 24 Dec 2014 19:04:59 +0000 (19:04 +0000)]
am
ac379b54: (-s ours) am
8ac88edc: (-s ours) am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
ac379b544f9508cc10cbe48d9058cf65a3ad8123':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Dec 2014 19:04:56 +0000 (19:04 +0000)]
am
20c14041: (-s ours) am
6ccde759: (-s ours) Import translations. DO NOT MERGE
* commit '
20c1404198aa6948aee6374b29daa292f47c1cf6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Dec 2014 18:57:57 +0000 (18:57 +0000)]
am
8ac88edc: (-s ours) am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
8ac88edc032abfb3d1105f3f2b66ef5c39d1cf8f':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Dec 2014 18:57:55 +0000 (18:57 +0000)]
am
6ccde759: (-s ours) Import translations. DO NOT MERGE
* commit '
6ccde759cb6ca078ed47696b1cb7092e6ff96927':
Import translations. DO NOT MERGE
Sanket Padawe [Tue, 23 Dec 2014 03:39:18 +0000 (03:39 +0000)]
am
9b1383a4: Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
* commit '
9b1383a46dadd60ed89561083b01666242d457dd':
Fixed settings crash issue while recovering from phone crash.
Sanket Padawe [Tue, 23 Dec 2014 03:35:22 +0000 (03:35 +0000)]
Merge "Fixed settings crash issue while recovering from phone crash." into lmp-mr1-dev
Sanket Padawe [Mon, 22 Dec 2014 18:33:49 +0000 (10:33 -0800)]
Fixed settings crash issue while recovering from phone crash.
Bug:
18816868
Change-Id: I2b3015f563aed2d997a3a5466ca8f0689fc53ddb
Baligh Uddin [Mon, 22 Dec 2014 17:46:47 +0000 (17:46 +0000)]
am
e957cb47: (-s ours) Import translations. DO NOT MERGE
* commit '
e957cb47a4d2bca7f5d3e8e925efae6269754cb3':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Dec 2014 17:12:51 +0000 (09:12 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0276ab183a6b8f4f2afef13961cd91e1e4593587
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Dec 2014 17:01:37 +0000 (09:01 -0800)]
Import translations. DO NOT MERGE
Change-Id: I3f4b4d374faee184252c651295a6298c621fbcfd
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Dec 2014 16:50:56 +0000 (08:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
Maurice Lam [Sat, 20 Dec 2014 07:55:12 +0000 (07:55 +0000)]
am
9e1a3d6f: am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev automerge:
e24c760
* commit '
9e1a3d6fc58a99cdc15024d8447744e1eaff10ba':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 07:48:45 +0000 (07:48 +0000)]
am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
automerge:
e24c760
* commit '
e24c7605119312b0f8333c827663738fb2719e7b':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 01:23:53 +0000 (01:23 +0000)]
am
9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
* commit '
9ab9d1ec82047b74a6a4fc91ab5864086e715c35':
[WifiSetup] Fix text colors in dark theme
Maurice Lam [Sat, 20 Dec 2014 01:17:58 +0000 (01:17 +0000)]
Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
PauloftheWest [Fri, 19 Dec 2014 23:08:39 +0000 (23:08 +0000)]
am
68b93e68: am
1a5d132f: am
3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
* commit '
68b93e68e2cb1f3d45391da8bbc3a6d46115a28c':
Removed extraneous slot information on single SIM devices.
PauloftheWest [Fri, 19 Dec 2014 23:03:11 +0000 (23:03 +0000)]
am
1a5d132f: am
3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
* commit '
1a5d132fcbf6a00c500fb7031a1f15e0328e7dcb':
Removed extraneous slot information on single SIM devices.
PauloftheWest [Fri, 19 Dec 2014 22:57:11 +0000 (22:57 +0000)]
am
3e864c0b: Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
* commit '
3e864c0bdae3ff9801e04438b8347631b3153d6d':
Removed extraneous slot information on single SIM devices.
PauloftheWest [Fri, 19 Dec 2014 22:53:03 +0000 (22:53 +0000)]
Merge "Removed extraneous slot information on single SIM devices." into lmp-mr1-dev
Maurice Lam [Fri, 19 Dec 2014 19:52:52 +0000 (11:52 -0800)]
[WifiSetup] Fix text colors in dark theme
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.
Bug:
18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
Zoltan Szatmary-Ban [Fri, 19 Dec 2014 10:24:00 +0000 (10:24 +0000)]
Merge "Badge items in Settings > Apps > Running correctly"
Fyodor Kupolov [Fri, 19 Dec 2014 01:47:13 +0000 (01:47 +0000)]
Merge "Remove Users & profiles header for phones"
Sanket Padawe [Thu, 18 Dec 2014 23:20:44 +0000 (23:20 +0000)]
am
ec3f7998: am
eec0c11a: am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
ec3f7998dbf2d700fde9c86bc9957ee1fb6204f6':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 23:20:18 +0000 (23:20 +0000)]
am
25f2cfe9: am
72cedc7a: am
c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
* commit '
25f2cfe94ecc7d05c3c1a74c2e210fffcfc137e1':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
Sanket Padawe [Thu, 18 Dec 2014 23:20:16 +0000 (23:20 +0000)]
am
2497b44a: am
cff282f3: am
080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
* commit '
2497b44ab0dac4d16145f6e0cae5708354506955':
Getting mcc/mnc from system prop instead of subInfoRecord.
PauloftheWest [Thu, 18 Dec 2014 23:02:39 +0000 (15:02 -0800)]
Removed extraneous slot information on single SIM devices.
Bug:
18803333
Change-Id: If18f898839a1b7927a8db3b225549d4e4e073fdc
PauloftheWest [Thu, 18 Dec 2014 21:59:04 +0000 (13:59 -0800)]
SIM Status now shows data connection instead of voice.
Bug:
18714691
Change-Id: Ia2e9642d3331126a040ae1a059300df65d9551b9
Sanket Padawe [Thu, 18 Dec 2014 18:43:55 +0000 (18:43 +0000)]
am
eec0c11a: am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
eec0c11ae3386284dd6797076764572efeca52c3':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 18:38:52 +0000 (18:38 +0000)]
am
19627ca2: Getting mcc/mnc from system prop instead of subInfoRecord.
* commit '
19627ca215fa643a443722f183f3f781d4a2b041':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 18:29:16 +0000 (10:29 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idb4c70c9b936a947460e6c6d03bd40dc2ae4279a
Amith Yamasani [Wed, 17 Dec 2014 18:52:52 +0000 (10:52 -0800)]
Fix theme for empty activity
Avoids janky transition when confirmation of device credential
is requested.
Bug:
18637426
Change-Id: I3645e180e50f570d6d09d649978064fa5adf7755
Sanket Padawe [Thu, 18 Dec 2014 06:38:28 +0000 (06:38 +0000)]
am
72cedc7a: am
c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
* commit '
72cedc7af53483dea41eb391613b94b6f0a7226e':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
Sanket Padawe [Thu, 18 Dec 2014 06:33:06 +0000 (06:33 +0000)]
am
c4cc07b2: Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
* commit '
c4cc07b2c7f91cdb3695c499f7dca17b8aa9cb6b':
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
Sanket Padawe [Thu, 18 Dec 2014 06:28:08 +0000 (06:28 +0000)]
Merge "Revert "Getting mcc/mnc from system prop instead of subInfoRecord."" into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 06:24:36 +0000 (06:24 +0000)]
Revert "Getting mcc/mnc from system prop instead of subInfoRecord."
This reverts commit
579b66f28da710b5a1e68e211f5bd54ea466ab8b.
Change-Id: I0b142b40c697992b60bca9020673a0828ec44977
Sanket Padawe [Thu, 18 Dec 2014 05:04:12 +0000 (05:04 +0000)]
am
cff282f3: am
080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
* commit '
cff282f3fc81c401a873cdf87ff399b8be28f90b':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 04:58:46 +0000 (04:58 +0000)]
am
080674e6: Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
* commit '
080674e6da8e3db392a2a9e96a00cfc8e4635d00':
Getting mcc/mnc from system prop instead of subInfoRecord.
Sanket Padawe [Thu, 18 Dec 2014 04:53:33 +0000 (04:53 +0000)]
Merge "Getting mcc/mnc from system prop instead of subInfoRecord." into lmp-mr1-dev
Sanket Padawe [Thu, 18 Dec 2014 03:31:30 +0000 (19:31 -0800)]
Getting mcc/mnc from system prop instead of subInfoRecord.
Bug:
18781129
Change-Id: Idefe2dfc26bef2bba2b5b1792bb5ac43a44aa6cc
Fyodor Kupolov [Mon, 8 Dec 2014 22:15:36 +0000 (14:15 -0800)]
Remove Users & profiles header for phones
In Settings/Users, remove "Users & profiles" header is no longer displayed
for phones. List of UserPreference is now explicitly sorted. Before, it
was relying on an overridden compareTo method in UserPreference, which
behavior was difficult to predict when instances of UserPreference were
mixed with other instances in the same group.
Bug:
17630523
Change-Id: Iba1ef863c2cd4e8ca307ae0aa0877c5cd9e0973d