drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
182,368 Commits 1 Branch 0 Tags
Commit Graph

182368 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Geoff Mendal
28439f261b am 615adb8b: (-s ours) am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '615adb8bc80efa8c4b6d45387a500e8ab77bc692':
  Import translations. DO NOT MERGE
 2015-02-12 19:40:59 +00:00
Jeremy Joslin
47a0e664b8 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-12 19:40:58 +00: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
Jeremy Joslin
1084df02ad am 1267462c: am f456d4dc: am 20be0e25: Merge "Update Javadoc for EXTRA_NETWORK." into lmp-mr1-dev 
automerge: f69f373

* commit 'f69f3737ba8cb2acb481dc78de3c5275bae112e7':
  Update Javadoc for EXTRA_NETWORK.
 2015-02-12 19:39:20 +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
Narayan Kamath
6f609928cf am c7e48719: Merge "Remove references to persist.sys.language/country." automerge: 8be3724 
automerge: 00e821a

* commit '00e821a8608efdc19041bdda1e832d3d4b3c29e2':
  Remove references to persist.sys.language/country.
 2015-02-12 19:36:35 +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
Geoff Mendal
615adb8bc8 am a673af77: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'a673af77d95f4a3d46e5d71188256b27e06cc442':
  Import translations. DO NOT MERGE
 2015-02-12 19:20:42 +00:00
Alan Viverette
cbcf1d4854 Merge "Add support for user-selectable night mode" 2015-02-12 19:15:53 +00:00
Geoff Mendal
a673af77d9 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 19:13:54 +00:00
Luan Nguyen
fe2c687b97 am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
* commit '2ea209ab4c0883696be9a34aee5f4c4bf39c1a23':
  docs: Update device art generator to include Wear generic devices.
 2015-02-12 19:13:47 +00:00
Luan Nguyen
2ea209ab4c am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
* commit '8d0df9b891aca1b4f9ec2e3002ec628807f31fdb':
  docs: Update device art generator to include Wear generic devices.
 2015-02-12 19:07:47 +00: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
Luan Nguyen
8d0df9b891 Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 2015-02-12 19:01:03 +00: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
Alan Viverette
3358d5c0a7 Merge "API for adding layers to LayerDrawable" 2015-02-12 18:51:41 +00:00
Geoff Mendal
ceb7ae3170 Import translations. DO NOT MERGE 
Change-Id: Idd108e5eb791007b3604c67ce4a0853a368a445e
Auto-generated-cl: translation import
 2015-02-12 10:51:28 -08:00
Alan Viverette
d8c18e81c0 API for adding layers to LayerDrawable 
Change-Id: I859c956a47d95fa1ce65b9eea9bc7be4659486bf
 2015-02-12 18:49:42 +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
John Spurlock
f370177e94 NoMan: Initialize filter value reported to listeners. 
In addition to relying on change callbacks.

Bug: 19288429
Change-Id: Id54473e5fbb4eac3778781a2052ba0103076f8d1
 2015-02-12 13:29:37 -05:00
Luan Nguyen
e0306bbece am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
* commit 'e726495a269b48f9b94fa9e545f84e79d587a282':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-12 17:35:43 +00:00
Luan Nguyen
946bf2de30 am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
* commit 'b6de0316a8f77b4425057eb4e75f7375c47fad65':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-12 17:35:38 +00:00
Jeff Sharkey
ed6aaf0f79 Track line numbers in lint script. 
Also create separate class to describe failures, which can be
consumed by other tools.  Still offers to render itself for console
output by default.

Change-Id: Ib0555cc289ae08a0e446489509cc964c866c564e
 2015-02-12 09:31:43 -08:00
Wale Ogunwale
5e789f03b2 Fixed bug in 'am stack split' command. 
Change-Id: Id3efb65a3f9cbf3c223ea08d51e2028180bd5479
 2015-02-12 09:25:52 -08:00
Luan Nguyen
e726495a26 am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
* commit 'fe5e7e92a1e4cf173c787e0ffe6d84d6f1e4c703':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-12 17:17:04 +00:00
Luan Nguyen
b6de0316a8 am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
* commit 'e1f90b4e1e438c0086409ae0253a6452f2befbac':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-12 17:16:59 +00:00
Luan Nguyen
fe5e7e92a1 Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 2015-02-12 17:11:28 +00:00
Luan Nguyen
e1f90b4e1e Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 2015-02-12 17:10:50 +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
Narayan Kamath
00e821a860 am c7e48719: Merge "Remove references to persist.sys.language/country." 
automerge: 8be3724

* commit '8be3724a06f7b2d28c6664ca11a03f91f97f0972':
  Remove references to persist.sys.language/country.
 2015-02-12 16:41:41 +00:00
Narayan Kamath
8be3724a06 am c7e48719: Merge "Remove references to persist.sys.language/country." 
* commit 'c7e487193aed3b102d6e55e0817de6e0460e0236':
  Remove references to persist.sys.language/country.
 2015-02-12 16:37:58 +00:00
Narayan Kamath
c7e487193a Merge "Remove references to persist.sys.language/country." 2015-02-12 16:31:08 +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
b61db8229a Remove references to persist.sys.language/country. 
Addresses a couple of TODOs now that all usages have been
removed and fixes a doc that specifies how the emulator locale
can be set.

bug: 17691569

Change-Id: I802ea1e12448a5442840cad1fdc0956d3e2c7a8c
 2015-02-12 13:16:55 +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
27316a93e5 Merge "Remove usages of FloatMath" 
automerge: a8e8cdb

* commit 'a8e8cdbb17164c0124e04c376110637af96d5e89':
  Remove usages of FloatMath
 2015-02-12 09:57:57 +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