Jonathan Dixon
d0780fceda
am f3267d9f: Merge "Add an Are you Sure to experiemental webview" into klp-dev
...
* commit 'f3267d9fee8f2dd675d66b00a566da06717f8664':
Add an Are you Sure to experiemental webview
2013-08-21 22:02:52 -07:00
Jonathan Dixon
f3267d9fee
Merge "Add an Are you Sure to experiemental webview" into klp-dev
2013-08-22 05:00:20 +00:00
David Christie
a99ec98710
am 9fb0ab85: Merge "Update power widget to represent gps instead of location master." into klp-dev
...
* commit '9fb0ab85a2a6fba39a19d86361f31a693163402a':
Update power widget to represent gps instead of location master.
2013-08-21 21:17:53 -07:00
David Christie
9fb0ab85a2
Merge "Update power widget to represent gps instead of location master." into klp-dev
2013-08-22 04:14:56 +00:00
Jonathan Dixon
ba0ef659e1
Add an Are you Sure to experiemental webview
...
Bug: 10427705
Not bothering to translate strings as this will be deleted soon
Change-Id: I26721e606649d267d1b6507bc1a16ce91a63276a
2013-08-21 17:49:59 -07:00
David Christie
5eed792a76
Update power widget to represent gps instead of location master.
...
Change-Id: I62f701b612db2e31f9ad8b016dbf37ed7fd4ef26
2013-08-21 17:18:51 -07:00
Lifu Tang
0edf8ecbd6
am 25518c3b: Sort "Location services" alphabetically
...
* commit '25518c3b45827537b2b2c2b35fdc86bc8bd60502':
Sort "Location services" alphabetically
2013-08-21 17:06:44 -07:00
Lifu Tang
25518c3b45
Sort "Location services" alphabetically
...
* Sort "Location services" items by title
* Throttle the rate of loading status messages
Change-Id: Iecb039a4ab94a810e11ef3e426e4a4b5c8c75c37
2013-08-21 16:52:14 -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
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
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
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
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
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
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
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
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
Baligh Uddin
6d3d55e613
am c7ec87f1: (-s ours) Import translations. DO NOT MERGE
...
* commit 'c7ec87f1db5081efe038ee0da3aae7ccd830612e':
Import translations. DO NOT MERGE
2013-08-19 13:02:18 -07:00
Baligh Uddin
2b85185988
am b09878b8: (-s ours) Import translations. DO NOT MERGE
...
* commit 'b09878b85044df1032eb4612b3165216388165ac':
Import translations. DO NOT MERGE
2013-08-19 13:01:53 -07:00
Baligh Uddin
5c60179107
am 8485f115: (-s ours) Import translations. DO NOT MERGE
...
* commit '8485f115d25968c0fa3ab9d1ea42d2751422feb5':
Import translations. DO NOT MERGE
2013-08-19 13:00:37 -07:00
Baligh Uddin
21cbd017a3
am e37538b1: (-s ours) am 8c6de9e0: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e37538b122199f316b8b8eb76a6445de6f5c83be':
Import translations. DO NOT MERGE
2013-08-19 13:00:36 -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
8485f115d2
Import translations. DO NOT MERGE
...
Change-Id: Id76ef34b16fb0979b5b86c5e04b60e0d3088c54a
Auto-generated-cl: translation import
2013-08-19 12:04:34 -07:00
Baligh Uddin
b09878b850
Import translations. DO NOT MERGE
...
Change-Id: I3c136ce6349c35f3cec69d12f355daaf1e8912b5
Auto-generated-cl: translation import
2013-08-19 12:03:06 -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
