Andres Morales
26bc6907b9
Merge "Set layout_width in WiFi+NFC resource" into lmp-dev
2014-10-14 22:03:35 +00:00
Andres Morales
c5fdea08d2
Set layout_width in WiFi+NFC resource
...
Bug:17930750
Change-Id: Ida2fd6040a52cc5d7fa6fe6c4a8c86a1a2dc4208
2014-10-14 13:49:31 -07:00
vandwalle
7d89e294b5
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
2014-10-14 19:55:58 +00:00
Fabrice Di Meglio
3395d65062
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
2014-10-14 18:15:58 +00:00
Fabrice Di Meglio
7ae5528a53
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
2014-10-14 18:11:45 +00:00
Fabrice Di Meglio
c2f0f751dd
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-14 18:08:18 +00:00
Alexandra Gherghina
acd21060f3
Fix user spinner anchor following system ui changes
...
Bug: 17637769
Change-Id: I31d7f2358803ee5a769e48d5c069969ce81a253c
2014-10-14 18:04:24 +00:00
John Spurlock
2fc692d58c
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.
2014-10-14 17:51:08 +00:00
Fabrice Di Meglio
a6c1e815bf
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
2014-10-14 17:49:27 +00:00
Geoff Mendal
cf7e444cba
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
2014-10-14 17:23:00 +00:00
Geoff Mendal
67066ce6ee
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
2014-10-14 17:22:59 +00:00
John Spurlock
a4ff5b00c3
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.
2014-10-14 17:22:58 +00:00
John Spurlock
3ee136eb13
am ec3e4cd5
: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
...
* commit 'ec3e4cd5f3b8282eff347179a5af7de64371b188':
Settings: Restart existing volumizers in volume prefs.
2014-10-14 16:45:50 +00:00
John Spurlock
ec3e4cd5f3
Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
2014-10-14 16:40:44 +00:00
vandwalle
52e929a961
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
2014-10-14 15:38:09 +00:00
Jason Monk
89be2d8ba4
Update screen pinning strings to say Overview
...
Bug: 17969466
Change-Id: I1ce8e7912f4b897493a164103ee6d776317d7495
2014-10-14 09:29:25 -04:00
vandwalle
2fb9c77376
Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
2014-10-14 06:41:27 +00:00
vandwalle
426005a299
dont show a config in saved network if it is self added and we never connected to it
...
Bug:17939405
Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
2014-10-13 18:44:21 -07:00
Fabrice Di Meglio
d8ae35ea50
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
2014-10-13 17:09:08 -07:00
Fabrice Di Meglio
f3a306cd94
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
2014-10-13 23:33:06 +00:00
Fabrice Di Meglio
22a57a8cbe
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-13 23:29:01 +00:00
Fabrice Di Meglio
b98c40649e
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
2014-10-13 16:02:25 -07:00
Geoff Mendal
868326a8bb
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
2014-10-13 22:41:08 +00:00
Geoff Mendal
4083220dba
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
2014-10-13 22:41:04 +00:00
John Spurlock
dbd85a70a2
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.
2014-10-13 22:40:54 +00:00
Geoff Mendal
6397b5e2f8
am c9282823
: (-s ours) am e4d510fa
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'c92828231993aa2c1a447c37a4a6f9740e950a72':
Import translations. DO NOT MERGE
2014-10-13 22:25:17 +00:00
Geoff Mendal
f5b9d13652
am ba35dd1b
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
...
* commit 'ba35dd1bf70e74987e9d167961e747357574a264':
Import translations. DO NOT MERGE
2014-10-13 22:21:27 +00:00
Geoff Mendal
c928282319
am e4d510fa
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
...
* commit 'e4d510fac1c149784414004803b9d2e2b7b0f7af':
Import translations. DO NOT MERGE
2014-10-13 22:20:30 +00:00
Geoff Mendal
80f283543b
am f1e148c5
: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'f1e148c5cf1d7eadc38b24ec8f686d6e5a16fc95':
Import translations. DO NOT MERGE
2014-10-13 22:17:59 +00:00
Geoff Mendal
ba35dd1bf7
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
2014-10-13 22:15:43 +00:00
Geoff Mendal
f1e148c5cf
Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
2014-10-13 22:15:24 +00:00
Geoff Mendal
e4d510fac1
Merge "Import translations. DO NOT MERGE" into lmp-dev
2014-10-13 22:14:10 +00:00
John Spurlock
a0d2822535
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.
2014-10-13 22:13:01 +00:00
John Spurlock
ef390443eb
am a312f7f8
: Fix battery-history-chart large-mode labels in RTL layouts.
...
* commit 'a312f7f8044a07a2a41de477cc30bb34fc1df55f':
Fix battery-history-chart large-mode labels in RTL layouts.
2014-10-13 22:03:54 +00:00
Alan Viverette
e74c772b11
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()
2014-10-13 21:07:50 +00:00
Alan Viverette
6229d683a5
am ca2d56a8
: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
...
* commit 'ca2d56a84927e08eb5418b79ad5cd6d57db10d23':
Update Settings to use themed Context.getDrawable()
2014-10-13 21:03:17 +00:00
Alan Viverette
ca2d56a849
Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
2014-10-13 20:58:39 +00:00
John Spurlock
af05fda24d
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
2014-10-13 20:47:05 +00:00
Geoff Mendal
32de3fa8c6
am 91e2b2d2
: (-s ours) am 77c67943
: (-s ours) Import translations. DO NOT MERGE
...
* commit '91e2b2d232d7e106b5f688e4ce95d79f768ecf63':
Import translations. DO NOT MERGE
2014-10-13 20:36:52 +00:00
Geoff Mendal
91e2b2d232
am 77c67943
: (-s ours) Import translations. DO NOT MERGE
...
* commit '77c67943048591b182527757e89b5916a2881d91':
Import translations. DO NOT MERGE
2014-10-13 20:32:26 +00:00
John Spurlock
a312f7f804
Fix battery-history-chart large-mode labels in RTL layouts.
...
Bug: 17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
2014-10-13 15:48:50 -04:00
Geoff Mendal
2f1272a9f3
Import translations. DO NOT MERGE
...
Change-Id: I8d9e5a58b77ec02b4311629c6520a86e9767a788
Auto-generated-cl: translation import
2014-10-13 12:44:59 -07:00
Geoff Mendal
c25f5c45bc
Import translations. DO NOT MERGE
...
Change-Id: I8c96d2b054e17385851ec38bdd482af6e4c67e6b
Auto-generated-cl: translation import
2014-10-13 12:40:48 -07:00
Geoff Mendal
77c6794304
Import translations. DO NOT MERGE
...
Change-Id: Ib43bc66e564fd16477a7b20724a60f0a4845243f
Auto-generated-cl: translation import
2014-10-13 12:36:34 -07:00
Geoff Mendal
b0c0f773ce
Import translations. DO NOT MERGE
...
Change-Id: I58f31b459dd9f775a16c0b887478f15eb7116167
Auto-generated-cl: translation import
2014-10-13 12:32:00 -07:00
Alan Viverette
81db2fe78a
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
2014-10-11 04:54:56 +00:00
Amit Mahajan
9530280c1b
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.
2014-10-11 04:54:55 +00:00
Alan Viverette
44da5c19db
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
2014-10-11 03:17:23 +00:00
Amit Mahajan
63fce99097
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.
2014-10-11 03:17:20 +00:00
Alan Viverette
4ed4249ccd
am 87b151c6
: am 178db4d5
: Merge "Add option for serif monospace captioning font" into lmp-dev
...
* commit '87b151c65090dfbfcfe09c884377cedd7fd3a34b':
Add option for serif monospace captioning font
2014-10-11 02:49:47 +00:00