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

182235 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
fcbf8705e3 am 8a18ac3d: (-s ours) am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '8a18ac3d858262b93ba7270e99e25c261892bc80':
  Import translations. DO NOT MERGE
 2015-02-12 23:12:05 +00:00
Geoff Mendal
2343e69a8e am f23a517a: (-s ours) am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'f23a517add2ad6c587bcfa691a1ac048818a39de':
  Import translations. DO NOT MERGE
 2015-02-12 23:12:00 +00:00
Geoff Mendal
e2d143a1cc am df45d644: (-s ours) am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'df45d644b6fd4dda8d2e2b650ce262a2c5b3fe79':
  Import translations. DO NOT MERGE
 2015-02-12 23:11:56 +00:00
Geoff Mendal
7a647ab30f am a01f5457: (-s ours) am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'a01f5457bc819fcb48ba1bae1849f54138510ea7':
  Import translations. DO NOT MERGE
 2015-02-12 23:11:52 +00: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 d23391eafe9f46ff01d5dc936126a4d6ae1c53d3.

Change-Id: Id7211a0fd08b9bc8ad092501de3c3efa57bf8264
 2015-02-12 23:09:19 +00:00
Geoff Mendal
028e986c4c am 6113edf5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
automerge: 14720e7  -s ours

* commit '14720e7a38e8eccf289de6a6da7ea42c41d87a04':
  Import translations. DO NOT MERGE
 2015-02-12 23:09:01 +00:00
Geoff Mendal
8a18ac3d85 am 7c958e2d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '7c958e2df0375761a1851cd02ca3aac3ee95f1c5':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:13 +00:00
Geoff Mendal
f23a517add am dc43cc88: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'dc43cc88f02bde0917525e9fe274453bc000eb0a':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:08 +00:00
Geoff Mendal
df45d644b6 am 5c7e4d99: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '5c7e4d99402bf0440ebd6713b6680f8abea175a3':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:04 +00:00
Geoff Mendal
a01f5457bc am be5aa9dd: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'be5aa9dda325a29c3f34cb9a97958c63f120f15e':
  Import translations. DO NOT MERGE
 2015-02-12 23:04:59 +00:00
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
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
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
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
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