Makoto Onuki
1e998fd6a8
am b544ce78
: Merge "Set service name to printer service setting title" into mnc-dev
...
* commit 'b544ce78dc63b9119dcc741d18200f3128d42aa3':
Set service name to printer service setting title
2015-06-22 21:01:56 +00:00
Alan Viverette
8a4e44ba92
Merge "Ensure "default" and "none" caption colors are consistent w/ framework" into mnc-dev
2015-06-22 20:55:15 +00:00
Makoto Onuki
b544ce78dc
Merge "Set service name to printer service setting title" into mnc-dev
2015-06-22 20:47:59 +00:00
Makoto Onuki
077a7173c6
Set service name to printer service setting title
...
Bug 21899319
Change-Id: I940957dd4036eb3386c7f59fbbd3608e7169f415
2015-06-22 13:43:49 -07:00
Alan Viverette
751625e9a2
Ensure "default" and "none" caption colors are consistent w/ framework
...
Also enables scroll indicators in color grid dialog.
Bug: 21602597
Change-Id: I7fabd36787fc8689966eb8dcece3d4d047ee8066
2015-06-22 13:05:45 -07:00
Sanket Padawe
53e74f510b
Fix display of "Contact sharing" option in Car kit for BT Settings.
...
Bug: 21879473
Change-Id: I0d2f839c525d2a5179f9ef59ab12a94f1aab9b6f
2015-06-22 12:33:53 -07:00
Alan Viverette
e7924ca819
am 14f5da9b
: Merge "Disable foreground opacity when using default foreground color" into mnc-dev
...
* commit '14f5da9b4d2cb1e0b6828312613bf8f4c8a1df2d':
Disable foreground opacity when using default foreground color
2015-06-22 17:27:31 +00:00
Barnaby James
83f3ef2cfe
am ab1c2b0d
: Merge "Hide title of the zen mode voice activity." into mnc-dev
...
* commit 'ab1c2b0d8097396fd67045f52829703e84e73350':
Hide title of the zen mode voice activity.
2015-06-22 17:27:30 +00:00
Alan Viverette
14f5da9b4d
Merge "Disable foreground opacity when using default foreground color" into mnc-dev
2015-06-22 17:20:07 +00:00
Barnaby James
ab1c2b0d80
Merge "Hide title of the zen mode voice activity." into mnc-dev
2015-06-22 17:18:21 +00:00
Alan Viverette
529901decd
Disable foreground opacity when using default foreground color
...
Bug: 21602597
Change-Id: Idad5288477f9ece46a2ccb768863d4fd528fec12
2015-06-22 10:07:19 -07:00
Barnaby James
f9472beb96
Hide title of the zen mode voice activity.
...
Zen mode voice activity doesn't show any UI but the activity title is still shown.
BUG: 21985804
Change-Id: I1e7bd07deb59bcb36005fa7e4bca766af03d742b
2015-06-22 09:53:37 -07:00
Geoff Mendal
cb35e5a718
am e4841b38
: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
...
* commit 'e4841b38d05eba058061651b11020c551a014914':
Import translations. DO NOT MERGE
2015-06-22 15:38:50 +00:00
Geoff Mendal
e4841b38d0
Merge "Import translations. DO NOT MERGE" into mnc-dev
2015-06-22 15:31:26 +00:00
Jason Monk
d8c811d8b8
am b4b590d1
: Merge "Update disable dialog" into mnc-dev
...
* commit 'b4b590d13f4ddd2ae5ffd099eb93ad8fa647ec57':
Update disable dialog
2015-06-22 15:02:15 +00:00
Geoff Mendal
b593d12bea
Import translations. DO NOT MERGE
...
Change-Id: I2c01af1003b67115a748fbe8ba3a7ec2d82144a8
Auto-generated-cl: translation import
2015-06-22 08:00:38 -07:00
Jason Monk
b4b590d13f
Merge "Update disable dialog" into mnc-dev
2015-06-22 14:55:14 +00:00
Pavel Zhamaitsiak
a8491f348e
am 5a6d17c8
: Log WiFi Calling actions from settings
...
* commit '5a6d17c8cdb099b8533fb4c12c23d31da4bafe41':
Log WiFi Calling actions from settings
2015-06-22 03:43:31 +00:00
Pavel Zhamaitsiak
5a6d17c8cd
Log WiFi Calling actions from settings
...
Change-Id: Ie18bf18de22469f9b2615ba19f088316d20464d7
2015-06-20 15:49:08 -07:00
Adrian Roos
5023c89d24
am a029671b
: Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
...
* commit 'a029671bfd2d915ce6d43fa31a896058454cfe24':
Work around improper ListView recycling in TrustAgentSettings
2015-06-20 03:28:00 +00:00
Selim Cinek
e4daef16c5
am 5f0976a0
: Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
...
* commit '5f0976a0ac1054d59133e6f5661b50c4e9dcecfe':
Fixed a crash when rotating the Fingerprint renaming dialog
2015-06-20 03:27:59 +00:00
Adrian Roos
a029671bfd
Merge "Work around improper ListView recycling in TrustAgentSettings" into mnc-dev
2015-06-20 03:23:03 +00:00
Selim Cinek
5f0976a0ac
Merge "Fixed a crash when rotating the Fingerprint renaming dialog" into mnc-dev
2015-06-20 03:21:21 +00:00
Adrian Roos
ba59f5b222
Work around improper ListView recycling in TrustAgentSettings
...
Previously, the views for our SwitchPreference would never
be recycled because they weren't present in onCreate, which
broke accessibility events.
Bug: 21837103
Change-Id: I01f40b4e6df6d807b77f985116a57334e4ca4868
2015-06-19 20:01:56 -07:00
Selim Cinek
f4a305ee40
Fixed a crash when rotating the Fingerprint renaming dialog
...
Bug: 21815069
Change-Id: Ice90a5786685c300a522a908c1107af9e5311eb3
2015-06-19 13:15:13 -07:00
Robin Lee
02a0cf3ae3
am 3a839be7
: Merge "Only unregister the network callback at onPause" into mnc-dev
...
* commit '3a839be7c165ea152179fb5b4531f4f6fdb7c822':
Only unregister the network callback at onPause
2015-06-19 20:10:51 +00:00
Robin Lee
3a839be7c1
Merge "Only unregister the network callback at onPause" into mnc-dev
2015-06-19 20:03:06 +00:00
Jason Monk
6a7c756208
am d63e6969
: Merge "Add content description to owner info status text" into mnc-dev
...
* commit 'd63e696902cbefaa7361aaa16e6b20d0fe593cdb':
Add content description to owner info status text
2015-06-19 15:33:37 +00:00
Jason Monk
d63e696902
Merge "Add content description to owner info status text" into mnc-dev
2015-06-19 15:22:21 +00:00
Jason Monk
2e78f53af1
Add content description to owner info status text
...
Bug: 21799551
Change-Id: I8fe82d304309949a5a46492f7d20c58e006baea3
2015-06-19 11:17:03 -04:00
John Spurlock
b9ea131044
am 7699cad0
: Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
...
* commit '7699cad0042b8bc8cf3cd5ca728f013abe175de8':
Settings: Add widget entry point to magical entry points listing.
2015-06-19 15:03:16 +00:00
John Spurlock
7699cad004
Merge "Settings: Add widget entry point to magical entry points listing." into mnc-dev
2015-06-19 14:55:11 +00:00
John Spurlock
533a5664da
Settings: Add widget entry point to magical entry points listing.
...
Bug: 21930077
Change-Id: I67b05d6064a2ab0fe93d3d8841c9f23c9246a101
2015-06-19 10:47:36 -04:00
Zoltan Szatmary-Ban
5de33f402a
Reflect effect of all Wifi editability factors in Settings
...
Bug: 21427528
Bug: 21150087
Bug: 21612565
Change-Id: I62962a9b3fc1bb9c90be79e133873006da102054
2015-06-19 11:06:37 +01:00
Brian Carlstrom
9dca3951f6
am 2567514a
: Merge "Clarify process_dex2oat_label description" into mnc-dev
...
* commit '2567514abcd253cdc857ef0ddb2dbbb4fe6eed08':
Clarify process_dex2oat_label description
2015-06-19 04:33:16 +00:00
Brian Carlstrom
2567514abc
Merge "Clarify process_dex2oat_label description" into mnc-dev
2015-06-19 04:23:08 +00:00
Sanket Padawe
aa10a9ec83
am 5ba90c14
: Increase char limit of the data usage Settings string to 33.
...
* commit '5ba90c148d41ae3f330d7f31de8bced5e21c8727':
Increase char limit of the data usage Settings string to 33.
2015-06-19 01:51:27 +00:00
Sanket Padawe
5ba90c148d
Increase char limit of the data usage Settings string to 33.
...
Bug: 21801556
Change-Id: I82d99f155a3c4b6f1ac0f3056c254e54b8e5f311
2015-06-18 18:39:25 -07:00
Jason Monk
5fd5890f5b
am 47a26c79
: Merge "Fix ListView being too eager too scroll" into mnc-dev
...
* commit '47a26c79288723b8604a91c5cd8daedd83f183f2':
Fix ListView being too eager too scroll
2015-06-18 20:16:51 +00:00
Jason Monk
47a26c7928
Merge "Fix ListView being too eager too scroll" into mnc-dev
2015-06-18 20:07:40 +00:00
Jason Monk
66aa964e2a
Fix ListView being too eager too scroll
...
ListView is always too eager to scroll, so just stop using it.
Bug: 21853796
Change-Id: Id37d89b0312597a9fb65a33f151af34b3f395d91
2015-06-18 15:56:21 -04:00
Jason Monk
beaae8367a
am 6c5b27e0
: Merge "Fix opening secured networks from QS" into mnc-dev
...
* commit '6c5b27e042b5d36f404f11da85145a287a6f1df4':
Fix opening secured networks from QS
2015-06-18 19:29:48 +00:00
Jason Monk
6c5b27e042
Merge "Fix opening secured networks from QS" into mnc-dev
2015-06-18 19:19:12 +00:00
Alex Chau
1e24271a9b
am cd0da9c1
: Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
...
* commit 'cd0da9c14ef11bdaca1a470fb1d87042d51f9ae7':
Enforce Keyguard policy in Notification Settings
2015-06-18 17:22:23 +00:00
Brian Carlstrom
972ed7750f
Clarify process_dex2oat_label description
...
Bug: 21898104
Change-Id: I264f784db761ac51a1dde51f189fb017b7d378b1
2015-06-18 10:11:18 -07:00
Alex Chau
cd0da9c14e
Merge "Enforce Keyguard policy in Notification Settings" into mnc-dev
2015-06-18 17:10:35 +00:00
Jason Monk
4dd013efc1
Fix opening secured networks from QS
...
Bug: 21908788
Change-Id: I09b1d22ae8b1815e720bd8c05fa1e38d66d1dcfd
2015-06-18 12:36:34 -04:00
Jason Monk
6afa2a5124
am ed672cfc
: Merge "Revert "Accounts -> Account sync"" into mnc-dev
...
* commit 'ed672cfc8c3acb8b5d3fe932e1b31e20b32594c8':
Revert "Accounts -> Account sync"
2015-06-18 16:11:49 +00:00
Jason Monk
ed672cfc8c
Merge "Revert "Accounts -> Account sync"" into mnc-dev
2015-06-18 15:54:56 +00:00
Jason Monk
06fc34e25a
Revert "Accounts -> Account sync"
...
This reverts commit 43db745ea0
.
Bug: 21726868
Change-Id: I72fd09c493f71a607b9df8eaa8e42047a60303e8
2015-06-18 15:44:46 +00:00