Sreeram Ramachandran
e0d713afdc
am bae0d23d: am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
...
* commit 'bae0d23df8e1461168e229e170247433a3a3ab38':
Fix WiFi-Direct.
2014-07-22 18:57:59 +00:00
Sreeram Ramachandran
b12ae58e91
am 4463fd65: Merge "Fix WiFi-Direct." into lmp-dev
...
* commit '4463fd6540f152fe2548a67eb5a34489c11b3f31':
Fix WiFi-Direct.
2014-07-22 18:49:42 +00:00
Craig Mautner
91bf127892
am 581feb87: am 90ac517c: Create API for launching from recents
...
* commit '581feb87f8a0bcfd14b2b28fd9f06f4e162f10b6':
Create API for launching from recents
2014-07-22 18:22:10 +00:00
Craig Mautner
92d0636a0d
am 90ac517c: Create API for launching from recents
...
* commit '90ac517c8636ce8cbb0afe2fc03836b23206f72a':
Create API for launching from recents
2014-07-22 18:17:47 +00:00
Behdad Esfahbod
d4c18540bb
am 0abd9ade: am 3c8b2dfb: Add android.Paint that inherits SkPaint
...
* commit '0abd9ade5a488151c0fffd859f9f670d7f9f8552':
Add android.Paint that inherits SkPaint
2014-07-22 18:17:18 +00:00
Craig Mautner
dc00cbe2c1
Create API for launching from recents
...
Relaunch apps from recents using the same uid and package as was used
in the original launch.
Fixes bug 16358208.
Change-Id: I340800bfee79926b197929360d69f1d570bbf1eb
2014-07-22 18:13:34 +00:00
Behdad Esfahbod
bbbcc2e9f3
am 3c8b2dfb: Add android.Paint that inherits SkPaint
...
* commit '3c8b2dfb331a492e8e2c8ccaec13e9f736da36ba':
Add android.Paint that inherits SkPaint
2014-07-22 18:13:20 +00:00
Behdad Esfahbod
6ba30b85dd
Add android.Paint that inherits SkPaint
...
The idea is that extra paint parameters that only affect text layout
(not rendering) will go in android.Paint instead of going into
SkPaintOptionsAndroid. We will eventually move those out of SkPaint
too.
This is currently implemented in PaintImpl.cpp. Will be renamed when
current Paint.cpp that has JNI bits is moved to android_graphics_Paint.cpp.
Change-Id: Iba66c34dea5da503a13b9c864cb9f2211ac4ba7d
2014-07-22 14:01:09 -04:00
George Mount
61afeca09f
am 8793b878: am 094d74f4: API Council: Change docs and constant names.
...
* commit '8793b878d247e63151293d54a02a2c82004887cd':
API Council: Change docs and constant names.
2014-07-22 17:39:10 +00:00
Yin-Chia Yeh
acf705c796
am 476e6a8e: am cca8d422: camera2: minor doc update
...
* commit '476e6a8eecc8d2991e115298135e731e7341dce0':
camera2: minor doc update
2014-07-22 17:38:57 +00:00
George Mount
081023c101
am 094d74f4: API Council: Change docs and constant names.
...
* commit '094d74f4d6b8f94b94f6c3d18467531cbd52c3b1':
API Council: Change docs and constant names.
2014-07-22 17:32:03 +00:00
Yin-Chia Yeh
2239fe0fbf
am cca8d422: camera2: minor doc update
...
* commit 'cca8d422ecd16a1c4e29e7cc71624ccc845c839a':
camera2: minor doc update
2014-07-22 17:31:51 +00:00
George Mount
ad88e1b1b2
API Council: Change docs and constant names.
...
Bug 16401545
Changed doc for ChangeImageTransform.
Changed IN/OUT to MODE_IN/MODE_OUT.
Changed mode to flag attribute.
Change-Id: Ia2ae9930f9725871c9b1d80b758a3a0808a8f0c6
2014-07-22 17:29:14 +00:00
Yin-Chia Yeh
f8f37002c0
camera2: minor doc update
...
Doc update reflecting the minor spec change.
Change-Id: I7a1cf766fe6bee4dd08fd19f03778ce8a6ce2dde
2014-07-22 17:26:30 +00:00
Sandeep Siddhartha
6efdcebaa3
am 9f0b328e: am 8672899c: Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev
...
* commit '9f0b328e04f62c584cd34c33e0b922628933a5de':
AlwaysOnHotwordDetector needs to reflect enrollment changes
2014-07-22 17:17:46 +00:00
Sandeep Siddhartha
2792c15697
am 8672899c: Merge "AlwaysOnHotwordDetector needs to reflect enrollment changes" into lmp-dev
...
* commit '8672899cdf1b0b68c7b3a9bc4183c1414f2d4f7e':
AlwaysOnHotwordDetector needs to reflect enrollment changes
2014-07-22 17:10:06 +00:00
Sreeram Ramachandran
a77760d74a
Fix WiFi-Direct.
...
Add a new command to let netd know about routes on a p2p interface.
Bug: 15413694
Change-Id: I36effc438d5ac193a77174493bf196cb68a5b97a
2014-07-22 11:24:29 -07:00
Neil Fuller
cc7c4f8824
am 1a429047: am fc6346d4: Merge "Rewriting android.text.format.Time without the native _tz functions"
...
* commit '1a4290473df0f583dff5cb2b5856465e5e27d1c7':
Rewriting android.text.format.Time without the native _tz functions
2014-07-22 15:34:09 +00:00
Neil Fuller
1a4290473d
am fc6346d4: Merge "Rewriting android.text.format.Time without the native _tz functions"
...
* commit 'fc6346d461c9ed9b499643db830885241cc82838':
Rewriting android.text.format.Time without the native _tz functions
2014-07-22 15:29:08 +00:00
John Spurlock
ea025088e9
am 8028a5a8: am 752dc6e1: New NotificationListenerService listener flags api.
...
* commit '8028a5a8a3f17e54fe6a5d28c50683def1473b9c':
New NotificationListenerService listener flags api.
2014-07-22 13:56:34 +00:00
Dongwon Kang
70aa02ee7f
am 1bb343ff: am a792fc8a: Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev
...
* commit '1bb343ff6cb8eace95d909f125954a6763836bdc':
TIF: Revisit types in TvInputInfo and TvContract.Channels.
2014-07-22 13:56:29 +00:00
Jinsuk Kim
ec25af3fb3
am 0b6aeed0: am 68bc0359: Define a constant for HDMI-CEC logical address used for internal source
...
* commit '0b6aeed02e25756c85beea03ce74f52b8a89377a':
Define a constant for HDMI-CEC logical address used for internal source
2014-07-22 13:56:26 +00:00
Narayan Kamath
b0490cdefe
am b5c714fc: am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
...
* commit 'b5c714fca79028116db0b00157dc09616efeaa95':
Remove copy of Locale.adjustLanguageCode.
2014-07-22 13:49:36 +00:00
Dianne Hackborn
1221ddbd8e
am d8b0edbf: am 8f5105c6: Merge "Add permissions associated with app ops." into lmp-dev
...
* commit 'd8b0edbfceff19ee0e9f53e80ee4da4dbf4327b6':
Add permissions associated with app ops.
2014-07-22 13:38:37 +00:00
John Spurlock
3bfa40e215
am 752dc6e1: New NotificationListenerService listener flags api.
...
* commit '752dc6e171f3ba503b2a119f3ab5149b920a5161':
New NotificationListenerService listener flags api.
2014-07-22 13:36:36 +00:00
Dongwon Kang
94d21115f3
am a792fc8a: Merge "TIF: Revisit types in TvInputInfo and TvContract.Channels." into lmp-dev
...
* commit 'a792fc8a027d84e91879b9204c901ee0fc3eaee8':
TIF: Revisit types in TvInputInfo and TvContract.Channels.
2014-07-22 13:36:30 +00:00
Jinsuk Kim
2f422c3593
am 68bc0359: Define a constant for HDMI-CEC logical address used for internal source
...
* commit '68bc03592f5f008207d0d7d6f9f72bc26561f3f8':
Define a constant for HDMI-CEC logical address used for internal source
2014-07-22 13:36:23 +00:00
Narayan Kamath
b5c714fca7
am e242111c: Merge "Remove copy of Locale.adjustLanguageCode."
...
* commit 'e242111c5dc63e1cbba41d2341b493cb9c064589':
Remove copy of Locale.adjustLanguageCode.
2014-07-22 13:30:41 +00:00
Dianne Hackborn
fcb6ed8b28
am 8f5105c6: Merge "Add permissions associated with app ops." into lmp-dev
...
* commit '8f5105c6370b30c841210cb6fb580c3a26e12d62':
Add permissions associated with app ops.
2014-07-22 12:18:06 +00:00
John Spurlock
1fa865f396
New NotificationListenerService listener flags api.
...
Give activated listeners the ability to request changes to
listener-level or host-level state.
Currently this consists of the ability to suppress notification alerts
(alerts = the haptic / audio feedback of a notification).
Bug:15888672
Change-Id: I045e3b99d1f15e3f96ebaf17d3083a97e02ecb42
2014-07-22 07:24:22 -04:00
Jinsuk Kim
29a5d26207
Define a constant for HDMI-CEC logical address used for internal source
...
Change-Id: Ic7d6a5378361d7ed8ae4b635312b956b063fc95a
2014-07-22 07:37:45 +00:00
Adam Powell
0900dc6d04
am e5420255: am d367cfc1: Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev
...
* commit 'e5420255d44f9f9f31b41d70f037fc880aff1203':
Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""
2014-07-22 02:30:35 +00:00
Adam Powell
433e6f7c3e
am c18adc99: am 6cda0efe: Merge "Allow focusable in touch mode views to ignore touchscreen focus blocks" into lmp-dev
...
* commit 'c18adc99c7fac24ae26c39ec308e882e05becddb':
Allow focusable in touch mode views to ignore touchscreen focus blocks
2014-07-22 02:30:31 +00:00
Adam Powell
b3d0817230
am d367cfc1: Merge "Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""" into lmp-dev
...
* commit 'd367cfc1c308c4b82eb62cbd7a8aaae2f21ba266':
Revert "Revert "Block focus with a touchscreen for ActionBars and Toolbars""
2014-07-22 01:37:51 +00:00
Adam Powell
65d231c4c6
am 6cda0efe: Merge "Allow focusable in touch mode views to ignore touchscreen focus blocks" into lmp-dev
...
* commit '6cda0efe49cda1041e50935279db274fd3cb72e3':
Allow focusable in touch mode views to ignore touchscreen focus blocks
2014-07-22 01:37:47 +00:00
Jeff Brown
aea54c15e9
am 887a54b7: am e5871d89: Allow dreams to control screen state and brightness.
...
* commit '887a54b793da79f7a6c012154373ede91b7bf149':
Allow dreams to control screen state and brightness.
2014-07-22 01:26:52 +00:00
Jeff Brown
244342e524
am e5871d89: Allow dreams to control screen state and brightness.
...
* commit 'e5871d89289fed58c2094cddb9f6361a500166d9':
Allow dreams to control screen state and brightness.
2014-07-22 01:21:28 +00:00
Jeff Brown
970d4132ea
Allow dreams to control screen state and brightness.
...
Added setDozeScreenState() and setDozeScreenBrightness() methods to
DreamService. The values specified here only take effect once
startDozing is called and can be changed while dozing.
This required some significant rework of the display power controller
but the result seems quite nice and better represents the policy
we want to apply.
Changed the test dream a little bit to make it flash the screen
every minute using the new functions.
Bug: 15903322
Change-Id: I83bcc34503f1b87727d2b2b3c0ef08507f9f0808
2014-07-22 01:18:26 +00:00
Alan Viverette
b96b0673ba
am f7b914b8: am a27cc3f4: Merge "Remove unused quick setting display preferences" into lmp-dev
...
* commit 'f7b914b8e4ea6a4ee73e8404e8d026eb4f2d9773':
Remove unused quick setting display preferences
2014-07-22 01:13:43 +00:00
Alan Viverette
489ca5568a
am f0f87713: am b42d72db: Clean up view tinting APIs, tileModeX/Y attribute docs
...
* commit 'f0f87713049583df9d9ad61f1e0ad6242c968dbc':
Clean up view tinting APIs, tileModeX/Y attribute docs
2014-07-22 01:13:35 +00:00
Alan Viverette
b38ac7e1fa
am a27cc3f4: Merge "Remove unused quick setting display preferences" into lmp-dev
...
* commit 'a27cc3f404d2c88acb64fab84815a7785a5e902d':
Remove unused quick setting display preferences
2014-07-22 01:08:58 +00:00
Alan Viverette
9fd200b073
am b42d72db: Clean up view tinting APIs, tileModeX/Y attribute docs
...
* commit 'b42d72dbd34fcf8c5ee40cce9823ff9df6b76f78':
Clean up view tinting APIs, tileModeX/Y attribute docs
2014-07-22 01:08:51 +00:00
Alan Viverette
4f64c04850
Clean up view tinting APIs, tileModeX/Y attribute docs
...
BUG: 16400590
BUG: 16403307
Change-Id: Ie924815a39eb0e683d1982b08ec478ed3edbfb7b
2014-07-22 01:03:58 +00:00
Alan Viverette
132ba19632
am 2dcec46b: am d412ea9e: Fix switch animation end state colors
...
* commit '2dcec46bf35f37b15e18e89e6a8918c4872b5dd6':
Fix switch animation end state colors
2014-07-22 00:27:01 +00:00
Alan Viverette
ebac7e72a6
am d412ea9e: Fix switch animation end state colors
...
* commit 'd412ea9e033d500a0cc66511be54fbe0abba7696':
Fix switch animation end state colors
2014-07-22 00:21:46 +00:00
Alan Viverette
7d6866086a
Fix switch animation end state colors
...
BUG: 16418389
Change-Id: I678eb25c38a1303141dc89cfe1cccbd1bd8bcdc1
2014-07-22 00:17:17 +00:00
Amith Yamasani
d4591986b7
am ff053445: am f6feac69: API Review: Improvements to RestrictionsManager API
...
* commit 'ff053445f8b81ca4e7ab57feb981dbcc34ddb569':
API Review: Improvements to RestrictionsManager API
2014-07-22 00:12:40 +00:00
Amith Yamasani
85aa2ba71d
am f6feac69: API Review: Improvements to RestrictionsManager API
...
* commit 'f6feac69abe5427e0ee89f2721a4d825e8a84fb0':
API Review: Improvements to RestrictionsManager API
2014-07-22 00:08:25 +00:00
Amith Yamasani
9c44933958
API Review: Improvements to RestrictionsManager API
...
Use an activity intent for local approval instead of a type.
Use PeristableBundle instead of Bundle.
Pass requestId as an explicit argument in cases where it's required.
Bug: 16400892
Change-Id: Id882033f17c39aa9cd63a7eeb73bb7b51f98cf5b
2014-07-22 00:03:39 +00:00
Amith Yamasani
69c68e1a73
am b0cae189: am f8b67f1f: Rename setApplicationBlocked to setApplicationHidden
...
* commit 'b0cae1897384f7175ec3b9ee08fd535fff1d6e51':
Rename setApplicationBlocked to setApplicationHidden
2014-07-21 22:32:25 +00:00