Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
145,160 Commits 3 Branches 0 Tags
4e3dc6edb4cbf012e2d5be54718cf58472dc7d6a
Commit Graph

38808 Commits

Author SHA1 Message Date
Chris Craik
4e3dc6edb4 am 1d2d0162: am 1f9b1c74: am d93bb9e1: Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 
* commit '1d2d01622f90113ec8c9d3789ee3e03b4f56aec5':
  Make setter methods on Outline call setEmpty() based on params
 2014-07-23 00:41:13 +00:00
Sandeep Siddhartha
b1cbd0f6f9 am df89ecd9: am 7573ba5f: am 82d56d82: Merge "Make hotword availability a callback" into lmp-dev 
* commit 'df89ecd9de28431d4b9903a63b1ac8d1bc15bc9b':
  Make hotword availability a callback
 2014-07-23 00:41:09 +00:00
Chris Craik
35763b1c0b am 1f9b1c74: am d93bb9e1: Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 
* commit '1f9b1c74aad278704920e8181c31229dd05bb49b':
  Make setter methods on Outline call setEmpty() based on params
 2014-07-23 00:37:07 +00:00
Sandeep Siddhartha
e40a8685ec am 7573ba5f: am 82d56d82: Merge "Make hotword availability a callback" into lmp-dev 
* commit '7573ba5f00c5c7470942bae5d5c8a0cecd002333':
  Make hotword availability a callback
 2014-07-23 00:37:03 +00:00
Alan Viverette
9728489abe am 0d9f8abf: am ee9da48f: am 22086055: Update spinner asset, fix default popup context and elevation 
* commit '0d9f8abf6abe8fc73800a8c843ce3c0054c625c8':
  Update spinner asset, fix default popup context and elevation
 2014-07-23 00:33:22 +00:00
Alan Viverette
5b9b89180c am ee9da48f: am 22086055: Update spinner asset, fix default popup context and elevation 
* commit 'ee9da48f932b39d06294690098849305387c614d':
  Update spinner asset, fix default popup context and elevation
 2014-07-23 00:29:10 +00:00
Alan Viverette
77e5037d81 Update spinner asset, fix default popup context and elevation 
BUG: 15985882
Change-Id: Ica8c2597c35bd3012da11e315a93bbd1df2f3f38
 2014-07-23 00:18:07 +00:00
Sreeram Ramachandran
6ff7386407 am a9dc918b: am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev 
* commit 'a9dc918b3dc7c45c4c8d45b838d058d1323e092f':
  Cleanup: Delete dead code.
 2014-07-22 23:57:27 +00:00
Sreeram Ramachandran
3e47b60378 am a4a22918: am bfea100c: Merge "Cleanup: Delete dead code." into lmp-dev 
* commit 'a4a229185c60f4abf6674adc6a49e5ab7000fb16':
  Cleanup: Delete dead code.
 2014-07-22 23:53:25 +00:00
Chris Craik
c403a39089 Merge "Make setter methods on Outline call setEmpty() based on params" into lmp-dev 2014-07-22 22:02:55 +00:00
Chris Craik
0645128b80 Make setter methods on Outline call setEmpty() based on params 
bug:16142564

Additionally, better define behavior around null outline providers:

A view with an empty outline, and setClipToOutline=true will not be
rendered, though one with a null outline provider
(and thus no outline) will be.

Change-Id: Ic9549841b107b2eb51b417c66058a0cd69dd89eb
 2014-07-22 15:15:11 -07:00
Paul Soulos
8a69d8f823 am 296caf5f: am 642251ef: am 9d129942: Adds ScrollBounds to the Transition framework 
* commit '296caf5f18a960033196568054537acf456698e4':
  Adds ScrollBounds to the Transition framework
 2014-07-22 21:55:30 +00:00
Igor Murashkin
a22ecc270f am f696a3f3: am f555fe55: am 8f9b6d08: Merge "camera2: Add legacy available Request/Result/Characteristics keys" into lmp-dev 
* commit 'f696a3f3ceabd42b59979ac4d84187318c92900a':
  camera2: Add legacy available Request/Result/Characteristics keys
 2014-07-22 21:54:56 +00:00
Alan Viverette
10f6e97b26 am 11d6a547: am 11dbd68d: am 290f45f5: Merge "Add popupTheme attr, propagate from ActionBar to ToolBar" into lmp-dev 
* commit '11d6a5470fb5315a294bc1f2c50bf4232382b58a':
  Add popupTheme attr, propagate from ActionBar to ToolBar
 2014-07-22 21:54:52 +00:00
Alex Klyubin
b4e042031c am 4c08680b: am 0caaa29e: am 09a76692: Align PSKKeyManager with framework API style. 
* commit '4c08680b4be0cfb70bcd9479f46ede59e1cd29e5':
  Align PSKKeyManager with framework API style.
 2014-07-22 21:54:42 +00:00
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
Sandeep Siddhartha
0edc8cea2b Merge "Make hotword availability a callback" into lmp-dev 2014-07-22 20:44:55 +00:00
Sandeep Siddhartha
f63bc523ea Make hotword availability a callback 
This helps us make the list sound models operation an async one, it also helps us
with the case where a detector is invalidated, so the client doesn't have to keep checking the
state.

Synchronize DatabaseHelper methods on its instance so that other VoiceInteractionManagerService
calls aren't blocked on db writes/reads.
It's still possible for the list operation to be blocked on update and vice-versa

Change-Id: Ib8ec4ac5056b62d443038560ce31d0641b4627b0
 2014-07-22 17:11:52 -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
Sreeram Ramachandran
03666c705d Cleanup: Delete dead code. 
Bug: 15413389
Change-Id: I315468832ef18ffc84174e54774ab63b86d284dc
 2014-07-22 15:46:34 -07: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
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
Dianne Hackborn
33f5ddd1be Add permissions associated with app ops. 
Change-Id: I575ad7a3ceea59486ca601f69760b14f6269511d
 2014-07-21 20:15:59 -07:00
Adam Powell
f1489c75f6 Merge "Allow focusable in touch mode views to ignore touchscreen focus blocks" into lmp-dev 2014-07-19 22:40:06 +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