John Spurlock
3b6161b0a3
am 352d721b: am eef03831: Merge "Draw status bar battery icon bolt in code." into klp-dev
...
* commit '352d721b612bf35b1c64249705d00ad2f3899031':
Draw status bar battery icon bolt in code.
2013-09-09 08:18:59 -07:00
John Spurlock
352d721b61
am eef03831: Merge "Draw status bar battery icon bolt in code." into klp-dev
...
* commit 'eef03831fdde5a89b88451bcf12274697fe1db99':
Draw status bar battery icon bolt in code.
2013-09-09 08:16:23 -07:00
John Spurlock
eef03831fd
Merge "Draw status bar battery icon bolt in code." into klp-dev
2013-09-09 15:13:40 +00:00
Wink Saville
3553be2bff
am a71947ff: am bdd61696: Merge "Tighten test for warm sim and add more debug." into klp-dev
...
* commit 'a71947ff7f28686f0f0fdc0586d85718e1a62352':
Tighten test for warm sim and add more debug.
2013-09-09 02:48:37 -07:00
Wink Saville
9772a5015b
am 42b3a6a7: am c59c6dd6: Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev
...
* commit '42b3a6a7be0201cb40fb1c36f97476c775be0cf1':
For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
2013-09-09 02:48:33 -07:00
Christopher Tate
8474ae7df0
am 6b86ac70: am ffe0a803: Fix permission checks around setBackupEnabled()
...
* commit '6b86ac70460c2fc393159fa7a88d14460a917117':
Fix permission checks around setBackupEnabled()
2013-09-09 02:48:30 -07:00
Narayan Kamath
451f6b981a
resolved conflicts for merge of d4ff4b64 to master
...
Change-Id: I0bcc072908164ca2aa80e991c03e739551e278c5
2013-09-09 10:27:30 +01:00
Christopher Tate
be8e9ff7ed
am bb595190: am 89c5a118: Merge "Don\'t crash attempting restore of uninstalled live wallpaper" into klp-dev
...
* commit 'bb595190242a5405c0a6f0470532407543d6e00b':
Don't crash attempting restore of uninstalled live wallpaper
2013-09-09 02:24:46 -07:00
Narayan Kamath
0033539a43
resolved conflicts for merge of ab98aec6 to master
...
Change-Id: I773bce338ebc42f7428d9942d22ed140bcfbf3d9
2013-09-09 09:59:31 +01:00
Wink Saville
a71947ff7f
am bdd61696: Merge "Tighten test for warm sim and add more debug." into klp-dev
...
* commit 'bdd61696c6720faa14ca9fdf180e519138b3d087':
Tighten test for warm sim and add more debug.
2013-09-08 18:34:11 -07:00
Wink Saville
42b3a6a7be
am c59c6dd6: Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev
...
* commit 'c59c6dd66b8ec5537c82e330d1c96e9fa424b4fa':
For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
2013-09-08 18:34:09 -07:00
Wink Saville
bdd61696c6
Merge "Tighten test for warm sim and add more debug." into klp-dev
2013-09-09 01:32:45 +00:00
Wink Saville
c59c6dd66b
Merge "For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM" into klp-dev
2013-09-09 01:32:01 +00:00
Christopher Tate
6b86ac7046
am ffe0a803: Fix permission checks around setBackupEnabled()
...
* commit 'ffe0a803f8e9546a0dbf6c82d6089ac0eee32ddb':
Fix permission checks around setBackupEnabled()
2013-09-08 17:54:40 -07:00
Christopher Tate
ffe0a803f8
Fix permission checks around setBackupEnabled()
...
...by making sure to drop binder identity before writing our new
state to secure settings etc.
Bug 10506933
Change-Id: I00505cc5215c8fe5f30f2f35698b30645fe14c87
2013-09-08 15:41:32 -07:00
Dianne Hackborn
d4ff4b649e
am e6a01f37: Merge "Fix build." into klp-dev
...
* commit 'e6a01f37934340c9fce9dcd8ee98b02d9d635af6':
Fix build.
2013-09-08 13:14:56 -07:00
Dianne Hackborn
e6a01f3793
Merge "Fix build." into klp-dev
2013-09-08 20:13:13 +00:00
Christopher Tate
bb59519024
am 89c5a118: Merge "Don\'t crash attempting restore of uninstalled live wallpaper" into klp-dev
...
* commit '89c5a1180830934db485ff9c189143deab653310':
Don't crash attempting restore of uninstalled live wallpaper
2013-09-08 13:08:24 -07:00
Dianne Hackborn
01f8c0e277
Fix build.
...
Change-Id: Ifeac5d09a654ee1183ae26519c8b44f560afd636
2013-09-08 13:07:32 -07:00
Christopher Tate
89c5a11808
Merge "Don't crash attempting restore of uninstalled live wallpaper" into klp-dev
2013-09-08 20:07:20 +00:00
Christopher Tate
909522048f
Don't crash attempting restore of uninstalled live wallpaper
...
Bug 10658041
Change-Id: I08b38cc81fbb89907a4ffe5b6f94e9a507226011
2013-09-08 13:01:28 -07:00
Dianne Hackborn
ab98aec612
am 4b989781: Merge "Work on issue #10130785 : Restore silence and vibrate settings..." into klp-dev
...
* commit '4b98978157295c6e7ea21b70ffcf9edffc41f0e1':
Work on issue #10130785 : Restore silence and vibrate settings...
2013-09-08 12:33:48 -07:00
Dianne Hackborn
4b98978157
Merge "Work on issue #10130785 : Restore silence and vibrate settings..." into klp-dev
2013-09-08 19:31:06 +00:00
John Spurlock
fceb7eddde
Draw status bar battery icon bolt in code.
...
Use high-res polygon points, punching a hole in the rest of drawing
with PorterDuff.Mode.CLEAR.
Remove the now obsolete lightning.png and associated color filters.
Bug:10640891
Change-Id: I8f2d4dd157f9866f37ed9b3480bb79ee9f109975
2013-09-08 10:29:11 -04:00
Svetoslav Ganov
d0ff896789
am d8adcd21: am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
...
* commit 'd8adcd219dab97682a808b1ba12cd6528e33505e':
Printers for a disappearing print serivce incorrectly removed.
2013-09-07 15:09:24 -07:00
Svetoslav Ganov
d8adcd219d
am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
...
* commit 'c72221242e560b4176e6fb9e3eec1c32cc1b96c3':
Printers for a disappearing print serivce incorrectly removed.
2013-09-07 15:07:09 -07:00
Svetoslav Ganov
c72221242e
Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev
2013-09-07 22:05:14 +00:00
Jeff Sharkey
f32df5d8b7
am 75f1ef2c: am 70cdfe7e: Merge "Item layout tweaking, hook up more assets." into klp-dev
...
* commit '75f1ef2cd0bb0a11dbcf3c6a6422cb7f5ac31e8e':
Item layout tweaking, hook up more assets.
2013-09-07 12:48:14 -07:00
Jeff Sharkey
75f1ef2cd0
am 70cdfe7e: Merge "Item layout tweaking, hook up more assets." into klp-dev
...
* commit '70cdfe7eb1d42d5e928f5c7c6106be4ebb8fde51':
Item layout tweaking, hook up more assets.
2013-09-07 12:45:24 -07:00
Jeff Sharkey
70cdfe7eb1
Merge "Item layout tweaking, hook up more assets." into klp-dev
2013-09-07 19:42:14 +00:00
Wink Saville
67c8134166
For NETWORK_MODE_LTE_CMDA_EVDO_GSM_WCDMA default to PHONE_TYPE_GSM
...
Bug: 9710534
Change-Id: Iba999579d30045f18b5d370359dbce65d9646c69
2013-09-07 10:03:02 -07:00
Ying Wang
cc7754ee36
am 4700175a: am d57de6af: Fix docs build.
...
* commit '4700175a2617b456c2b820d519750e80cda465fc':
Fix docs build.
2013-09-06 23:02:11 -07:00
Ying Wang
4700175a26
am d57de6af: Fix docs build.
...
* commit 'd57de6afb8981dc1663d41a842ab7cdae93427a1':
Fix docs build.
2013-09-06 22:59:40 -07:00
Ying Wang
d57de6afb8
Fix docs build.
...
Change-Id: I6fd0d711b2cc7726fdaa9119ee467ed6fab82de1
2013-09-06 22:53:16 -07:00
Eric Laurent
3ad98d992d
am 533587d8: am 9f4a392e: Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev
...
* commit '533587d805892572a837098ec196d1710a5187bb':
Unhide AudioTimestamp and getTimestamp
2013-09-06 19:22:13 -07:00
Eric Laurent
533587d805
am 9f4a392e: Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev
...
* commit '9f4a392e367c9702ccce254afd612d2c2ae3f58c':
Unhide AudioTimestamp and getTimestamp
2013-09-06 19:19:36 -07:00
Eric Laurent
9f4a392e36
Merge "Unhide AudioTimestamp and getTimestamp" into klp-dev
2013-09-07 02:16:31 +00:00
Glenn Kasten
5e8f278f08
Unhide AudioTimestamp and getTimestamp
...
Change-Id: I56687f42f83c4be7dc3fd1baa81a13e71113f22e
2013-09-06 19:11:29 -07:00
Michael Wright
65ae4c6f79
am 8091f226: am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev
...
* commit '8091f2262fe0774723694cea95a6f8b8785087e4':
Remove tap to click from touch nav devices
2013-09-06 19:07:29 -07:00
Michael Wright
aa1c5e4deb
am d13fa001: am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev
...
* commit 'd13fa0018b273f0db13154d520f7f0d11a2cb375':
Special case game controller fallback keys for Japan
2013-09-06 19:07:25 -07:00
Michael Wright
8091f2262f
am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev
...
* commit 'edaf6af16a5c33557a9c4ed00f9bebdac0dd83aa':
Remove tap to click from touch nav devices
2013-09-06 19:05:47 -07:00
Michael Wright
d13fa0018b
am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev
...
* commit '7b4f60deb2819496733c0c85c57c6236900fe0c2':
Special case game controller fallback keys for Japan
2013-09-06 19:05:44 -07:00
Michael Wright
edaf6af16a
Merge "Remove tap to click from touch nav devices" into klp-dev
2013-09-07 02:04:46 +00:00
Michael Wright
7b4f60deb2
Merge "Special case game controller fallback keys for Japan" into klp-dev
2013-09-07 02:04:20 +00:00
Jeff Brown
c677ff8c3b
am cbf2b02d: am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev
...
* commit 'cbf2b02d6c288c49f5bdbcb70d87c44d26086ba4':
Fix native crash when message queue quits.
2013-09-06 18:41:43 -07:00
Jeff Brown
cbf2b02d6c
am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev
...
* commit '23a5f44c5a306b4a70821722a697da55cc3c5db8':
Fix native crash when message queue quits.
2013-09-06 18:39:09 -07:00
Jeff Brown
c9f779824e
am affacbcc: am 82975e40: Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev
...
* commit 'affacbcceda789021c338d8aac3ff40e33c33e4c':
Emit a more meaningful cause for watchdog restarts.
2013-09-06 18:38:11 -07:00
Jeff Brown
affacbcced
am 82975e40: Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev
...
* commit '82975e40083b86d2619ffa60ff7351928ec35978':
Emit a more meaningful cause for watchdog restarts.
2013-09-06 18:35:34 -07:00
Jeff Brown
23a5f44c5a
Merge "Fix native crash when message queue quits." into klp-dev
2013-09-07 01:34:52 +00:00
Jeff Brown
82975e4008
Merge "Emit a more meaningful cause for watchdog restarts." into klp-dev
2013-09-07 01:33:00 +00:00