Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
130,379 Commits 3 Branches 0 Tags
d7b8c5a8c21ee331dca573b93ec991097969390f
Commit Graph

35296 Commits

Author SHA1 Message Date
Fabrice Di Meglio
d7b8c5a8c2 am 62499493: Merge "Add toString() for SearchIndexableData and SearchIndexableResource" 
* commit '624994930adea1158011ff5c8ea1f8bfd700fe0e':
  Add toString() for SearchIndexableData and SearchIndexableResource
 2014-04-11 18:21:27 +00:00
Fabrice Di Meglio
624994930a Merge "Add toString() for SearchIndexableData and SearchIndexableResource" 2014-04-11 18:17:58 +00:00
Elliott Hughes
3f3d33ffb7 am 1f2966ea: am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '1f2966ea2bd001adde9ee4773d97d1bb6007aa53':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:45:17 +00:00
Elliott Hughes
1f2966ea2b am 8e6992fb: am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '8e6992fb3ac986d3bbb93cd2d55d3e18eb03b3b5':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:40:39 +00:00
Elliott Hughes
8e6992fb3a am 1ea1857d: am 8cd319b8: Merge "Add additional languages to be accepted by the NumberPicker input filter" 
* commit '1ea1857de9c98199015f0188678a12a82a6248d4':
  Add additional languages to be accepted by the NumberPicker input filter
 2014-04-11 17:37:18 +00:00
Elliott Hughes
8cd319b846 Merge "Add additional languages to be accepted by the NumberPicker input filter" 2014-04-11 17:30:09 +00:00
Alexandra Gherghina
daf6180064 am 23d2dd3d: Merge "Add new call to DevicePolicyManager to enable a profile." 
* commit '23d2dd3da15b4312cc55c4d7b0bcf70719655e65':
  Add new call to DevicePolicyManager to enable a profile.
 2014-04-11 16:00:38 +00:00
Alexandra Gherghina
512675b07d Add new call to DevicePolicyManager to enable a profile. 
Bug: 13755091
Change-Id: Idb6975431f842ededf78966c578b0533e6f186af
 2014-04-11 16:51:49 +01:00
Przemyslaw Szczepaniak
341c4309cf am 39c82a3b: Merge "Remove "final" from TextToSpeechClient class." 
* commit '39c82a3b19788b100f52f24732560ef325c13133':
  Remove "final" from TextToSpeechClient class.
 2014-04-11 12:10:57 +00:00
Przemyslaw Szczepaniak
39c82a3b19 Merge "Remove "final" from TextToSpeechClient class." 2014-04-11 12:06:43 +00:00
Jinsuk Kim
38751fc7c1 am 4bdcd299: am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit '4bdcd299da48f9abe5f9c67abed0dbe79080445d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:47:20 +00:00
Jinsuk Kim
4bdcd299da am 55dab4dd: am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit '55dab4dd3b5b56ade91c012d688b581b6cbdebdf':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:43:37 +00:00
Mikhail Naganov
48a3c9e066 am b429088c: Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat." 
* commit 'b429088cbb12a226fd217f04870d16bbd833ed06':
  Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat.
 2014-04-11 09:42:32 +00:00
Jinsuk Kim
55dab4dd3b am b11f250e: Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 
* commit 'b11f250e09195d1ab250c93bfed0b31ed3a40f3d':
  Delegate HdmiCecService method impl to HdmiCecDevice subclass
 2014-04-11 09:40:46 +00:00
Jinsuk Kim
b11f250e09 Merge "Delegate HdmiCecService method impl to HdmiCecDevice subclass" into klp-modular-dev 2014-04-11 09:38:23 +00:00
Mikhail Naganov
b429088cbb Merge "Add Javadoc statement regarding enumerability of methods of injected Java objects for applications targeted to API levels after KitKat." 2014-04-11 09:36:39 +00:00
Jinsuk Kim
61791075f4 Delegate HdmiCecService method impl to HdmiCecDevice subclass 
Most of the methods in the interface IHdmiCecService should be implemented
based on the device type. This CL makes a change such that the HdmiCecDevice
just has stub methods that should be overriden by subclasses.

Other changes:
  - Fixed a bug of <Inactive Source> not sending its physical address
    in its message body. Also the command should have been sent to TV
    only rather than broadcast.

  - Put back sendGiveDevicePowerStatus interface method. It allows the client
    to keep track of the other device(like TV) power status more closely.
    Devices goes through the status from standby -> transient to on -> on
    but the CEC spec doesn't require that they broacast it actively.

    The restored method can be used to let the playback device to get
    up-to-date power status of TV/display when it is booting up.

    This method should work the same across all the device types. So it was
    implemented in the service, not delegated to HdmiCecDevice.

  - Send <Report Physical Address> when a new logical device is registered,
    which is required by CEC spec: "it should report the association between
    its logical and physical address by broadcasting <Report Physical
    Address>

Change-Id: Iac1d2cf5783d947f2dcd6965a54670fbdb8e6a63
 2014-04-11 18:35:01 +09:00
Mikhail Naganov
d380b2098f Add Javadoc statement regarding enumerability of methods of injected Java 
objects for applications targeted to API levels after KitKat.

Bug: 12169386
Change-Id: I1c988468545e48ac0d7323b01b9c77a1f8d713f2
 2014-04-11 10:04:18 +01:00
Jeff Brown
23ff3666a4 am 4e5c089e: resolved conflicts for merge of 337e764d to master 
* commit '4e5c089ef3e62e7f658e71c0be262d09bd3e399b':
  Plumb display power state through display manager.
 2014-04-11 08:43:44 +00:00
Jeff Brown
4e5c089ef3 resolved conflicts for merge of 337e764d to master 
Change-Id: I8168dbf42b68c2f7b5ccb300e0080dddc627af26
 2014-04-11 01:33:20 -07:00
Jeff Brown
337e764deb am f24687e2: Merge "Plumb display power state through display manager." into klp-modular-dev 
* commit 'f24687e2731811fd0e3803b691fd47a659f89329':
  Plumb display power state through display manager.
 2014-04-11 03:49:37 +00:00
Jeff Brown
f24687e273 Merge "Plumb display power state through display manager." into klp-modular-dev 2014-04-11 03:47:08 +00:00
Jeff Brown
037c33eae7 Plumb display power state through display manager. 
Declare a new method, Display.getState() to retrieve the actual
power state of a display.

Improved documentation for Intent.ACTION_SCREEN_ON and
Intent.ACTION_SCREEN_OFF to clarify what they really mean in
terms of the interactive state of the device.

Deprecated PowerManager.isScreenOn() and replaced it with
PowerManager.isInteractive() with a more suggestive name and
better documentation.

Redirect display power state changes to go through the display
manager first and only then head over to the power manager for
legacy compatibility.

Eliminated the bright here and woke here policy flags since they
were unused.  Simplified the input dispatch policy somewhat.

Ensure that screen wake locks are respected up until the point
when dozing really begins.

Fixed a regression in DreamService where onDreamingStarted
might be called before onWindowAttached.

Bug: 13133142
Bug: 13472578
Bug: 13929355
Bug: 13760290
Change-Id: Iabef96921dd554ce3768fb18619cefc3230b5fb0
 2014-04-10 20:46:14 -07:00
Sungsoo Lim
3abdd3860f am f0e74f08: Merge "Add equals, hashCode, and toString methods in TvInputInfo." 
* commit 'f0e74f08a1a11a6d7bb25f34350ff996716036a1':
  Add equals, hashCode, and toString methods in TvInputInfo.
 2014-04-11 02:29:41 +00:00
Sungsoo Lim
f0e74f08a1 Merge "Add equals, hashCode, and toString methods in TvInputInfo." 2014-04-11 02:27:21 +00:00
Sungsoo Lim
89978abd98 Add equals, hashCode, and toString methods in TvInputInfo. 
Change-Id: I770e0eeac334d2c0b98ef0941bc9840296360e4f
 2014-04-11 11:24:26 +09:00
Fabrice Di Meglio
71b3975c8a Add toString() for SearchIndexableData and SearchIndexableResource 
Change-Id: Ie85e0382705e5edb4be50b32370212d470f172d9
 2014-04-10 19:24:15 -07:00
Alan Viverette
040bc70ca1 am 494fb7b5: Update volume panel 
* commit '494fb7b58a21a7a9a8eba3bacecffe115edcb8c6':
  Update volume panel
 2014-04-11 01:18:30 +00:00
Alan Viverette
494fb7b58a Update volume panel 
Change-Id: I6f0887069598f8addc5c5af5aef9c07a69532424
 2014-04-10 18:13:08 -07:00
John Reck
76fd416423 am 822bbb38: Merge "Make attachFunctor blocking" 
* commit '822bbb382fa6b6c8d1b45770e27c2c2732a7afb7':
  Make attachFunctor blocking
 2014-04-10 22:29:10 +00:00
John Reck
822bbb382f Merge "Make attachFunctor blocking" 2014-04-10 22:23:22 +00:00
John Reck
d3d8dafc2f Make attachFunctor blocking 
Bug: 13930200

Change-Id: I9b0cf92fd16bb30baa09b6f8d7ae22a8b2a7fd80
 2014-04-10 15:00:13 -07:00
Jianing Wei
2fec159234 am dcb495ff: Merge "Camera2 API: enable burst capture and repeating burst." 
* commit 'dcb495ff86b1322256585dbd5eda92949a1e8a4f':
  Camera2 API: enable burst capture and repeating burst.
 2014-04-10 19:56:25 +00:00
Jianing Wei
dcb495ff86 Merge "Camera2 API: enable burst capture and repeating burst." 2014-04-10 19:51:57 +00:00
Jianing Wei
d2c3a825cd Camera2 API: enable burst capture and repeating burst. 
*  Enable sending out burst requests, canceling, and flushing.
*  Enable onCaptureStarted, onResultReceived for bursts.
*  Enable onCaptureSequenceCompleted by tracking frame number.

Change-Id: Ica2b031cac7ad90f9c4b74a78e6185e627195340
Bug-ID: 10749500
 2014-04-10 19:50:04 +00:00
Svetoslav
b3035749d4 am 6be2f952: Merge "Adding render stats APIs to UiAutomation (framework)." 
* commit '6be2f95202237b7284542e692273d13a5bd26913':
  Adding render stats APIs to UiAutomation (framework).
 2014-04-10 19:36:27 +00:00
Svetoslav
6be2f95202 Merge "Adding render stats APIs to UiAutomation (framework)." 2014-04-10 19:32:59 +00:00
Chris Wren
d05a2d8833 am 2bb8dde4: Merge "support the people extra on the notification object" 
* commit '2bb8dde44be10212ec453d435aaad27177714f5e':
  support the people extra on the notification object
 2014-04-10 19:23:27 +00:00
Chris Wren
2bb8dde44b Merge "support the people extra on the notification object" 2014-04-10 19:18:31 +00:00
Chris Wren
dde753079f support the people extra on the notification object 
currently supported URIs:
  content://com.android.contacts/contacts/lookup/*
  tel:*

Change-Id: I833eee3f2ee40aa8cb2cfad135bdd6cb2c0eb792
 2014-04-10 15:18:25 -04:00
Przemyslaw Szczepaniak
5decae39b6 Remove "final" from TextToSpeechClient class. 
It hinders attempts to mock the TextToSpeechClient
class in tests.

+ javadoc typo fix

Change-Id: I5b4590824d7e89b58451bdde457a627786333373
 2014-04-10 16:17:09 +00:00
Paul Lawrence
b127613d85 am 9502f990: Merge "Allow encryption when keyguard is set to pattern or no protection" 
* commit '9502f990899ef576879048ec5147d403158ad89d':
  Allow encryption when keyguard is set to pattern or no protection
 2014-04-10 14:35:25 +00:00
Paul Lawrence
9502f99089 Merge "Allow encryption when keyguard is set to pattern or no protection" 2014-04-10 14:30:53 +00:00
Narayan Kamath
ad3a5587ee am f148f36d: am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit 'f148f36d140e995ec8f755e60bbb0b37f33c3da7':
  System services detect and register app CPU ABIs
 2014-04-10 09:49:45 +00:00
Narayan Kamath
53e89777b4 am d11f223c: resolved conflicts for merge of 286a247e to master 
* commit 'd11f223c535ed9ce628fe5aaf0fd5692dd0cf9e4':
  Re-implement native library search and copies.
 2014-04-10 09:49:42 +00:00
Narayan Kamath
f148f36d14 am 9e289d70: am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '9e289d70a8baaed0030413b5991653792e2a816d':
  System services detect and register app CPU ABIs
 2014-04-10 09:45:18 +00:00
Narayan Kamath
d11f223c53 resolved conflicts for merge of 286a247e to master 
Change-Id: I63df9d482da3ce2ac851959223b9180020ffad0c
 2014-04-10 10:38:31 +01:00
Narayan Kamath
9e289d70a8 am 1d26a3f1: am 09e13cc5: Merge "System services detect and register app CPU ABIs" 
* commit '1d26a3f1efd0d965e8751e8515608c31789bdbe2':
  System services detect and register app CPU ABIs
 2014-04-10 09:26:59 +00:00
Narayan Kamath
286a247e4c am 0fd40cb1: am 80413c9f: Merge "Re-implement native library search and copies." 
* commit '0fd40cb100bccbd5d9ad6109ca39c818a857f889':
  Re-implement native library search and copies.
 2014-04-10 09:26:44 +00:00
Jessica Hummel
357ecd47f9 am e5e8444c: Merge "Allow setting the active admin across users." 
* commit 'e5e8444ce864e7ac5d07308b9a5c5ca2caaa4e0a':
  Allow setting the active admin across users.
 2014-04-10 08:42:18 +00:00