git.osdn.net Git - android-x86/packages-apps-Settings.git/log

Sami Tolvanen [Fri, 17 Oct 2014 01:38:05 +0000 (01:38 +0000)]

am 63af7fc7: Remove excess whitespace from the factory reset screen automerge: c145d17
automerge: 0be4088

* commit '0be4088ed9253da04f56999e1560ab522d5d9400':
Remove excess whitespace from the factory reset screen

commit | commitdiff | tree

Sami Tolvanen [Fri, 17 Oct 2014 01:19:35 +0000 (01:19 +0000)]

am 63af7fc7: Remove excess whitespace from the factory reset screen
automerge: c145d17

* commit 'c145d171c497222d3cda37ff0e8fdf38aef69608':
Remove excess whitespace from the factory reset screen

commit | commitdiff | tree

Sami Tolvanen [Fri, 17 Oct 2014 00:48:17 +0000 (00:48 +0000)]

am 63af7fc7: Remove excess whitespace from the factory reset screen

* commit '63af7fc70e1242398dbebce5443072f0bc33e864':
Remove excess whitespace from the factory reset screen

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 16 Oct 2014 22:49:42 +0000 (22:49 +0000)]

Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10 automerge: e6a4a6b
automerge: 570bd52

* commit '570bd52f30cd455c9042361c6124ab0e00d91f6e':
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 16 Oct 2014 22:43:19 +0000 (22:43 +0000)]

Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev automerge: 4a43a10
automerge: e6a4a6b

* commit 'e6a4a6b6948725f74d1e3dc52be26d7c2cbbbb91':
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 16 Oct 2014 22:33:25 +0000 (22:33 +0000)]

Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev
automerge: 4a43a10

* commit '4a43a107d7b70444d21aaf98fac7381e3adac7b5':
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings

commit | commitdiff | tree

Sami Tolvanen [Thu, 16 Oct 2014 22:24:25 +0000 (22:24 +0000)]

Merge "Refactor the duplicate Switch IME button to an include"

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 16 Oct 2014 21:54:38 +0000 (21:54 +0000)]

am 8b5b47bf: am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit '8b5b47bf4521164381476c0ca5a8dc40bbd8cf5a':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 16 Oct 2014 21:49:51 +0000 (21:49 +0000)]

am b5a582eb: am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit 'b5a582eba964c617057aac8daa0f46901c39b21c':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

commit | commitdiff | tree

Fabrice Di Meglio [Thu, 16 Oct 2014 21:45:10 +0000 (21:45 +0000)]

am 667695eb: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev

* commit '667695eb117c8d1865b12145c5a348e8da5f70e1':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 18:13:05 +0000 (18:13 +0000)]

am e5e08d93: (-s ours) am df7699e1: (-s ours) am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'e5e08d93b15d5dded447ff99cfc51a29fb2d6fd4':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 18:13:04 +0000 (18:13 +0000)]

am 5c9c259a: (-s ours) am 1b2ef02c: (-s ours) am a3d19546: (-s ours) am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '5c9c259a6c8f4daf007ba7570dc24dfde59816fb':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 18:05:22 +0000 (18:05 +0000)]

am df7699e1: (-s ours) am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'df7699e1867c0205a6eaa3f7486a2b3d2e84fcd1':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 18:05:21 +0000 (18:05 +0000)]

am 1b2ef02c: (-s ours) am a3d19546: (-s ours) am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit '1b2ef02ce0a00c31cbb8bfa97f24c252e834da16':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 17:56:40 +0000 (17:56 +0000)]

am d109ed11: (-s ours) am 9f0d3721: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit 'd109ed1181edc60f98ad5a46eb535d5e529aa177':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 17:56:39 +0000 (17:56 +0000)]

am a3d19546: (-s ours) am 0172dfef: (-s ours) am 4909c412: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev

* commit 'a3d19546b7792539a7cc8f104c0873d1a9c83717':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 01:19:41 +0000 (01:19 +0000)]

am 20ef7a70: (-s ours) am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '20ef7a70c48967a1a1d6aef8ad81787e1620558b':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 01:04:59 +0000 (01:04 +0000)]

Merge "Import translations. DO NOT MERGE"

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 01:03:52 +0000 (18:03 -0700)]

Import translations. DO NOT MERGE

Change-Id: I1688e8e51ff69ce47c65145e12550f712fc9b58d
Auto-generated-cl: translation import

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:57:10 +0000 (00:57 +0000)]

am 78c00239: (-s ours) am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '78c00239df6d858c19a8243ad41ba96967e2fddc':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:56:35 +0000 (00:56 +0000)]

am 2d45e6c7: (-s ours) am 24f29313: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '2d45e6c7389f99dfbdbcbc49b2f3fc149ee4d377':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:55:46 +0000 (00:55 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:53:20 +0000 (00:53 +0000)]

am 24f29313: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

* commit '24f293138de5e38cb05389db3c6671e02812e9e0':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:52:31 +0000 (00:52 +0000)]

am 628d83e7: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

* commit '628d83e736f2f9e606327f3debe2930bb24a83e9':
Import translations. DO NOT MERGE

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:47:49 +0000 (00:47 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:47:22 +0000 (00:47 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:43:59 +0000 (17:43 -0700)]

Import translations. DO NOT MERGE

Change-Id: I33f829c2f72b274e24d7a41632d20eb65a5fa2c1
Auto-generated-cl: translation import

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Thu, 16 Oct 2014 00:38:03 +0000 (00:38 +0000)]

Merge "Import translations. DO NOT MERGE" into lmp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

Jim Miller [Wed, 15 Oct 2014 21:23:51 +0000 (21:23 +0000)]

am f38b63c9: am f3e5611c: am 1d050220: am 3ef52587: resolved conflicts for merge of 46c7f6d6 to lmp-sprout-dev

* commit 'f38b63c9137ac1eb11e30ff03553c88696813ec0':
Add a checkbox option to 'require password to decrypt'

commit | commitdiff | tree

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'

commit | commitdiff | tree

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'

commit | commitdiff | tree

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'

commit | commitdiff | tree

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

commit | commitdiff | tree

Sami Tolvanen [Wed, 15 Oct 2014 15:53:14 +0000 (16:53 +0100)]

Refactor the duplicate Switch IME button to an include

Move duplicate code for switching input method from crypt_keeper_*_field.xml to an include.

Bug: 16375532
Change-Id: I0f9000d4a8c4bc8751b8cefd98fe429cbb02c37a

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 15 Oct 2014 03:06:55 +0000 (03:06 +0000)]

am 3c56d456: 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 '3c56d456ea4a6f0f5d642ba96f066740a268f485':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity

commit | commitdiff | tree

Fabrice Di Meglio [Wed, 15 Oct 2014 03:06:53 +0000 (03:06 +0000)]

am b84d366f: 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 'b84d366f6bffc6676b6223c3757faef1c6e9f8fe':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

commit | commitdiff | tree

Jason Monk [Wed, 15 Oct 2014 03:06:05 +0000 (03:06 +0000)]

am d913ef17: am 0f45f64e: am f3a1fae4: am 9e6c6b9f: am eaf84472: Merge "Update screen pinning strings to say Overview" into lmp-dev

* commit 'd913ef17e0ddb3a51d577ea74a2e148b12ed34b9':
Update screen pinning strings to say Overview

commit | commitdiff | tree

Andres Morales [Wed, 15 Oct 2014 03:06:03 +0000 (03:06 +0000)]

am b6f81772: am 0d4a8ce2: am d3948a2e: am 1686335a: am 26bc6907: Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

* commit 'b6f8177251fbbcec752f1de81ee760eae8f3fcef':
Set layout_width in WiFi+NFC resource

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Jason Monk [Tue, 14 Oct 2014 22:42:49 +0000 (22:42 +0000)]

Merge "Update screen pinning strings to say Overview" into lmp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

vandwalle [Tue, 14 Oct 2014 22:25:48 +0000 (22:25 +0000)]

am 74e79a96: 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 '74e79a96804c4a6309e61f2675170ea4562fe9a7':
dont show a config in saved network if it is self added and we never connected to it Bug:17939405

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Andres Morales [Tue, 14 Oct 2014 22:03:34 +0000 (22:03 +0000)]

Merge "Set layout_width in WiFi+NFC resource" into lmp-dev

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 14 Oct 2014 19:05:19 +0000 (19:05 +0000)]

am 3395d650: 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 '3395d65062fe2a085cfd7909cdded8eb15cc3c7c':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

commit | commitdiff | tree

John Spurlock [Tue, 14 Oct 2014 19:04:56 +0000 (19:04 +0000)]

am 2fc692d5: am 3ee136eb: am ec3e4cd5: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev

* commit '2fc692d58c586073a80a8870727341570dbb0572':
Settings: Restart existing volumizers in volume prefs.

commit | commitdiff | tree

Fabrice Di Meglio [Tue, 14 Oct 2014 19:04:50 +0000 (19:04 +0000)]

am a6c1e815: 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 'a6c1e815bf4be14d875f34dd2e6eba6f9a97e3bd':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

Geoff Mendal [Tue, 14 Oct 2014 17:30:42 +0000 (17:30 +0000)]

am cf7e444c: (-s ours) 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 'cf7e444cbaed0063bce2accefbbdc69e20704930':
Import translations. DO NOT MERGE

commit | commitdiff | tree

Geoff Mendal [Tue, 14 Oct 2014 17:30:41 +0000 (17:30 +0000)]

am 67066ce6: (-s ours) am 4083220d: (-s ours) am f5b9d136: (-s ours) am ba35dd1b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev

* commit '67066ce6ee9d686e1d96ca0ef4ff596acb196841':
Import translations. DO NOT MERGE

commit | commitdiff | tree

John Spurlock [Tue, 14 Oct 2014 17:30:40 +0000 (17:30 +0000)]

am a4ff5b00: am dbd85a70: am a0d28225: am ef390443: am a312f7f8: Fix battery-history-chart large-mode labels in RTL layouts.

* commit 'a4ff5b00c38ebe5a4dec019d204c71b1c8833276':
Fix battery-history-chart large-mode labels in RTL layouts.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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.

commit | commitdiff | tree

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.

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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

commit | commitdiff | tree

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