182299 Commits

Author SHA1 Message Date
Geoff Mendal
14720e7a38 am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '6113edf578bba44de85698624026b4f48652fef9':
  Import translations. DO NOT MERGE
2015-02-12 23:04:54 +00:00
Geoff Mendal
5e5c39abdb Import translations. DO NOT MERGE
Change-Id: I57a4ac857f18a1e365e79198ac5de60748847add
Auto-generated-cl: translation import
2015-02-12 15:04:27 -08:00
Geoff Mendal
e22cd0f9e6 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:29 +00:00
Geoff Mendal
dfe8fe3fcf Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:01:18 +00:00
Geoff Mendal
39b03e7636 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:58 +00:00
Geoff Mendal
7c958e2df0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:46 +00:00
Geoff Mendal
dc43cc88f0 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:00:17 +00:00
Geoff Mendal
5c7e4d9940 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:58 +00:00
Geoff Mendal
be5aa9dda3 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:59:25 +00:00
Geoff Mendal
6113edf578 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 22:58:47 +00:00
John Spurlock
e4049b6d36 am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev
* commit 'f45e5dbf599a0043d7f6576f20eafb2c1c157204':
  NoMan: Initialize filter value reported to listeners.
2015-02-12 22:58:44 +00:00
Geoff Mendal
dd1048e10a Import translations. DO NOT MERGE
Change-Id: I592c996ee5bd1d20bcd4ea595b3e6cbba08a4d0c
Auto-generated-cl: translation import
2015-02-12 14:55:57 -08:00
Geoff Mendal
0804199a6e Import translations. DO NOT MERGE
Change-Id: Ia9e245c983da6b04f3098269e611d1e193899be8
Auto-generated-cl: translation import
2015-02-12 14:53:58 -08: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
John Spurlock
f45e5dbf59 Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 2015-02-12 22:52:13 +00:00
Geoff Mendal
b008c8f73a Import translations. DO NOT MERGE
Change-Id: I44a5695c1b18476df2114f16e35fbcbf2a0d99c1
Auto-generated-cl: translation import
2015-02-12 14:51:47 -08: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
Geoff Mendal
899b20e374 Import translations. DO NOT MERGE
Change-Id: Ic17d83f48e83832042cd417f1196e6f108ad1724
Auto-generated-cl: translation import
2015-02-12 14:46:15 -08:00
Svetoslav
2ed8acbbdb Merge "Handle a missed case in query the settings provider" 2015-02-12 22:44:08 +00:00
Svetoslav
2849465ee1 Handle a missed case in query the settings provider
bug:19361521

Change-Id: Ibf4731b5d665563bb87ef93a4cf63e4c4d2e46a4
2015-02-12 14:43:41 -08:00
Geoff Mendal
4e7f6a425c Import translations. DO NOT MERGE
Change-Id: I8cdc3195ba20c25fab9de6c0063667f5250e6e51
Auto-generated-cl: translation import
2015-02-12 14:42:44 -08:00
Geoff Mendal
3e94f5644c Import translations. DO NOT MERGE
Change-Id: Ia8018b29159267ee751a6eb84713409f17fca2b8
Auto-generated-cl: translation import
2015-02-12 14:40:46 -08:00
Geoff Mendal
44f7bdd2e7 Import translations. DO NOT MERGE
Change-Id: I9c7b354d532f6631e9e1e1500e0c544379f08b2e
Auto-generated-cl: translation import
2015-02-12 14:35:01 -08:00
Geoff Mendal
926839346d Import translations. DO NOT MERGE
Change-Id: I687ccfbddefdf63cdf6b5ef561dbf8261d66ce73
Auto-generated-cl: translation import
2015-02-12 14:32:53 -08:00
Casey Burkhardt
d29a1e47d4 Support circular magnification frame on circular devices
The magnification viewport expects its boundary to be a rectangular region,
and always draws it as such.  This change causes the indicator to draw as a
circle on devices with circular displays.  This also refactors the width of
the indicator's frame to use a proper dimension resource and updates the
width to 4dip.

Bug:18242438
Change-Id: I1d86647b6d1ef84f5dd506f4141223ec050a79b5
2015-02-12 14:13:10 -08:00
Jim Miller
c39b1059a6 am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
automerge: 0bb6071

* commit '0bb60712f736fef0c3509231afed0fff7f8bfd2b':
  Fix accessibility focus bug in statusbar
2015-02-12 22:12:30 +00:00
Jim Miller
0bb60712f7 am 4bbd3cb3: am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit '4bbd3cb3e8494de71ac5ac2aed49e6c56c3b9f68':
  Fix accessibility focus bug in statusbar
2015-02-12 22:10:48 +00:00
Jim Miller
4bbd3cb3e8 am b1e80278: am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit 'b1e80278f80585a1c3f46dbc578bbbafbcbd80c1':
  Fix accessibility focus bug in statusbar
2015-02-12 22:04:28 +00:00
Jim Miller
b1e80278f8 am b2ff8d9a: Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev
* commit 'b2ff8d9a3e5f279e7a60a12f9192e43081e2eef9':
  Fix accessibility focus bug in statusbar
2015-02-12 21:55:06 +00:00
Jim Miller
b2ff8d9a3e Merge "Fix accessibility focus bug in statusbar" into lmp-mr1-dev 2015-02-12 21:48:11 +00:00
Tor Norbye
65528280e2 Merge "Update the @ServiceName annotation" 2015-02-12 21:40:36 +00:00
Raph Levien
80955e105d Merge "Interval tree for SpannableStringBuilder" 2015-02-12 20:34:46 +00:00
Chris Craik
d12940797c Merge "Glop Bitmap and RoundRect clipping support" 2015-02-12 20:32:58 +00:00
Chris Craik
0519c810a5 Glop Bitmap and RoundRect clipping support
Change-Id: I4577546a5d2e5f084cc03f39a89db9231b8111ee
2015-02-12 12:30:59 -08: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
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