Alan Viverette
b46f9f42f7
am e873aeb3
: Update caption preferences to use SubtitleView
...
* commit 'e873aeb3a659ac970609cebb5ec2f460afd1206a':
Update caption preferences to use SubtitleView
2013-08-21 14:12:28 -07:00
Alan Viverette
e873aeb3a6
Update caption preferences to use SubtitleView
...
Change-Id: I02230669c5e7be36006e04bb7110446265f122d9
2013-08-21 13:58:07 -07:00
Romain Guy
46bd0af5ca
am 24fcbb69
: am 821496bf
: Add Deuteranomaly color set to overdraw debugging
...
* commit '24fcbb693abbaec5e3757f9feca7d7c3866dce7c':
Add Deuteranomaly color set to overdraw debugging
2013-08-21 12:02:36 -07:00
Romain Guy
24fcbb693a
am 821496bf
: Add Deuteranomaly color set to overdraw debugging
...
* commit '821496bf4ac2dc6dada222606525115e8600288c':
Add Deuteranomaly color set to overdraw debugging
2013-08-21 12:00:09 -07:00
Romain Guy
821496bf4a
Add Deuteranomaly color set to overdraw debugging
...
Change-Id: I27e48f54653f24383ab85c0e500fdd79cec28cc3
2013-08-21 11:54:29 -07:00
David Christie
f6b0d63203
am 4bc8e50b
: am ae95da41
: Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev
...
* commit '4bc8e50bee995255e1c6d78fe2095f1552a35988':
Switch location Settings and Power widget to use new Settings api.
2013-08-21 10:50:30 -07:00
David Christie
4bc8e50bee
am ae95da41
: Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev
...
* commit 'ae95da417ce5c88127ae806994491a49885066ab':
Switch location Settings and Power widget to use new Settings api.
2013-08-21 10:45:08 -07:00
David Christie
ae95da417c
Merge "Switch location Settings and Power widget to use new Settings api." into klp-dev
2013-08-21 17:40:56 +00:00
Tom O'Neill
bfbc8c6818
am 12c7f185
: am 9facc23c
: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
...
* commit '12c7f185e30d760eb3788ae4de49b5f37b22d258':
Move UPDATE_INTENT to SettingsInjectorService
2013-08-21 07:57:57 -07:00
Tom O'Neill
12c7f185e3
am 9facc23c
: Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
...
* commit '9facc23cd8341d579c44af51a2be87effee8618e':
Move UPDATE_INTENT to SettingsInjectorService
2013-08-21 07:55:42 -07:00
Tom O'Neill
9facc23cd8
Merge "Move UPDATE_INTENT to SettingsInjectorService" into klp-dev
2013-08-21 14:53:19 +00:00
Alan Viverette
ef691ea435
am 16ad2566
: am bffd631a
: Allow the framework to recycle ApnPreference views
...
* commit '16ad25665e77d538bca40e572e10c90856d3e3d6':
Allow the framework to recycle ApnPreference views
2013-08-20 19:04:03 -07:00
Jim Miller
ef3e701b78
Add setting to disable keyguard widgets
...
This allows disabling keyguard widgets through Settings.
On new devices, the setting is turned off by default. If the
user currently has widgets in keyguard, then we keep them
and re-enable the setting.
Change-Id: I25f0756ac72227e13dcb491694b3ec3c2bf1d293
2013-08-20 19:03:30 -07:00
Alan Viverette
16ad25665e
am bffd631a
: Allow the framework to recycle ApnPreference views
...
* commit 'bffd631a2ab08c4313ae6405b9a8803bc98b629b':
Allow the framework to recycle ApnPreference views
2013-08-20 19:00:32 -07:00
Alan Viverette
bffd631a2a
Allow the framework to recycle ApnPreference views
...
BUG: 10079104
Change-Id: Iaa4f155da12a141f16300076cc820d47e0c5779a
2013-08-20 18:14:33 -07:00
Alan Viverette
f5aeec011a
am 97659084
: am 35bac199
: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
...
* commit '976590843aa26bd37501abbfe9d2a98da695c04f':
Fix background and line wrapping in CaptionTextView
2013-08-20 16:52:58 -07:00
Alan Viverette
976590843a
am 35bac199
: Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
...
* commit '35bac199324d07dd6cf16e3bd50df1feca8e9030':
Fix background and line wrapping in CaptionTextView
2013-08-20 16:50:04 -07:00
Alan Viverette
35bac19932
Merge "Fix background and line wrapping in CaptionTextView" into klp-dev
2013-08-20 23:46:20 +00:00
Amith Yamasani
d760a61936
Fix custom restrictions launch mechanism
...
Instead of showing a separate entry for launching custom restrictions,
launch it directly when clicking on the settings icon.
Bug: 10388399
Change-Id: I327d6d4c2b9840ce5ba140746568c5561a1a8936
2013-08-20 16:26:48 -07:00
Alan Viverette
c30f124c91
Fix background and line wrapping in CaptionTextView
...
Also fixes where two style names were accidentally switched,
makes the font sizes larger, and cleans up the CaptionTextView
styling APIs in preparation for moving it into the framework.
BUG: 10396663
Change-Id: I00999723a67bce2659d913b70dd4420ed32f955c
2013-08-20 15:58:38 -07:00
David Christie
512183ea8e
Switch location Settings and Power widget to use new Settings api.
...
Change-Id: I06b7a2e21876a18d9ad42fda2a6c6d4c7b6add48
2013-08-20 15:24:21 -07:00
Amith Yamasani
05139a26f4
am 8551bcf5
: am 0f5578ce
: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev
...
* commit '8551bcf59c9555d9ed993e05712cc74b764c7f60':
Select max timeout, if it's in the timeout list
2013-08-20 13:37:51 -07:00
Amith Yamasani
8551bcf59c
am 0f5578ce
: Merge "Select max timeout, if it\'s in the timeout list" into klp-dev
...
* commit '0f5578ce2ddfc19eab36e843728470e8119026b5':
Select max timeout, if it's in the timeout list
2013-08-20 13:35:29 -07:00
Amith Yamasani
0f5578ce2d
Merge "Select max timeout, if it's in the timeout list" into klp-dev
2013-08-20 20:33:24 +00:00
Maggie Benthall
f48206e37e
Fix NPE in SecuritySettings.onResume()
...
when DISALLOW_CONFIG_CREDENTIALS is true.
Bug: 10405192
Change-Id: Id364ba3cd86151b504158bc253559d0da5e26273
2013-08-20 11:03:05 -04:00
Lifu Tang
41935ba6ba
am 96dd39ba
: am d3dbc6e3
: Launches the Location setting as fragment
...
* commit '96dd39badd1d82e1db360b77849ee26198a7d1c9':
Launches the Location setting as fragment
2013-08-19 19:04:04 -07:00
Lifu Tang
96dd39badd
am d3dbc6e3
: Launches the Location setting as fragment
...
* commit 'd3dbc6e3a187b9de69b83915400425032d287dec':
Launches the Location setting as fragment
2013-08-19 19:01:08 -07:00
Lifu Tang
d3dbc6e3a1
Launches the Location setting as fragment
...
Change-Id: I0fb04a346236676ce9483a0c4d1fc3b2b590b08c
2013-08-19 18:42:56 -07:00
Lifu Tang
c0fc7457fc
am 2e45637a
: am b9ab196b
: Sort recent apps, show message when no recent apps
...
* commit '2e45637aeb775832b71a69fb26c5b6b754688960':
Sort recent apps, show message when no recent apps
2013-08-19 18:35:52 -07:00
Lifu Tang
2e45637aeb
am b9ab196b
: Sort recent apps, show message when no recent apps
...
* commit 'b9ab196bb520fed9b23aa9a259fab08084646c2c':
Sort recent apps, show message when no recent apps
2013-08-19 18:33:08 -07:00
Lifu Tang
b9ab196bb5
Sort recent apps, show message when no recent apps
...
Change-Id: I70bb1913435b46fc87aec10075e43f98ef07ef62
2013-08-19 17:56:14 -07:00
Lifu Tang
f90b70378b
am 0acf3cfc
: am dbd2f759
: Merge "Supress Location button when coming from Location" into klp-dev
...
* commit '0acf3cfc8c55bac60295eb3f7e9ee6345186eb3c':
Supress Location button when coming from Location
2013-08-19 14:38:56 -07:00
Lifu Tang
0acf3cfc8c
am dbd2f759
: Merge "Supress Location button when coming from Location" into klp-dev
...
* commit 'dbd2f7592943f49dd8227f01fa9c5d14e4e58c0b':
Supress Location button when coming from Location
2013-08-19 14:37:09 -07:00
Lifu Tang
dbd2f75929
Merge "Supress Location button when coming from Location" into klp-dev
2013-08-19 21:33:22 +00:00
Christopher Tate
4eb9db5b1c
am 88d83a90
: am c7679b0e
: Merge "Don\'t crash when procstats has data for a now-disused uid" into klp-dev
...
* commit '88d83a901f42ad8041a29b899a1379b683fcea7a':
Don't crash when procstats has data for a now-disused uid
2013-08-19 14:22:47 -07:00
Christopher Tate
88d83a901f
am c7679b0e
: Merge "Don\'t crash when procstats has data for a now-disused uid" into klp-dev
...
* commit 'c7679b0ef23fb137266c8ad03312bddbd807a87b':
Don't crash when procstats has data for a now-disused uid
2013-08-19 14:20:50 -07:00
Christopher Tate
c7679b0ef2
Merge "Don't crash when procstats has data for a now-disused uid" into klp-dev
2013-08-19 21:19:11 +00:00
Lifu Tang
bfa96c3b10
Supress Location button when coming from Location
...
Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823
2013-08-19 14:15:52 -07:00
Baligh Uddin
9bff610c91
am 9378f595
: (-s ours) am 6a5c9a83
: (-s ours) am 1df37ff1
: (-s ours) am 2b851859
: (-s ours) am b09878b8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '9378f595073a15eff7306e1d90a9efad36093212':
Import translations. DO NOT MERGE
2013-08-19 13:14:28 -07:00
Baligh Uddin
9508ff6d56
am 55b57ed7
: (-s ours) am 05e3f627
: (-s ours) am 5c601791
: (-s ours) am 8485f115
: (-s ours) Import translations. DO NOT MERGE
...
* commit '55b57ed7d5a91a5599c5760d0a61741c3079e0f8':
Import translations. DO NOT MERGE
2013-08-19 13:14:27 -07:00
Baligh Uddin
7b0d683717
am 3bcfffca
: (-s ours) am b0130e7b
: (-s ours) am 21cbd017
: (-s ours) am e37538b1
: (-s ours) am 8c6de9e0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '3bcfffca914ddc51084f9b3510aca5f79a71b496':
Import translations. DO NOT MERGE
2013-08-19 13:14:27 -07:00
Tom O'Neill
4a70f652ad
Move UPDATE_INTENT to SettingsInjectorService
...
Change-Id: I657c799b791e49e4af097f3cc4afdaa8f48325ac
2013-08-19 13:13:25 -07:00
Baligh Uddin
9378f59507
am 6a5c9a83
: (-s ours) am 1df37ff1
: (-s ours) am 2b851859
: (-s ours) am b09878b8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6a5c9a83d6a5667cefff5c4a13d90f670d625c47':
Import translations. DO NOT MERGE
2013-08-19 13:13:07 -07:00
Baligh Uddin
6a5c9a83d6
am 1df37ff1
: (-s ours) am 2b851859
: (-s ours) am b09878b8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '1df37ff1b1761ed6124e1ff1abcfb4c0d60f6c77':
Import translations. DO NOT MERGE
2013-08-19 13:09:43 -07:00
Baligh Uddin
55b57ed7d5
am 05e3f627
: (-s ours) am 5c601791
: (-s ours) am 8485f115
: (-s ours) Import translations. DO NOT MERGE
...
* commit '05e3f627477053b1568558de5454b7b5e8b5805d':
Import translations. DO NOT MERGE
2013-08-19 13:09:36 -07:00
Baligh Uddin
3bcfffca91
am b0130e7b
: (-s ours) am 21cbd017
: (-s ours) am e37538b1
: (-s ours) am 8c6de9e0
: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b0130e7b9c58f7e2a346b6ebd70d3f79a29b052b':
Import translations. DO NOT MERGE
2013-08-19 13:09:35 -07:00
Baligh Uddin
9c6815a14c
am 6d3d55e6
: (-s ours) am c7ec87f1
: (-s ours) Import translations. DO NOT MERGE
...
* commit '6d3d55e6138f18850e8116716efec06292ccc194':
Import translations. DO NOT MERGE
2013-08-19 13:07:24 -07:00
Baligh Uddin
05e3f62747
am 5c601791
: (-s ours) am 8485f115
: (-s ours) Import translations. DO NOT MERGE
...
* commit '5c601791074c2275bd42ad8c6798ef39b13e0a6d':
Import translations. DO NOT MERGE
2013-08-19 13:06:15 -07:00
Baligh Uddin
b0130e7b9c
am 21cbd017
: (-s ours) am e37538b1
: (-s ours) am 8c6de9e0
: (-s ours) Import translations. DO NOT MERGE
...
* commit '21cbd017a3201639097cda31c59f769d1cc2b739':
Import translations. DO NOT MERGE
2013-08-19 13:06:14 -07:00
Baligh Uddin
1df37ff1b1
am 2b851859
: (-s ours) am b09878b8
: (-s ours) Import translations. DO NOT MERGE
...
* commit '2b85185988eec44b6fdd3ee072d44b0a7a72d432':
Import translations. DO NOT MERGE
2013-08-19 13:04:58 -07:00