OSDN Git Service
Jim Miller [Wed, 15 Oct 2014 21:17:23 +0000 (21:17 +0000)]
am
f3e5611c: am
1d050220: am
3ef52587: resolved conflicts for merge of
46c7f6d6 to lmp-sprout-dev
* commit '
f3e5611c54a686438a94365924b8a9ff76cbb793':
Add a checkbox option to 'require password to decrypt'
Jim Miller [Wed, 15 Oct 2014 21:13:41 +0000 (21:13 +0000)]
am
1d050220: am
3ef52587: resolved conflicts for merge of
46c7f6d6 to lmp-sprout-dev
* commit '
1d050220a0564b02bc1f4c33c5984a684a47bfa5':
Add a checkbox option to 'require password to decrypt'
Jim Miller [Wed, 15 Oct 2014 21:02:09 +0000 (21:02 +0000)]
am
3ef52587: resolved conflicts for merge of
46c7f6d6 to lmp-sprout-dev
* commit '
3ef52587da6fd91fc12164fd57100d6e352508ec':
Add a checkbox option to 'require password to decrypt'
Jim Miller [Wed, 15 Oct 2014 20:54:37 +0000 (13:54 -0700)]
resolved conflicts for merge of
46c7f6d6 to lmp-sprout-dev
Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62
Fabrice Di Meglio [Wed, 15 Oct 2014 02:31:34 +0000 (02:31 +0000)]
am
14d4f3de: am
5e916480: am
6b68b000: am
94dce761: Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
* commit '
14d4f3defc0a361931decc7743fe9fe2b445b4e7':
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
Fabrice Di Meglio [Wed, 15 Oct 2014 02:30:27 +0000 (02:30 +0000)]
am
156d30db: am
40103896: Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '
156d30db7cc8b5c925117c097f9f0ba6c897d753':
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Jason Monk [Wed, 15 Oct 2014 02:08:46 +0000 (02:08 +0000)]
am
0f45f64e: am
f3a1fae4: am
9e6c6b9f: am
eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit '
0f45f64efd21a08df8a8797e11187acec1aca591':
Update screen pinning strings to say Overview
Andres Morales [Wed, 15 Oct 2014 02:08:45 +0000 (02:08 +0000)]
am
0d4a8ce2: am
d3948a2e: am
1686335a: am
26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '
0d4a8ce26e40de04f90614c0a44124d9ef156026':
Set layout_width in WiFi+NFC resource
Jim Miller [Tue, 14 Oct 2014 01:15:17 +0000 (18:15 -0700)]
Add a checkbox option to 'require password to decrypt'
Fixes bug
17881324
Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
Fabrice Di Meglio [Wed, 15 Oct 2014 01:18:37 +0000 (01:18 +0000)]
am
5e916480: am
6b68b000: am
94dce761: Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
* commit '
5e91648077f8f0765aa8628d0e99accfe2f87383':
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
Fabrice Di Meglio [Wed, 15 Oct 2014 00:53:43 +0000 (00:53 +0000)]
am
6b68b000: am
94dce761: Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
* commit '
6b68b000da5db8df9228ae9f589dfb1f2b38759b':
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
Fabrice Di Meglio [Wed, 15 Oct 2014 00:44:23 +0000 (00:44 +0000)]
am
94dce761: Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
* commit '
94dce7618584b4ca51bf17937cbd6cb0c22aaaea':
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
Fabrice Di Meglio [Wed, 15 Oct 2014 00:39:57 +0000 (00:39 +0000)]
Merge "Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity" into lmp-dev
Fabrice Di Meglio [Wed, 15 Oct 2014 00:01:37 +0000 (00:01 +0000)]
am
40103896: Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '
40103896b08fbd4b8d191fc2805ec8f482d22d17':
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Tue, 14 Oct 2014 23:54:09 +0000 (23:54 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Fabrice Di Meglio [Tue, 14 Oct 2014 23:43:37 +0000 (16:43 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, use a Switch instead of a CheckBox for Developer Settings
Change-Id: I6a9b3fef879299a8ac5b57ff9c794b58022b79d9
Fabrice Di Meglio [Tue, 14 Oct 2014 01:59:34 +0000 (18:59 -0700)]
Fix bug #
17976062 Stability: ISE in Settings: Fragment ApnSettings{
4da9ae0} not attached to Activity
- prevent IllegalStateException
Change-Id: I63fa1bb6240c7ff82c04be938b72940049409dee
Jason Monk [Tue, 14 Oct 2014 23:12:23 +0000 (23:12 +0000)]
am
f3a1fae4: am
9e6c6b9f: am
eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit '
f3a1fae4b69e45949b17205b5f8526e7bf117e07':
Update screen pinning strings to say Overview
Andres Morales [Tue, 14 Oct 2014 23:11:21 +0000 (23:11 +0000)]
am
d3948a2e: am
1686335a: am
26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '
d3948a2eda0b4adc2541ae19fe87c067459a69d9':
Set layout_width in WiFi+NFC resource
Jason Monk [Tue, 14 Oct 2014 22:51:50 +0000 (22:51 +0000)]
am
9e6c6b9f: am
eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit '
9e6c6b9fb550390f9488c923827bbf5599dec3c2':
Update screen pinning strings to say Overview
Jason Monk [Tue, 14 Oct 2014 22:47:23 +0000 (22:47 +0000)]
am
eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev
* commit '
eaf84472ea10e0ec34b22faad0438700a86787b9':
Update screen pinning strings to say Overview
Jason Monk [Tue, 14 Oct 2014 22:42:49 +0000 (22:42 +0000)]
Merge "Update screen pinning strings to say Overview" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 22:26:15 +0000 (22:26 +0000)]
am
1686335a: am
26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '
1686335a7775f41e4c56f3ecdfed10fdc6ea2cc3':
Set layout_width in WiFi+NFC resource
Andres Morales [Tue, 14 Oct 2014 22:20:34 +0000 (22:20 +0000)]
am
26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
* commit '
26bc6907b93a21adcdf8ffdc24d7d96482be8165':
Set layout_width in WiFi+NFC resource
vandwalle [Tue, 14 Oct 2014 22:20:08 +0000 (22:20 +0000)]
am
74be17ed: am
7d89e294: am
52e929a9: am
2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
* commit '
74be17ed2e1a4f078fb186083c15617ca701271d':
dont show a config in saved network if it is self added and we never connected to it Bug:
17939405
vandwalle [Tue, 14 Oct 2014 22:13:12 +0000 (22:13 +0000)]
am
7d89e294: am
52e929a9: am
2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
* commit '
7d89e294b5ea6f3501a67e019549bae63cb1eee7':
dont show a config in saved network if it is self added and we never connected to it Bug:
17939405
Andres Morales [Tue, 14 Oct 2014 22:03:34 +0000 (22:03 +0000)]
Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
Andres Morales [Tue, 14 Oct 2014 20:49:31 +0000 (13:49 -0700)]
Set layout_width in WiFi+NFC resource
Bug:
17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208
vandwalle [Tue, 14 Oct 2014 19:55:58 +0000 (19:55 +0000)]
am
52e929a9: am
2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
* commit '
52e929a9613e52e199dcf12b95acab31be3c25bd':
dont show a config in saved network if it is self added and we never connected to it Bug:
17939405
Fabrice Di Meglio [Tue, 14 Oct 2014 18:15:58 +0000 (18:15 +0000)]
am
7ae5528a: am
c2f0f751: Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '
7ae5528a53b7a3157684e468a1e09d116401b2c3':
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Tue, 14 Oct 2014 18:11:45 +0000 (18:11 +0000)]
am
c2f0f751: Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '
c2f0f751dd95bb10d2eeac064d43b016c754aa54':
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Tue, 14 Oct 2014 18:08:17 +0000 (18:08 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
John Spurlock [Tue, 14 Oct 2014 17:51:08 +0000 (17:51 +0000)]
am
3ee136eb: am
ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
* commit '
3ee136eb13134642abc4ad89f0180588ad1d0211':
Settings: Restart existing volumizers in volume prefs.
Fabrice Di Meglio [Tue, 14 Oct 2014 17:49:27 +0000 (17:49 +0000)]
am
f3a306cd: am
22a57a8c: Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '
f3a306cd94d3cd9e87941dbf3d3b0ecd056d10d5':
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Geoff Mendal [Tue, 14 Oct 2014 17:23:00 +0000 (17:23 +0000)]
am
868326a8: (-s ours) am
6397b5e2: (-s ours) am
c9282823: (-s ours) am
e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
868326a8bb542f371106ba8256d0c6631028a037':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 14 Oct 2014 17:22:59 +0000 (17:22 +0000)]
am
4083220d: (-s ours) am
f5b9d136: (-s ours) am
ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
4083220dba5129345ba1f2a94d0847a1e2f47a01':
Import translations. DO NOT MERGE
John Spurlock [Tue, 14 Oct 2014 17:22:58 +0000 (17:22 +0000)]
am
dbd85a70: am
a0d28225: am
ef390443: am
a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '
dbd85a70a2509732a1503ca14230d818f8c8d066':
Fix battery-history-chart large-mode labels in RTL layouts.
John Spurlock [Tue, 14 Oct 2014 16:45:50 +0000 (16:45 +0000)]
am
ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
* commit '
ec3e4cd5f3b8282eff347179a5af7de64371b188':
Settings: Restart existing volumizers in volume prefs.
John Spurlock [Tue, 14 Oct 2014 16:40:43 +0000 (16:40 +0000)]
Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
vandwalle [Tue, 14 Oct 2014 15:38:09 +0000 (15:38 +0000)]
am
2fb9c773: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
* commit '
2fb9c773761b1375c86963ebb8f3bb3bec18e479':
dont show a config in saved network if it is self added and we never connected to it Bug:
17939405
Jason Monk [Tue, 14 Oct 2014 13:29:25 +0000 (09:29 -0400)]
Update screen pinning strings to say Overview
Bug:
17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
vandwalle [Tue, 14 Oct 2014 06:41:26 +0000 (06:41 +0000)]
Merge "dont show a config in saved network if it is self added and we never connected to it Bug:
17939405" into lmp-dev
vandwalle [Tue, 14 Oct 2014 01:44:13 +0000 (18:44 -0700)]
dont show a config in saved network if it is self added and we never connected to it
Bug:
17939405
Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
Fabrice Di Meglio [Tue, 14 Oct 2014 00:09:08 +0000 (17:09 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, use a Switch for:
Accessibility
- Large text
- High contrast text
- Power button ends call
- Auto-rotate screen
- Speak passwords
Change-Id: I668586f3eb0e458db631e60f272e62f1315d3758
Fabrice Di Meglio [Mon, 13 Oct 2014 23:33:06 +0000 (23:33 +0000)]
am
22a57a8c: Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
* commit '
22a57a8cbeea81290f01ac6610729fcdf0b30a1a':
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Fabrice Di Meglio [Mon, 13 Oct 2014 23:29:01 +0000 (23:29 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Fabrice Di Meglio [Mon, 13 Oct 2014 23:02:25 +0000 (16:02 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, use a Switch for:
- Automatic date & time
- Automatic time zone
- Use 24-hour format
Change-Id: Ie35816febe2469705446fdd2c703b52ff8b0929a
Geoff Mendal [Mon, 13 Oct 2014 22:41:08 +0000 (22:41 +0000)]
am
6397b5e2: (-s ours) am
c9282823: (-s ours) am
e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
6397b5e2f809596b2a77674dd7a701ede24dc3bb':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:41:04 +0000 (22:41 +0000)]
am
f5b9d136: (-s ours) am
ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
f5b9d136526549198b5cd8f3e626efa33a6631da':
Import translations. DO NOT MERGE
John Spurlock [Mon, 13 Oct 2014 22:40:54 +0000 (22:40 +0000)]
am
a0d28225: am
ef390443: am
a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '
a0d28225352a10c542bb2ee6fd8daef7886c4a25':
Fix battery-history-chart large-mode labels in RTL layouts.
Geoff Mendal [Mon, 13 Oct 2014 22:25:17 +0000 (22:25 +0000)]
am
c9282823: (-s ours) am
e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
c92828231993aa2c1a447c37a4a6f9740e950a72':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:21:27 +0000 (22:21 +0000)]
am
ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
ba35dd1bf70e74987e9d167961e747357574a264':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:20:30 +0000 (22:20 +0000)]
am
e4d510fa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
e4d510fac1c149784414004803b9d2e2b7b0f7af':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:17:59 +0000 (22:17 +0000)]
am
f1e148c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '
f1e148c5cf1d7eadc38b24ec8f686d6e5a16fc95':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 22:15:43 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Mon, 13 Oct 2014 22:15:23 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
Geoff Mendal [Mon, 13 Oct 2014 22:14:10 +0000 (22:14 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
John Spurlock [Mon, 13 Oct 2014 22:13:01 +0000 (22:13 +0000)]
am
ef390443: am
a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '
ef390443eb7a6a4ac52c62aea65e7ba94f1f897a':
Fix battery-history-chart large-mode labels in RTL layouts.
John Spurlock [Mon, 13 Oct 2014 22:03:54 +0000 (22:03 +0000)]
am
a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.
* commit '
a312f7f8044a07a2a41de477cc30bb34fc1df55f':
Fix battery-history-chart large-mode labels in RTL layouts.
Alan Viverette [Mon, 13 Oct 2014 21:07:50 +0000 (21:07 +0000)]
am
6229d683: am
ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
* commit '
6229d683a54a262c77625f031269603969b2fbe5':
Update Settings to use themed Context.getDrawable()
Alan Viverette [Mon, 13 Oct 2014 21:03:17 +0000 (21:03 +0000)]
am
ca2d56a8: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
* commit '
ca2d56a84927e08eb5418b79ad5cd6d57db10d23':
Update Settings to use themed Context.getDrawable()
Alan Viverette [Mon, 13 Oct 2014 20:58:39 +0000 (20:58 +0000)]
Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
John Spurlock [Wed, 8 Oct 2014 16:34:50 +0000 (12:34 -0400)]
Settings: Restart existing volumizers in volume prefs.
Use the new .start() method to ensure the underlying volumizer
is always started, regardless of pref activity lifecycle.
Depends on frameworks/base:
I2f860864161f818d5a62a28331ef1c47051fb39f
Bug:
17898190
Change-Id: I55dea590c13363730549aa29f194337efccdeaf7
Geoff Mendal [Mon, 13 Oct 2014 20:36:52 +0000 (20:36 +0000)]
am
91e2b2d2: (-s ours) am
77c67943: (-s ours) Import translations. DO NOT MERGE
* commit '
91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 13 Oct 2014 20:32:26 +0000 (20:32 +0000)]
am
77c67943: (-s ours) Import translations. DO NOT MERGE
* commit '
77c67943048591b182527757e89b5916a2881d91':
Import translations. DO NOT MERGE
John Spurlock [Mon, 13 Oct 2014 19:48:50 +0000 (15:48 -0400)]
Fix battery-history-chart large-mode labels in RTL layouts.
Bug:
17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
Geoff Mendal [Mon, 13 Oct 2014 19:44:59 +0000 (12:44 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8d9e5a58b77ec02b4311629c6520a86e9767a788
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Oct 2014 19:40:48 +0000 (12:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c96d2b054e17385851ec38bdd482af6e4c67e6b
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Oct 2014 19:36:34 +0000 (12:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib43bc66e564fd16477a7b20724a60f0a4845243f
Auto-generated-cl: translation import
Geoff Mendal [Mon, 13 Oct 2014 19:32:00 +0000 (12:32 -0700)]
Import translations. DO NOT MERGE
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
Alan Viverette [Sat, 11 Oct 2014 04:54:56 +0000 (04:54 +0000)]
am
44da5c19: am
4ed4249c: am
87b151c6: am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
44da5c19dbe7d438e9601477a17041b4a7700631':
Add option for serif monospace captioning font
Amit Mahajan [Sat, 11 Oct 2014 04:54:55 +0000 (04:54 +0000)]
am
63fce990: am
5c340458: am
8151ef29: resolved conflicts for merge of
88b2790d to lmp-sprout-dev
* commit '
63fce990971121eb74fb64a79807223fb3f36cf8':
Fix to show signal strength as 0 if out of service.
Alan Viverette [Sat, 11 Oct 2014 03:17:23 +0000 (03:17 +0000)]
am
4ed4249c: am
87b151c6: am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
4ed4249ccd9de8f34a7d59ab48b28494ff942d53':
Add option for serif monospace captioning font
Amit Mahajan [Sat, 11 Oct 2014 03:17:20 +0000 (03:17 +0000)]
am
5c340458: am
8151ef29: resolved conflicts for merge of
88b2790d to lmp-sprout-dev
* commit '
5c340458fdebc191d70f33913594e9e3429fc5d2':
Fix to show signal strength as 0 if out of service.
Alan Viverette [Sat, 11 Oct 2014 02:49:47 +0000 (02:49 +0000)]
am
87b151c6: am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
87b151c65090dfbfcfe09c884377cedd7fd3a34b':
Add option for serif monospace captioning font
Amit Mahajan [Sat, 11 Oct 2014 02:49:38 +0000 (02:49 +0000)]
am
8151ef29: resolved conflicts for merge of
88b2790d to lmp-sprout-dev
* commit '
8151ef29aa80006b7597ed57d507fe48338110c7':
Fix to show signal strength as 0 if out of service.
Alan Viverette [Sat, 11 Oct 2014 00:23:54 +0000 (00:23 +0000)]
am
178db4d5: Merge "Add option for serif monospace captioning font" into lmp-dev
* commit '
178db4d5f7522a81ee5cce02ccbb080c2e555697':
Add option for serif monospace captioning font
Amit Mahajan [Sat, 11 Oct 2014 00:15:48 +0000 (17:15 -0700)]
resolved conflicts for merge of
88b2790d to lmp-sprout-dev
Change-Id: I4f43133131aa7ef8eeec97edc993da06c1883903
Alan Viverette [Fri, 10 Oct 2014 23:40:58 +0000 (23:40 +0000)]
Merge "Add option for serif monospace captioning font" into lmp-dev
Amit Mahajan [Fri, 10 Oct 2014 22:41:08 +0000 (22:41 +0000)]
Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
Amit Mahajan [Fri, 10 Oct 2014 21:23:22 +0000 (14:23 -0700)]
Fix to show signal strength as 0 if out of service.
Bug:
17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
Alan Viverette [Fri, 10 Oct 2014 19:24:45 +0000 (12:24 -0700)]
Add option for serif monospace captioning font
BUG:
17666124
Change-Id: I57e3938d16e162165caee7ec9373c59c824cd1da
Alan Viverette [Fri, 10 Oct 2014 17:58:58 +0000 (10:58 -0700)]
Update Settings to use themed Context.getDrawable()
Explicit null theme is passed when using Resources.getDrawable() and
no theme is available, e.g. when using getResourcesForApplication().
This fixes an issue with ic_text_dot theming and helps avoid similar
issues in the future.
BUG:
17648301
Change-Id: I3e97c3490b6f2a55744f567b21284f2935ae9af7
Dianne Hackborn [Fri, 10 Oct 2014 17:01:10 +0000 (17:01 +0000)]
am
9d49e51c: am
c30661c0: am
8541206e: am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
9d49e51c854bb25d50c2aefd66aeed6aeb942d2c':
Update to use "real" L codename.
Zoltan Szatmary-Ban [Fri, 10 Oct 2014 16:59:44 +0000 (16:59 +0000)]
am
e807e1ea: am
90625329: am
95dda800: am
50263efb: Remove CA Cert UI item from one list only
* commit '
e807e1ead6f78951b8b84d55f8772d0317f09f14':
Remove CA Cert UI item from one list only
Svetoslav [Fri, 10 Oct 2014 16:58:15 +0000 (16:58 +0000)]
am
a883dbba: am
39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
* commit '
a883dbba7194b19c14c4fff83f94ee852c7bb798':
Update accessibility service toggle switch when resuming.
Sanket Padawe [Fri, 10 Oct 2014 03:19:59 +0000 (20:19 -0700)]
resolved conflicts for merge of
61719a80 to lmp-mr1-dev-plus-aosp
Change-Id: I3246a5d50f0fa2e324b7c6119a365f8ee9ed2e80
Dianne Hackborn [Thu, 9 Oct 2014 22:11:49 +0000 (22:11 +0000)]
am
c30661c0: am
8541206e: am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
c30661c05d2455d251f8cedddc3a048e78455f6c':
Update to use "real" L codename.
Dianne Hackborn [Thu, 9 Oct 2014 22:02:02 +0000 (22:02 +0000)]
am
8541206e: am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
Update to use "real" L codename.
Dianne Hackborn [Thu, 9 Oct 2014 19:29:33 +0000 (19:29 +0000)]
am
a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit '
a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:28:05 +0000 (19:28 +0000)]
am
90625329: am
95dda800: am
50263efb: Remove CA Cert UI item from one list only
* commit '
90625329608c19c3a0b8f7c98bb8710fe346a220':
Remove CA Cert UI item from one list only
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:22:48 +0000 (19:22 +0000)]
am
95dda800: am
50263efb: Remove CA Cert UI item from one list only
* commit '
95dda800a988c1ca778dae08563b6875c30d089a':
Remove CA Cert UI item from one list only
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 19:11:25 +0000 (19:11 +0000)]
am
50263efb: Remove CA Cert UI item from one list only
* commit '
50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
Svetoslav [Thu, 9 Oct 2014 18:26:25 +0000 (18:26 +0000)]
am
39674811: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
* commit '
396748110b8e7e761ee1d82827cc4396ecc5ee66':
Update accessibility service toggle switch when resuming.
Svetoslav [Thu, 9 Oct 2014 18:21:53 +0000 (18:21 +0000)]
Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
Dianne Hackborn [Thu, 9 Oct 2014 16:54:16 +0000 (16:54 +0000)]
Merge "Update to use "real" L codename." into lmp-dev
Sanket Padawe [Thu, 9 Oct 2014 13:16:15 +0000 (13:16 +0000)]
am
04b8b4c1: am
e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
* commit '
04b8b4c1a46dad57923ddbbb1522e8c21d0757f7':
Removing display number format from SIM UI
Sanket Padawe [Thu, 9 Oct 2014 13:03:33 +0000 (13:03 +0000)]
am
e4cbb865: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
* commit '
e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
Zoltan Szatmary-Ban [Thu, 9 Oct 2014 12:00:32 +0000 (13:00 +0100)]
Remove CA Cert UI item from one list only
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.
Bug:
17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
Sanket Padawe [Thu, 9 Oct 2014 00:33:10 +0000 (00:33 +0000)]
Merge "Removing display number format from SIM UI" into lmp-sprout-dev
OSDN Git Service
