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

49584 Commits

Author SHA1 Message Date
Narayan Kamath
f129af204c Merge "Move apache specific portions of android.net.http to external/apache-http." 2015-02-13 09:51:44 +00:00
Svetoslav
0a3dd9c9e0 am 04057e5d: am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9 
* commit '04057e5d14030ef54c522b2372019cf2858083e9':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:57:05 +00:00
Svetoslav
04057e5d14 am 5136791b: am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9 
* commit '5136791b3429d1964b9202fb7caad52719408a61':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:49:40 +00:00
Svetoslav
5136791b34 am 599c1042: Accessibility: Ensure fresh accessilbity focused and input focused nodes. automerge: 27ad2e9 
* commit '599c1042896564906935bc688bbb85515a6dfa45':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:43:29 +00:00
Svetoslav
599c104289 Accessibility: Ensure fresh accessilbity focused and input focused nodes. 
automerge: 27ad2e9

* commit '27ad2e95b40fd0ca76de384695498ea114d627ca':
  Accessibility: Ensure fresh accessilbity focused and input focused nodes.
 2015-02-13 03:37:00 +00:00
Jeff Brown
c2ac80c57f am f80fa0b5: am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode" 
* commit 'f80fa0b5d9b5567731dc19b4b5fc73816c131910':
  Call startInput on return from sleep mode
 2015-02-13 02:17:56 +00:00
Jeff Brown
f80fa0b5d9 am 6c477a29: am ec403e8f: Merge "Call startInput on return from sleep mode" 
* commit '6c477a29bfc604f6dbf90e0d4ac5c99bc0ed2ff7':
  Call startInput on return from sleep mode
 2015-02-13 02:11:43 +00:00
Jeff Brown
ec403e8f47 Merge "Call startInput on return from sleep mode" 2015-02-13 02:00:02 +00:00
Svetoslav
27ad2e95b4 Accessibility: Ensure fresh accessilbity focused and input focused nodes. 
Change-Id: Ia3c84284843a415cdbbc2b6a9b06d9ddffbe0e04
 2015-02-13 01:59:11 +00:00
Ruben Brunk
c61f921b99 am ff475c0e: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 automerge: 41af9d5 
* commit 'ff475c0ea71ffd5f015cce1462daf373129ca896':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:45:27 +00:00
Ruben Brunk
ff475c0ea7 Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
automerge: 41af9d5

* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:36:13 +00:00
Ruben Brunk
fb7c14c5f9 am 41af9d59: Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev automerge: d2ccbd4 
* commit '41af9d592efbae88ed95ab77a856dd4e8fbab998':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:33:42 +00:00
Ruben Brunk
41af9d592e Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev 
automerge: d2ccbd4

* commit 'd2ccbd43d24a79122e404206c528995600a6507d':
  camera2: Fix legacy scaling factor application.
 2015-02-13 01:28:23 +00:00
Ruben Brunk
d2ccbd43d2 Merge "camera2: Fix legacy scaling factor application." into lmp-mr1-dev 2015-02-13 01:22:26 +00:00
Mike Lockwood
5b14d9893a Merge "MidiManager API tweaks:" 2015-02-13 00:01:48 +00:00
Todd Volkert
0653f2596f Increase visibility of Transition.areValuesChanged() to protected to allow 
subclasses outside the android.transition package to override it.

Change-Id: Ib6a5502827e734de7494958b510afc9ddb80dffe
 2015-02-12 15:27:57 -08:00
Todd Volkert
fddd7ead7c Merge "Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it."" 2015-02-12 23:11:15 +00:00
Todd Volkert
455e0ea8f2 Revert "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it." 
This reverts commit d23391eafe.

Change-Id: Id7211a0fd08b9bc8ad092501de3c3efa57bf8264
 2015-02-12 23:09:19 +00:00
Todd Volkert
09247179cb Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it." 2015-02-12 22:52:21 +00:00
Todd Volkert
d23391eafe Increase visibility of Transition.areValuesChanged() to protected to allow 
subclasses outside the android.transition package to override it.

Change-Id: Ife5de79b339b6d7598411ad851858f4c52a89f5c
 2015-02-12 14:47:20 -08:00
Tor Norbye
65528280e2 Merge "Update the @ServiceName annotation" 2015-02-12 21:40:36 +00:00
Ruben Brunk
259f3d90b8 camera2: Fix legacy scaling factor application. 
Bug: 19359916
Change-Id: I22204c50ac918b9be97b5d43efa73c7e87444cea
 2015-02-12 13:27:26 -08:00
Raph Levien
80955e105d Merge "Interval tree for SpannableStringBuilder" 2015-02-12 20:34:46 +00:00
Raph Levien
d7c020e9e5 Interval tree for SpannableStringBuilder 
This CL greatly improves the speed of SpannableStringBuilder by storing
the spans as an interval tree with binary search.

Bug: 7404182
Change-Id: I2540b2cfe8aef128337e63829479660ba51e62b5
 2015-02-12 12:30:52 -08:00
destradaa
1ea5736339 Merge "Intern strings used in Sensor information." 2015-02-12 20:30:07 +00:00
Tor Norbye
bf44ce24a9 Update the @ServiceName annotation 
It was missing some recently added services (and some unhidden
services). For completeness also include newly added hidden services
as comments such that if they get unhidden in the future it's more
likely that a search and replace update will discover the annotation
reference as well.

Change-Id: I04ff5e1cf7b14b19c3650a49403771ef4f14c862
 2015-02-12 11:47:32 -08:00
Jeremy Joslin
549aa2b9b7 am f69f3737: am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit 'f69f3737ba8cb2acb481dc78de3c5275bae112e7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 19:40:48 +00:00
Benjamin Franz
d51584dee7 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
automerge: 6076ef9

* commit '6076ef9355fec90c40d84abaf2c71345f32badfb':
  Fix the javadocs for lock task mode intents.
 2015-02-12 19:37:50 +00:00
Svetoslav
c913ff2819 Merge "Fix a reversed condition in the next alarm validator" 2015-02-12 19:32:21 +00:00
Svetoslav
64d6e9ceec Fix a reversed condition in the next alarm validator 
bug:19361375

Change-Id: Ib5ac90503842aafd994423632fd1f463e49088a0
 2015-02-12 11:30:39 -08:00
Neil Fuller
a2c7884518 Merge "Remove usages of FloatMath" automerge: a8e8cdb automerge: 27316a9 
automerge: c1a5e82

* commit 'c1a5e82c25dba954cf1c06729e53bfb67667bcbb':
  Remove usages of FloatMath
 2015-02-12 19:29:45 +00:00
Tao Bao
e810913eea Merge "resolve merge conflicts of 6d8886a to master." 2015-02-12 19:27:34 +00:00
Tao Bao
0d27729dd8 resolve merge conflicts of 6d8886a to master. 
Change-Id: If8798a1d87b35e2db56211bf0e7dea94bed91b6a
 2015-02-12 11:26:00 -08:00
Alan Viverette
4cc1e9e707 Add support for user-selectable night mode 
Adds a Material theme that automatically selects light or dark UI based
on the night mode resource qualifier.

Removes restriction that night mode only works when car mode is enabled
or the device is docked, which was applied inconsistently anyway and
only actually worked when in car mode (regardless of docked state).
Night mode is now always applied according to the system preference.

Change-Id: I526807c907eb29a2ab588d15932afe3e6ab180c2
 2015-02-12 11:01:06 -08:00
Mike Lockwood
90b9a6a4ab MidiManager API tweaks: 
Rename MidiReceiver.onPost() to post()

Change MidiManager.DeviceCallback from an interface to a class

Change-Id: I939ba7a7d82e721b90a3d80252a88e7a650c9396
 2015-02-12 10:58:52 -08:00
Jeremy Joslin
f69f3737ba am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '1267462c0bf8ef5a0cfaca535847fc962b2cf32e':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:56:35 +00:00
Jeremy Joslin
1267462c0b am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit 'f456d4dcc042581cb2a3ba540538898f2cc925b7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:47:14 +00:00
Jeremy Joslin
f456d4dcc0 am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
* commit '20be0e25ba660a7555577988cefcfa36d84e7e2f':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 18:41:17 +00:00
Jeremy Joslin
20be0e25ba Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 2015-02-12 18:34:03 +00:00
Benjamin Franz
6076ef9355 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'dd0027cfda5d399293cb19aeefeeb34d5a5fbc1f':
  Fix the javadocs for lock task mode intents.
 2015-02-12 17:02:09 +00:00
Benjamin Franz
dd0027cfda am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit '40ab8bb22979b9e7c76e016b861319f6103eb800':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:52:34 +00:00
Benjamin Franz
40ab8bb229 am c70d0e71: Fix the javadocs for lock task mode intents. 
* commit 'c70d0e71c09da0292958d748cedaa5fbacbec74a':
  Fix the javadocs for lock task mode intents.
 2015-02-12 16:45:06 +00:00
Benjamin Franz
c70d0e71c0 Fix the javadocs for lock task mode intents. 
Bug: 19363651
Change-Id: Ia0da3ddad587ea842aad19818a62540889d6a9dd
 2015-02-12 16:12:58 +00:00
Narayan Kamath
3bdd327f85 Move apache specific portions of android.net.http to external/apache-http. 
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :

- Makefile changes to build docs and api-stubs for now. A future change
  will revert these changes and remove these classes from stubs and
  docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
  the frameworks and apache. These strings are on their way out and will
  never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
  part of apache-http.

bug: 18027885

Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
 2015-02-12 11:15:49 +00:00
Neil Fuller
c1a5e82c25 Merge "Remove usages of FloatMath" automerge: a8e8cdb 
automerge: 27316a9

* commit '27316a93e5979859ae98f506eca365784353007a':
  Remove usages of FloatMath
 2015-02-12 10:00:41 +00:00
Neil Fuller
a8e8cdbb17 Merge "Remove usages of FloatMath" 2015-02-12 09:26:47 +00:00
Neil Fuller
e573aa9371 Remove usages of FloatMath 
Bug: https://code.google.com/p/android/issues/detail?id=36199
Change-Id: Iec8fb663ed54eb967050f6ff25a36ba534204c4d
 2015-02-12 09:20:31 +00:00
Adam Powell
f4071c709d am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
automerge: bee1def

* commit 'bee1def31bb7a3a22e7c83904a3d8c418eeb5e48':
  Add DENSITY_280
 2015-02-12 07:49:31 +00:00
Tao Bao
6d8886ac46 resolved conflicts for merge of e1e1cd9d to lmp-mr1-dev-plus-aosp 
Change-Id: If01cb9c91c4f980d422896aa5ebe713f540d4fd1
 2015-02-11 22:32:05 -08:00
Adam Powell
bee1def31b am 97e0ba69: am b73e029f: am 0ec652cf: Merge "Add DENSITY_280" into lmp-mr1-dev 
* commit '97e0ba691222d037c1820ca8338ad13d07221daf':
  Add DENSITY_280
 2015-02-12 02:34:42 +00:00