Paul Soulos
bc642e88ae
am 642251ef: am 9d129942: Adds ScrollBounds to the Transition framework
...
* commit '642251ef91bf4d593d7ab657df03b00afb2973ac':
Adds ScrollBounds to the Transition framework
2014-07-22 21:47:25 +00:00
Alexandra Gherghina
a461c35ef5
am 6ec756fd: am 5f9a77e5: Do Not Merge Per-user API for master sync
...
* commit '6ec756fd1503ea88bd1ca031eeef733e2a44bfac':
Do Not Merge Per-user API for master sync
2014-07-22 21:47:05 +00:00
Igor Murashkin
6f978b3e73
am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
...
* commit 'f555fe554c28bc8f4e094dce502f343d70be4f3e':
camera2: Add legacy available Request/Result/Characteristics keys
2014-07-22 21:46:55 +00:00
Alan Viverette
7b689aa6cf
am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
...
* commit '11dbd68d68aba1c7f42304544f88fbffe496bb02':
Add popupTheme attr, propagate from ActionBar to ToolBar
2014-07-22 21:46:49 +00:00
Alex Klyubin
7b969f3eea
am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style.
...
* commit '0caaa29e5bf388c929e81ed417637f4fe4df52f8':
Align PSKKeyManager with framework API style.
2014-07-22 21:46:43 +00:00
Paul Soulos
2dcab18c6c
Adds ScrollBounds to the Transition framework
...
Change-Id: If22ab5162737f2d109e5eaf407a735523a146b7f
2014-07-22 14:17:48 -07:00
Alexandra Gherghina
0e9ac20d7e
Do Not Merge Per-user API for master sync
...
Change-Id: I6a8088eb3bfddae4c8e38904dd26baf3c7c09c9e
(cherry picked from commit 222aea8bd997807784dc99ca53f63280d384fdf0)
2014-07-22 20:15:45 +00:00
Alex Klyubin
fcd8b20e09
Align PSKKeyManager with framework API style.
...
This CL adjusts android.net.PSKKeyManager as follows:
* Renamed to PskKeyManager to follow naming conventions.
* Changed from interface to abstract class with default
implementations for all methods.
Bug: 16403305
Bug: 15073623
Change-Id: Iefce26b394d4a753412315dad554b5342f3f0b44
2014-07-22 19:51:34 +00:00
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
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
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
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
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
Alan Viverette
cd73d1adda
Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev
2014-07-22 16:29:55 +00:00
Alan Viverette
22a117d1b6
Add popupTheme attr, propagate from ActionBar to ToolBar
...
BUG: 16347549
Change-Id: I934ec2469f8c136f750e2e2cf9b333e229393ac3
2014-07-22 19:34:30 +00:00
Igor Murashkin
0986121807
Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev
2014-07-22 16:21:19 +00:00
Igor Murashkin
6c76f58f31
camera2: Add legacy available Request/Result/Characteristics keys
...
* Also changes the CameraMetadata#get*Keys to not return @hide keys
Change-Id: Ifc89153136a9be502b7b88addbd16a5de68a7bfc
2014-07-22 13:10:29 -07: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
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
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
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
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
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
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
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
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
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
Amith Yamasani
e5bcff624f
Rename setApplicationBlocked to setApplicationHidden
...
This corrects the expected behavior of the app state. Hidden apps
can be installed by the store to be brought out of hidden state.
Bug: 16191518
Change-Id: Id128ce971ceee99ba1dea14ba07ce03bd8d77335
2014-07-21 22:18:40 +00:00
Alan Viverette
8c1982c33a
am 7094ec0f: am 748dd3c4: Merge "Always apply surface insets" into lmp-dev
...
* commit '7094ec0f6344823cdf1525f52bf70f2f0230d548':
Always apply surface insets
2014-07-21 22:05:35 +00:00
Craig Mautner
198d2f4897
am e62332fb: am e15321a5: Merge "Don\'t create a delegate for null callbacks." into lmp-dev
...
* commit 'e62332fbcbc9acca2b8f694ff890ac0b1301283c':
Don't create a delegate for null callbacks.
2014-07-21 21:42:22 +00:00
Andres Morales
a4d9c1e48c
am c55c7dd7: am 47855ed4: Don\'t register PDBService if not available on device
...
* commit 'c55c7dd7aebeaa9ba08394008b5bbaf86f5214ed':
Don't register PDBService if not available on device
2014-07-21 19:42:01 +00:00
Andres Morales
1e586e08bf
Don't register PDBService if not available on device
...
Bug: 16455896
Change-Id: If576ce8e837ba498f10848795706efb29e76974a
2014-07-21 12:16:32 -07:00
Adam Powell
bf12f10354
am 2b0d3fc7: am dd896d93: Merge "Sort ResolverActivity items based on UsageStats" into lmp-dev
...
* commit '2b0d3fc764bf9544dd1a2bc77dd31661c07b8328':
Sort ResolverActivity items based on UsageStats
2014-07-21 18:17:53 +00:00
Craig Mautner
0eac9f42d4
am 28d5d4df: am 52cf4df1: Merge "Rename flag and attribute per API council" into lmp-dev
...
* commit '28d5d4df0db89ae40ebd83c9973b7583522e5f1c':
Rename flag and attribute per API council
2014-07-21 17:36:04 +00:00
Yorke Lee
488d3f5f4b
am b9105f15: am ec0197da: Merge "Add call log entries to all currently running users" into lmp-dev
...
* commit 'b9105f15aa914fcbc10cf414edf2a79ab23c403c':
Add call log entries to all currently running users
2014-07-21 17:05:27 +00:00
Alan Viverette
340c98cae8
Merge "Always apply surface insets" into lmp-dev
2014-07-21 15:42:19 +00:00
Alan Viverette
ac89416c77
Always apply surface insets
...
Change-Id: I9d8ad0c7fcf7a1016e01c2332f45614da5d2cf0c
2014-07-21 12:10:30 -07:00
Craig Mautner
2cfeb1ac39
Merge "Don't create a delegate for null callbacks." into lmp-dev
2014-07-21 15:42:19 +00:00