Jim Miller
f9e4337890
am ca436417
: am f6794f95
: Merge "Add setting to disable keyguard widgets" into klp-dev
...
* commit 'ca436417875bacc337080a7066395ca1ca0b2492':
Add setting to disable keyguard widgets
2013-08-26 15:09:38 -07:00
Lifu Tang
541cdaafd0
am 2110efe5
: am 85dfc900
: Merge "Allows multi-line message on small-screen devices" into klp-dev
...
* commit '2110efe50f24606c9c44711321b5600d2de50964':
Allows multi-line message on small-screen devices
2013-08-26 15:09:37 -07:00
Chong Zhang
8a7164c33a
am 41bfb63f
: am 5114444e
: Merge "wifi-display: add certification options" into klp-dev
...
* commit '41bfb63ff90d3791099455aef59738d841b5f3e5':
wifi-display: add certification options
2013-08-26 15:09:37 -07:00
Jim Miller
ca43641787
am f6794f95
: Merge "Add setting to disable keyguard widgets" into klp-dev
...
* commit 'f6794f95d19306e0f8a1edf02670d8dabd6daa5f':
Add setting to disable keyguard widgets
2013-08-26 15:03:23 -07:00
Lifu Tang
2110efe50f
am 85dfc900
: Merge "Allows multi-line message on small-screen devices" into klp-dev
...
* commit '85dfc9009fdad338cdda62cbcc549fde8479bdce':
Allows multi-line message on small-screen devices
2013-08-26 15:03:19 -07:00
Chong Zhang
41bfb63ff9
am 5114444e
: Merge "wifi-display: add certification options" into klp-dev
...
* commit '5114444eca4e62f32cc85b9740dc0c66f87d5d99':
wifi-display: add certification options
2013-08-26 15:03:07 -07:00
Jim Miller
f6794f95d1
Merge "Add setting to disable keyguard widgets" into klp-dev
2013-08-24 01:28:40 +00:00
Lifu Tang
85dfc9009f
Merge "Allows multi-line message on small-screen devices" into klp-dev
2013-08-24 00:00:36 +00:00
Chong Zhang
5114444eca
Merge "wifi-display: add certification options" into klp-dev
2013-08-23 23:19:18 +00:00
Lifu Tang
3a15402243
Allows multi-line message on small-screen devices
...
Change-Id: Ief7e152165059cea165f1271ab27a8a42537db8f
2013-08-23 15:32:25 -07:00
Baligh Uddin
a0aee43e84
Import translations. DO NOT MERGE
...
Change-Id: I1680219b7f4f2e9d71bb901d7708ef6eb153cfb6
Auto-generated-cl: translation import
2013-08-23 10:21:09 -07:00
Chong Zhang
6c607384c4
wifi-display: add certification options
...
- Checkbox to show certification menu in "Developer options"
- Certification menu to Wireless Display Settings, providing
misc control options required to certify
Bug: 9371882
Change-Id: Icf74d1122a9dc813b2cf95b6606a8a600a6b9cd1
2013-08-22 23:47:08 -07:00
Lifu Tang
4981c4c10a
am 594150da
: am be9ebb44
: Merge "Minor UI tweakings" into klp-dev
...
* commit '594150daa55941c09788a7e9122f2e1987c8a60d':
Minor UI tweakings
2013-08-22 14:50:54 -07:00
Lifu Tang
594150daa5
am be9ebb44
: Merge "Minor UI tweakings" into klp-dev
...
* commit 'be9ebb4436678ab5afecccc8a4bb7b9be6af370a':
Minor UI tweakings
2013-08-22 14:48:10 -07:00
Lifu Tang
be9ebb4436
Merge "Minor UI tweakings" into klp-dev
2013-08-22 21:46:34 +00:00
Lifu Tang
08a4c33a40
Minor UI tweakings
...
* Changed PreferenceScreen to Preference.
* Adjusted the "No recent app" message layout.
* No "Location services" category when empty.
* Removed "Under Construction" finally, hooray!
Change-Id: I83fd1d7a1b0235ad21b3a5c54542e937b60b3940
2013-08-22 12:36:20 -07:00
Baligh Uddin
2768a5e992
Merge "Import translations. DO NOT MERGE"
2013-08-22 17:52:43 +00:00
Baligh Uddin
81eab3f04a
Merge "Import translations. DO NOT MERGE" into klp-dev
2013-08-22 17:52:33 +00:00
Baligh Uddin
293ed7bd4c
Import translations. DO NOT MERGE
...
Change-Id: I2c72ecd95f32cca154a87fee61ce55634e95f3e5
Auto-generated-cl: translation import
2013-08-21 16:15:15 -07:00
Baligh Uddin
0e71d6fee4
Import translations. DO NOT MERGE
...
Change-Id: I1f4834979c234fd3a3b2238bc4e3e5da68d033db
Auto-generated-cl: translation import
2013-08-21 16:08:45 -07:00
Alan Viverette
cd63a19c61
am b46f9f42
: am e873aeb3
: Update caption preferences to use SubtitleView
...
* commit 'b46f9f42f707ec1ebd4783013fe6e0d122721fd0':
Update caption preferences to use SubtitleView
2013-08-21 14:16:32 -07:00
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
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
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
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
Baligh Uddin
50d2f8b794
Import translations. DO NOT MERGE
...
Change-Id: I5f89a996c28fbe668105892be7d40eec26065de3
Auto-generated-cl: translation import
2013-08-19 12:14:29 -07:00
Baligh Uddin
c7ec87f1db
Import translations. DO NOT MERGE
...
Change-Id: Ice096be39ce880f1a777c969b0bfb7e2987ec888
Auto-generated-cl: translation import
2013-08-19 12:08:24 -07:00
Baligh Uddin
97bed1e29e
Import translations. DO NOT MERGE
...
Change-Id: Ica475ca583a88772689f57745da3023d9955e70b
Auto-generated-cl: translation import
2013-08-14 14:50:28 -07:00
Baligh Uddin
3c8c3f9b00
Import translations. DO NOT MERGE
...
Change-Id: I3504c607a35636c6e0455571e9e7006244564b95
Auto-generated-cl: translation import
2013-08-14 14:46:29 -07:00
Tom O'Neill
4a41f33c5a
am 0574c26c
: am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit '0574c26c36b1b760d80107fb4171cdcb642aabf1':
Settings app supports location settings injection
2013-08-13 17:37:55 -07:00
Tom O'Neill
0574c26c36
am cabe7e82
: Merge "Settings app supports location settings injection" into klp-dev
...
* commit 'cabe7e821886f560e2bff7d2528069308458dc98':
Settings app supports location settings injection
2013-08-13 17:34:20 -07:00
Tom O'Neill
cabe7e8218
Merge "Settings app supports location settings injection" into klp-dev
2013-08-14 00:30:30 +00:00
Tom O'Neill
e2921c9566
Settings app supports location settings injection
...
- Partial fix for b/10287745
Change-Id: Ia5eb05670957125e70717c86a686a54b77b22455
2013-08-12 16:22:48 -07:00
Baligh Uddin
f5ecf575da
Import translations. DO NOT MERGE
...
Change-Id: Id616ecb4c01bfd2a4ee8fa3199c3e2dfc0140f62
Auto-generated-cl: translation import
2013-08-12 11:54:53 -07:00
Baligh Uddin
a45cd5a60e
Import translations. DO NOT MERGE
...
Change-Id: I6770486a959f0bd90fe6621ba8e6348f7f5381f0
Auto-generated-cl: translation import
2013-08-12 11:51:11 -07:00
Zhihai Xu
9bef999b87
am eb9cecd9
: am 6ee5b450
: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit 'eb9cecd98b280c508b88d03ad788202ac0e35e53':
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:52:07 -07:00
Zhihai Xu
eb9cecd98b
am 6ee5b450
: Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
...
* commit '6ee5b4508083fd0dd340396d66927c0fc8870a9b':
Bluetooth MAP profile - sms and mms support initial check-in
2013-08-09 18:49:59 -07:00
Zhihai Xu
6ee5b45080
Merge "Bluetooth MAP profile - sms and mms support initial check-in" into klp-dev
2013-08-10 01:46:22 +00:00