OSDN Git Service
Geoff Mendal [Mon, 20 Oct 2014 23:47:51 +0000 (23:47 +0000)]
am
6acdd044: (-s ours) am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
6acdd044d7b3f77ff1f47e9addc2acdbc16e5b8d':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:42:29 +0000 (23:42 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Mon, 20 Oct 2014 23:41:26 +0000 (23:41 +0000)]
am
795c8378: (-s ours) Import translations. DO NOT MERGE
* commit '
795c83780752d0301985d53e2e230c2088af825b':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 20 Oct 2014 23:40:41 +0000 (16:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
Geoff Mendal [Mon, 20 Oct 2014 23:33:09 +0000 (16:33 -0700)]
Import translations. DO NOT MERGE
Change-Id: I80fabd3e1f2306d6b9be8973c70aaf5438e58c51
Auto-generated-cl: translation import
Sanket Padawe [Mon, 20 Oct 2014 20:51:07 +0000 (20:51 +0000)]
am
bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
* commit '
bdedbb851699016a70eafdb82b038240646358c8':
Changing settings UI changes related to strings to be displayed
Sanket Padawe [Mon, 20 Oct 2014 20:42:57 +0000 (20:42 +0000)]
Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
Sanket Padawe [Wed, 15 Oct 2014 18:25:34 +0000 (11:25 -0700)]
Changing settings UI changes related to strings to be displayed
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
Baligh Uddin [Sun, 19 Oct 2014 20:02:59 +0000 (20:02 +0000)]
am
96a0370a: (-s ours) am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
96a0370a2b893fb8acb1c1bd6873cecf05da7942':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 19:57:23 +0000 (19:57 +0000)]
am
25149b38: (-s ours) Import translations. DO NOT MERGE
* commit '
25149b389501afc817f1248d704def0b4c5b5c04':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 19 Oct 2014 17:10:53 +0000 (10:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3435cc63d25394c2b14089857e36de92c9a2b673
Auto-generated-cl: translation import
Jim Miller [Sat, 18 Oct 2014 02:20:59 +0000 (02:20 +0000)]
am
456b866c: am
aa037675: Fix bad string in EncryptionInterstitial
* commit '
456b866c09f88d4fd15c9650d2ee882be9dca8ec':
Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 02:09:26 +0000 (02:09 +0000)]
am
aa037675: Fix bad string in EncryptionInterstitial
* commit '
aa0376759873893197a0109025fd4ec8beca5929':
Fix bad string in EncryptionInterstitial
Jim Miller [Sat, 18 Oct 2014 01:31:03 +0000 (01:31 +0000)]
am
bc0e5e26: am
47adff0a: Show warning dialog when Accessibility is enabled
* commit '
bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
Show warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 01:28:52 +0000 (18:28 -0700)]
Fix bad string in EncryptionInterstitial
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.
Fixes bug
17881324
Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
Jim Miller [Sat, 18 Oct 2014 01:20:53 +0000 (01:20 +0000)]
am
47adff0a: Show warning dialog when Accessibility is enabled
* commit '
47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
Show warning dialog when Accessibility is enabled
Jim Miller [Sat, 18 Oct 2014 00:43:18 +0000 (17:43 -0700)]
Show warning dialog when Accessibility is enabled
This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".
Fixes bug
17881324
Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
Jim Miller [Fri, 17 Oct 2014 23:57:34 +0000 (23:57 +0000)]
am
ba1b3340: am
602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '
ba1b33407d66289a2367caab3141a3555f1fdcf7':
Several fixes to new EncryptionInterstitial dialog.
Jim Miller [Fri, 17 Oct 2014 23:52:42 +0000 (23:52 +0000)]
am
602d559d: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
* commit '
602d559d9c59074664ad684579dc3d14a09219cb':
Several fixes to new EncryptionInterstitial dialog.
Jim Miller [Fri, 17 Oct 2014 23:48:34 +0000 (23:48 +0000)]
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 23:14:01 +0000 (23:14 +0000)]
am
edbada7a: am
ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit '
edbada7acd2d40db1c472e291f3191c6f26d980a':
Accessibility no longer overrides strong encryption (Settings).
Jim Miller [Fri, 17 Oct 2014 02:49:07 +0000 (19:49 -0700)]
Several fixes to new EncryptionInterstitial dialog.
The code now observes whether accessibility is turned on when
deciding the default state.
Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.
Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.
Fixes bug
17881324
Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0
Svetoslav [Fri, 17 Oct 2014 23:08:40 +0000 (23:08 +0000)]
am
ba202e9f: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
* commit '
ba202e9fb299f4557190dbad5ed989a9c83a4380':
Accessibility no longer overrides strong encryption (Settings).
Svetoslav [Fri, 17 Oct 2014 22:59:42 +0000 (22:59 +0000)]
Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
Svetoslav [Fri, 17 Oct 2014 21:37:02 +0000 (14:37 -0700)]
Accessibility no longer overrides strong encryption (Settings).
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:
17881324
Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
Fabrice Di Meglio [Fri, 17 Oct 2014 21:32:34 +0000 (21:32 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Amith Yamasani [Fri, 17 Oct 2014 21:08:11 +0000 (21:08 +0000)]
am
06a314d6: am
e52c159c: Fix some strings for the encryption stuff.
* commit '
06a314d65ad1583e76394d6c5846e3bbfd8eedcb':
Fix some strings for the encryption stuff.
Fabrice Di Meglio [Fri, 17 Oct 2014 21:06:22 +0000 (14:06 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, convert Trusted Credentials CheckBoxes to Switches
Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca
Amith Yamasani [Fri, 17 Oct 2014 21:02:34 +0000 (21:02 +0000)]
am
e52c159c: Fix some strings for the encryption stuff.
* commit '
e52c159cd9b34222ca0440e824d729a9428cbfe6':
Fix some strings for the encryption stuff.
Fabrice Di Meglio [Fri, 17 Oct 2014 20:52:56 +0000 (20:52 +0000)]
Merge "Fix bug #
18024258 Crash in Settings observed after tap on Usage statistics" into lmp-mr1-dev
Fabrice Di Meglio [Fri, 17 Oct 2014 20:46:31 +0000 (20:46 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Amith Yamasani [Fri, 17 Oct 2014 20:42:14 +0000 (13:42 -0700)]
Fix some strings for the encryption stuff.
Bug:
17881324
Change-Id: I2bee6773d3ce8f5bede92ded3d2d937bf0e8685c
Jim Miller [Fri, 17 Oct 2014 19:56:45 +0000 (19:56 +0000)]
am
c7ccba68: am
4f903c3e: Add strings for upcoming change.
* commit '
c7ccba68592cfa1afad36abe56e4e8caba37014a':
Add strings for upcoming change.
Jim Miller [Fri, 17 Oct 2014 19:52:03 +0000 (19:52 +0000)]
am
4f903c3e: Add strings for upcoming change.
* commit '
4f903c3e6502e1a87805a1def69c2a6f44bf601f':
Add strings for upcoming change.
Jim Miller [Fri, 17 Oct 2014 19:04:21 +0000 (12:04 -0700)]
Add strings for upcoming change.
Fixes bug
17881324
Change-Id: Ib8fc4de7d8689049e38ed7e1c3a0914c71787327
Svetoslav [Fri, 17 Oct 2014 18:53:32 +0000 (18:53 +0000)]
am
431e2460: am
3ea423ae: User to confirm credentials if an accessibility service changes encryption.
* commit '
431e246032d58b8aae72d348107f0d2aaa9efbac':
User to confirm credentials if an accessibility service changes encryption.
Fabrice Di Meglio [Fri, 17 Oct 2014 18:29:06 +0000 (11:29 -0700)]
Fix bug #
18024258 Crash in Settings observed after tap on Usage statistics
- update to correct class name (was changed in a former CL and introduced
this regression)
Change-Id: Ia945a5be2d8c7d19c1daf400a9d2d2a6589de137
Alan Viverette [Fri, 17 Oct 2014 18:03:34 +0000 (18:03 +0000)]
Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev
Svetoslav [Fri, 17 Oct 2014 16:56:40 +0000 (16:56 +0000)]
am
3ea423ae: User to confirm credentials if an accessibility service changes encryption.
* commit '
3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
User to confirm credentials if an accessibility service changes encryption.
John Spurlock [Fri, 17 Oct 2014 15:54:16 +0000 (11:54 -0400)]
Settings: Fix hotspot switch state issue.
Bug:
17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
Alan Viverette [Fri, 17 Oct 2014 01:27:18 +0000 (18:27 -0700)]
Prevent NPE when no accessibility services are enabled
BUG:
18023183
Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2
Svetoslav [Thu, 16 Oct 2014 21:44:25 +0000 (14:44 -0700)]
User to confirm credentials if an accessibility service changes encryption.
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:
17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
Fabrice Di Meglio [Fri, 17 Oct 2014 00:16:26 +0000 (17:16 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, convert Account Sync feeds CheckBoxes to Switches
Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b
Sami Tolvanen [Thu, 16 Oct 2014 22:19:17 +0000 (15:19 -0700)]
Remove excess whitespace from the factory reset screen
The bullet pointed list in the factory reset screen consists
of two separate strings, which lead to excess whitespace
between the two segments of the list. Remove padding from the
text views to remove the whitespace.
Bug:
17997459
Change-Id: I60eb6f0f2924323d7eb806ff2b1180ebc7189adb
Fabrice Di Meglio [Thu, 16 Oct 2014 22:08:17 +0000 (22:08 +0000)]
Merge "Fix bug #
18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev
Fabrice Di Meglio [Thu, 16 Oct 2014 21:42:10 +0000 (14:42 -0700)]
Fix bug #
18017952 It does not search all possible "USB" results that can be found in the settings
- add indexing for UsbSettings
- change constant name from RANK_MEMORY to RANK_STORAGE
- fix old issue with the PreferenceScreen title (as Location instead of USB computer connection)
Change-Id: I1395ec3d6a795edf73a8703545540456a477cc21
Fabrice Di Meglio [Thu, 16 Oct 2014 21:40:03 +0000 (21:40 +0000)]
Merge "Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 17:45:41 +0000 (17:45 +0000)]
am
9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
* commit '
9f0d372154fc328315dad2f7df2290345bebcf39':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 17:45:39 +0000 (17:45 +0000)]
am
0172dfef: (-s ours) am
4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
0172dfef41dbd728b603d470bc4650290a2276b4':
Import translations. DO NOT MERGE
Fabrice Di Meglio [Thu, 16 Oct 2014 02:00:35 +0000 (19:00 -0700)]
Fix bug #
15730311 Checkboxes on R side should update to Quantum/Material on/off switch
Per UX request, convert more CheckBoxes to Switches
Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
Geoff Mendal [Thu, 16 Oct 2014 00:55:46 +0000 (00:55 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
Geoff Mendal [Thu, 16 Oct 2014 00:47:51 +0000 (17:47 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifd58c7a54faef6216bf534dac6d5fe99340d0083
Auto-generated-cl: translation import
Geoff Mendal [Thu, 16 Oct 2014 00:47:22 +0000 (00:47 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
Geoff Mendal [Thu, 16 Oct 2014 00:45:42 +0000 (00:45 +0000)]
am
4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
4909c412fa8c495f1abba3c7d3fe0c32f08934db':
Import translations. DO NOT MERGE
Geoff Mendal [Thu, 16 Oct 2014 00:40:19 +0000 (17:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I3c5e1e028e7fd42ae636df3aa8876ac178602187
Auto-generated-cl: translation import
Geoff Mendal [Thu, 16 Oct 2014 00:38:03 +0000 (00:38 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Geoff Mendal [Thu, 16 Oct 2014 00:31:39 +0000 (17:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: I6ddb57a8bea2ad4ad1b6272e1f88f219e9cd8db0
Auto-generated-cl: translation import
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
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 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 [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 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
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: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 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: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: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:15:43 +0000 (22:15 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-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 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
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: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 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
OSDN Git Service
