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
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
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
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
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
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
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
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
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
Lifu Tang
bfa96c3b10
Supress Location button when coming from Location
...
Change-Id: Ie1f1aed17206530ec7c8a1cde43a4380b7232823
2013-08-19 14:15:52 -07:00
Tom O'Neill
4a70f652ad
Move UPDATE_INTENT to SettingsInjectorService
...
Change-Id: I657c799b791e49e4af097f3cc4afdaa8f48325ac
2013-08-19 13:13:25 -07:00
Christopher Tate
a218e732b0
Don't crash when procstats has data for a now-disused uid
...
That is, PackageManager.getPackagesForUid(uid) can return null,
so deal with it.
Bug 10374656
Change-Id: I4eacd48c809b778e131d37dba0e86c583553e41f
2013-08-18 17:26:48 -07:00
Amith Yamasani
78b8265b17
Select max timeout, if it's in the timeout list
...
Bug: 10192592
Change-Id: I21ec208abf0c8659233cdb5219d9b226528aa1d4
2013-08-16 16:35:54 -07:00
Amith Yamasani
928191881d
Don't list apps that are disabled by the system
...
This is to make sure that apps that were disabled for some reason
such as inappropriateness for a locale or for a specific device, don't
show up as available to enable for a restricted profile.
But in the case that the app was already enabled for the target profile,
show it in the list so that it can be disabled if necessary.
Bug: 10229133
Change-Id: I3c19edb7364cea42d95b619781e0326543b9a1cf
2013-08-16 13:59:40 -07:00
Amith Yamasani
905c00a405
am 55fe056d
: Merge "Don\'t apply encryption password requirements for secondary users" into klp-dev
...
* commit '55fe056d96bdb683dce0a4e66e7390d19f23e710':
Don't apply encryption password requirements for secondary users
2013-08-15 18:09:06 -07:00
Amith Yamasani
55fe056d96
Merge "Don't apply encryption password requirements for secondary users" into klp-dev
2013-08-16 01:04:51 +00:00
Zhihai Xu
97fb8dbbe8
am 3d74aeaa
: Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
...
* commit '3d74aeaa85285425fc5f20cf93f615a4ead6d2fd':
LE: Add support for the HID-over-GATT profile (3/3)
2013-08-15 17:24:54 -07:00
Zhihai Xu
3d74aeaa85
Merge "LE: Add support for the HID-over-GATT profile (3/3)" into klp-dev
2013-08-16 00:22:33 +00:00
Lifu Tang
5c12d789f5
am c3e9ac93
: Linked the recent location apps to battery page
...
* commit 'c3e9ac937a4ba948d47cbb83f6999af34fd00b65':
Linked the recent location apps to battery page
2013-08-15 16:59:25 -07:00
Amith Yamasani
12411fba8e
Don't apply encryption password requirements for secondary users
...
Bug: 10314289
Change-Id: I54a54f910c914b41abd3e18963b4bd0c3cddb34a
2013-08-15 15:35:49 -07:00
Andre Eisenbach
79f3384eaa
LE: Add support for the HID-over-GATT profile (3/3)
...
bug:8330048
Change-Id: I0999c3af999939aec88eba4c38bca4358c554e69
2013-08-15 15:21:27 -07:00
Lifu Tang
c3e9ac937a
Linked the recent location apps to battery page
...
* Extracted BatteryStatsHelper from PowerUsageSummary
* Dropped the "pause" and "resume" method from the
RadioButtonPreference
* Opening battery usage page when the user clicks the recent location
apps item
Change-Id: I5a2d03271434765780154265976d8caa7f8060d8
2013-08-15 14:49:08 -07:00
Lifu Tang
adb9f2b992
am 5db411db
: Merge "Shows "App Info" for system apps" into klp-dev
...
* commit '5db411db9881ea9ec48f2a607b711d8daa74d1ca':
Shows "App Info" for system apps
2013-08-15 12:17:03 -07:00
Lifu Tang
5db411db98
Merge "Shows "App Info" for system apps" into klp-dev
2013-08-15 19:13:42 +00:00
Robert Greenwalt
9e96c453fb
am a1fa7cef
: am 1faefa06
: Merge "Fix one NPE in tethering setting"
...
* commit 'a1fa7cef5d88d0f515efa07d0f7274c41fa6d712':
Fix one NPE in tethering setting
2013-08-15 07:19:36 -07:00
Robert Greenwalt
a1fa7cef5d
am 1faefa06
: Merge "Fix one NPE in tethering setting"
...
* commit '1faefa06a3a742123af8ea5be5bbfb730db16c7c':
Fix one NPE in tethering setting
2013-08-15 07:17:11 -07:00
Robert Greenwalt
1faefa06a3
Merge "Fix one NPE in tethering setting"
2013-08-15 14:13:10 +00:00
Jianzheng Zhou
508c7c16ab
Fix one NPE in tethering setting
...
Once we not declare BT feature, go Setting->more->tethering
will trigger this NPE.
Change-Id: I4736e7bade261475acda74e26250a81452018ffa
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com >
2013-08-15 14:34:52 +08:00
Lifu Tang
5d4e69a527
Shows "App Info" for system apps
...
If a specific Uid contains only one package, we show the "App Info"
button, even if it's a system app
Change-Id: Ie39b6d90e62ae432c636d50729f0aa45405ce67c
2013-08-14 17:25:12 -07:00
Martijn Coenen
fcfd865d5c
Merge "NFC: Allow to get result from tap-pay default dialog." into klp-dev
2013-08-14 15:58:07 +00:00
Martijn Coenen
e0a38911a3
NFC: Allow to get result from tap-pay default dialog.
...
Change-Id: Ic9e88dca5577a4f553dca56e0ff387c1e96f2ed2
2013-08-14 08:57:11 -07:00
Tom O'Neill
cabe7e8218
Merge "Settings app supports location settings injection" into klp-dev
2013-08-14 00:30:30 +00:00
Maggie Benthall
cd3eb97ce5
Merge "Fix bug when sharing to bluetooth." into klp-dev
2013-08-13 17:00:25 +00:00
Przemyslaw Szczepaniak
0e01f128ab
Fix for TTS settings crash.
...
Play an example is wrongly enabled before TTS engine is initialized.
Bug: 10288565
Change-Id: I9204d8dda7f8de5c67aba2bb73b25589eeac5cef
2013-08-13 13:05:48 +01: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
Maggie Benthall
3343d1aabb
Fix bug when sharing to bluetooth.
...
Bug:10259347
Change-Id: I860a758333947c4207d7acda41e43b8bd1d671df
2013-08-12 18:40:45 -04: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