Jason Sams
0353efc1ca
am 1e26a8b3: Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev
...
* commit '1e26a8b35884fbe252feb0a89035410e77688cd0':
LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test
2012-09-11 15:41:18 -07:00
Jason Sams
1e26a8b358
Merge "LUT intrinsic and CrossProcess test. 5x5 convolve and test Gauss blur and test" into jb-mr1-dev
2012-09-11 15:39:18 -07:00
Scott Main
01f9bf3fef
small update to the ADT installation steps based on new ADT UI
...
Change-Id: I1c3ddfcb6188dd0bdc87a2b2e8241dfd7fcaa4dc
2012-09-11 15:24:16 -07:00
Christopher Tate
ae25805d20
am 99c0cb3b: Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
...
* commit '99c0cb3b9d9fe187879ed1e03a8cc850f1906cc9':
Set up default (random) Android IDs for all users
2012-09-11 15:24:01 -07:00
Christopher Tate
99c0cb3b9d
Merge "Set up default (random) Android IDs for all users" into jb-mr1-dev
2012-09-11 15:20:34 -07:00
Robert Greenwalt
f02e72d99f
am f008ab72: am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit 'f008ab727e46926bff018ef970ea8265ccc0f45d':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:11:23 -07:00
Robert Greenwalt
f008ab727e
am 5d33e76c: am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '5d33e76cff65245d03f592a3dbcbf2e17a2f1581':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:09:11 -07:00
Robert Greenwalt
5d33e76cff
am 65208857: am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '65208857d35efe39c1dbc1da23f2caf7257232fc':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:07:01 -07:00
Robert Greenwalt
65208857d3
am 2415841c: Merge "EthernetDataTracker: indicate link up based on flags"
...
* commit '2415841c370d855d7f3a3e6a537e641c69a57097':
EthernetDataTracker: indicate link up based on flags
2012-09-11 15:04:50 -07:00
Selim Gurun
77f02ca908
am 79ccb1e8: Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
...
* commit '79ccb1e8a94eec580eea54db05a7ba246dbf6d92':
Deleting the defunct SearchBox interface.
2012-09-11 15:03:59 -07:00
Robert Greenwalt
2415841c37
Merge "EthernetDataTracker: indicate link up based on flags"
2012-09-11 15:02:24 -07:00
Selim Gurun
79ccb1e8a9
Merge "Deleting the defunct SearchBox interface." into jb-mr1-dev
2012-09-11 15:01:21 -07:00
Christopher Tate
4dc7a68dbe
Set up default (random) Android IDs for all users
...
Also correct some now-misleading terminology in a permission-check
log message, and fix a bug in which a system component trying to
write to a secondary user's settings would wind up writing the
owner's settings instead.
Bug 7132405
Change-Id: I5b8fafc35720390a01652e386ab5b7c0ad751abe
2012-09-11 14:51:33 -07:00
Vishal Mahaveer
b6b72f5411
EthernetDataTracker: indicate link up based on flags
...
Indicate link up state based on flags/interface up, and not on IP address.
This is for ethernet interfaces that already exists.
Change-Id: Ib342d519c483bbb2dfa08cfac2c0c1a288cee7c0
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
2012-09-11 16:41:16 -05:00
JP Abgrall
0c6f17370a
am d428e95e: Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev
...
* commit 'd428e95eb5bb0fe9ee4984c89c28bea3aff1b259':
core: config: Update the description of the autoBrightnessLevels array.
2012-09-11 14:01:52 -07:00
Jim Miller
57db8bc425
am 752ef4e0: Merge "This enables the back button in keyguard" into jb-mr1-dev
...
* commit '752ef4e0f86fa1412488b6c03ff4ae8a22f0e307':
This enables the back button in keyguard
2012-09-11 14:01:48 -07:00
Adam Cohen
d94fc289f5
am b0246ce1: Merge "Fixing build (update-api)" into jb-mr1-dev
...
* commit 'b0246ce14a63ad0eb4c2a77041ae443a2c1a1c2b':
Fixing build (update-api)
2012-09-11 14:00:06 -07:00
JP Abgrall
d428e95eb5
Merge "core: config: Update the description of the autoBrightnessLevels array." into jb-mr1-dev
2012-09-11 13:58:40 -07:00
Jim Miller
752ef4e0f8
Merge "This enables the back button in keyguard" into jb-mr1-dev
2012-09-11 13:58:40 -07:00
Jeff Brown
2eb82513bd
am 9ba2a188: Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
...
* commit '9ba2a188919e6e5bf8c042b26527fc090de677ef':
Don't auto-discover peers until scan requested.
Use wfdInfo to filter available sinks.
Allow adb shell am display-size to use bigger sizes.
2012-09-11 13:58:28 -07:00
Adam Cohen
b0246ce14a
Merge "Fixing build (update-api)" into jb-mr1-dev
2012-09-11 13:56:38 -07:00
Jeff Brown
9ba2a18891
Merge changes I4ad08873,If0562677,I5fe6ba32 into jb-mr1-dev
...
* changes:
Don't auto-discover peers until scan requested.
Use wfdInfo to filter available sinks.
Allow adb shell am display-size to use bigger sizes.
2012-09-11 13:56:04 -07:00
Adam Cohen
2071e8408a
Fixing build (update-api)
...
Change-Id: I78738cc8320dab1fde082bfa9f65d020c6573de7
2012-09-11 13:54:07 -07:00
Marco Nelissen
80cd3fcd5c
EffectsTest enhancements
...
Fix the session edit boxes, and make the effects list more readable
by translating known effect type UUIDs
Change-Id: I67e78d8d2781c5a56fa35d994bc21911d15f8715
2012-09-11 13:47:16 -07:00
JP Abgrall
81985bcbe6
core: config: Update the description of the autoBrightnessLevels array.
...
Clarify what the control point values are.
Change-Id: I33860c575b13e5216c804c7c76fa5733fcebf8ad
2012-09-11 13:41:25 -07:00
Selim Gurun
a7094734ae
Deleting the defunct SearchBox interface.
...
Change-Id: Iecb698dbe942d3c9680ad1135ba0d604aa211856
2012-09-11 13:27:08 -07:00
Selim Gurun
cccad2d8c2
am faed98a1: Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
...
* commit 'faed98a161f58441ebce3dcb08cd8bf76a76da4e':
Added annotations for injected accessibility objects
2012-09-11 13:26:18 -07:00
Selim Gurun
faed98a161
Merge "Added annotations for injected accessibility objects" into jb-mr1-dev
2012-09-11 13:23:45 -07:00
Wink Saville
fa9cae7e91
am ea4f446a: am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit 'ea4f446a816ee1558c2776206642d0751fc2afb7':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:23:39 -07:00
Wink Saville
ea4f446a81
am 72c06bcf: am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit '72c06bcf1970f615f5037b9f63759d06a527cb4e':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:21:38 -07:00
Adam Cohen
2664f94f20
am aec914b1: Merge "Adding notion of keyguard widgets" into jb-mr1-dev
...
* commit 'aec914b1301b9608053b77318c8ea86fa162f14d':
Adding notion of keyguard widgets
2012-09-11 13:19:52 -07:00
Wink Saville
72c06bcf19
am 0c99f7e3: am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit '0c99f7e36da7ebc92d0a084f3dc1717a7c31423e':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:19:18 -07:00
Adam Cohen
aec914b130
Merge "Adding notion of keyguard widgets" into jb-mr1-dev
2012-09-11 13:18:14 -07:00
Wink Saville
0c99f7e36d
am ba3cf72a: Merge "Telephony: Clarify IccCardConstants.State enum"
...
* commit 'ba3cf72a08368ab40556b07b4518536bb59eb2f6':
Telephony: Clarify IccCardConstants.State enum
2012-09-11 13:17:17 -07:00
Jim Miller
68cfbf21d4
am ea42443e: Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev
...
* commit 'ea42443e35f04ebd5c8fd6b6b2fc362e2534cb9a':
Attempt to fix blank keyguard issue
2012-09-11 13:10:34 -07:00
Jim Miller
ea42443e35
Merge "Attempt to fix blank keyguard issue" into jb-mr1-dev
2012-09-11 13:08:18 -07:00
Eino-Ville Talvala
64791aabd4
am ff5c9146: Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
...
* commit 'ff5c9146b53d8429f8ee778f193582c12da0d2b3':
NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
2012-09-11 12:43:42 -07:00
Eino-Ville Talvala
ff5c9146b5
Merge "NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR" into jb-mr1-dev
2012-09-11 12:41:11 -07:00
Wink Saville
ba3cf72a08
Merge "Telephony: Clarify IccCardConstants.State enum"
2012-09-11 12:24:15 -07:00
Jeff Brown
59c53c6224
Don't auto-discover peers until scan requested.
...
Change-Id: I4ad08873567a5ac86e9bd46abd2375b183e2e95b
2012-09-11 12:21:55 -07:00
Daniel Sandler
7ffa04b1dd
Single finger notification expansion.
...
If you liked these changes...
Change Ie4e79aa5
Change I8a6f8606
Change I824937e9
Change I957b6d50
You'll love this one!
Change-Id: I5256366175fa7ebc965b1c5df02f10ba802ed977
2012-09-11 15:19:44 -04:00
Svetoslav Ganov
7abd5cfacf
am c574fd04: Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
...
* commit 'c574fd04cc192fa30af5dd065c5d0cd4c50f8db4':
Fixing implementation of View.requestRectangleOnScreen(Rect, boolean).
2012-09-11 12:18:21 -07:00
Jeff Brown
0f68d166e6
Use wfdInfo to filter available sinks.
...
Change-Id: If056267738f70835af645a8c6e7a91c0c5407816
2012-09-11 12:18:15 -07:00
Svetoslav Ganov
c574fd04cc
Merge "Fixing implementation of View.requestRectangleOnScreen(Rect, boolean)." into jb-mr1-dev
2012-09-11 12:16:13 -07:00
Selim Gurun
3591fa3bcd
am 2fa10c67: Fix build break
...
* commit '2fa10c675b42d22e73492154ca0ca1cbdbceaa3a':
Fix build break
2012-09-11 11:35:27 -07:00
Eino-Ville Talvala
7cfd7d5b65
NEW_API: Unhide android.hardware.Camera.Parameters#SCENE_MODE_HDR
...
Bug: 7054970
Change-Id: I509fa18f1203022bb23cd9ef5c70cb3a3fbb8b77
2012-09-11 11:34:59 -07:00
Selim Gurun
2fa10c675b
Fix build break
...
Change-Id: Ib5415bbebb849de23b3ff8533a7c1a98f6ae38f4
2012-09-11 11:32:44 -07:00
Winson Chung
dce2a53a3d
Fixing issue with Airplane Mode. (Bug 7141144)
...
Change-Id: I83e2bdd5e8b0e0c732e8d46c47f8619daa0c7c02
2012-09-11 11:30:52 -07:00
Eino-Ville Talvala
94aa95beca
am a910390b: Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
...
* commit 'a910390b7d64fba46e7c2034f7085b04e5268cab':
Camera: Add SCENE_MODE_HDR.
2012-09-11 11:21:47 -07:00
Eino-Ville Talvala
a910390b7d
Merge "Camera: Add SCENE_MODE_HDR." into jb-mr1-dev
2012-09-11 11:20:09 -07:00