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

182299 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
cdd9fd76de Merge "Track line numbers in lint script." 2015-02-13 01:07:16 +00:00
Luan Nguyen
377efac51d am 15ebb4da: am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit '15ebb4daab95c5ae85ebe5070099d2ab3be83676':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:40:58 +00:00
Luan Nguyen
a0c4163d3a am 4317ab13: am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit '4317ab134b1c46d23429f3a92c4ecd5a4d385b8e':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:40:54 +00:00
Luan Nguyen
846338956e am 968db361: am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit '968db3619a0abc26d486544e17acd168941312c8':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:40:48 +00:00
Luan Nguyen
15ebb4daab am 96a99bc3: am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit '96a99bc3c1f57298c551254fcb8854410ff4e53f':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:33:29 +00:00
Luan Nguyen
4317ab134b am 86391a2f: am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit '86391a2f63d60513279481e02c7234367cbced85':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:33:24 +00:00
Luan Nguyen
968db3619a am b8f9e048: am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'b8f9e04867aefe3b2f8fba05664c652f12bedc18':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:33:18 +00:00
Luan Nguyen
96a99bc3c1 am b9f9408c: am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit 'b9f9408c22ca95913643a60bac34bda07aa44173':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:25:26 +00:00
Luan Nguyen
86391a2f63 am b967f720: am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit 'b967f7201a42227a359412441cadc13b42a348ef':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:25:23 +00:00
Luan Nguyen
b8f9e04867 am e88f3522: am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'e88f352264714dd394731a01dcadbb67c1665be6':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:25:19 +00:00
Luan Nguyen
b9f9408c22 am 474746c7: am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs automerge: fe2c687 
* commit '474746c7b08842cefecc9c1408c7837d93cff823':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:19:29 +00:00
Luan Nguyen
b967f7201a am 71cf2b6d: am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs automerge: e0306bb 
* commit '71cf2b6d5344a45413f0c77691d7e1efb18b398f':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:19:25 +00:00
Luan Nguyen
e88f352264 am b14aec1b: am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs automerge: 946bf2d 
* commit 'b14aec1b954f6fea5fc3ead9a289c8896f372096':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:19:20 +00:00
Chris Craik
30036092b4 Glop path texture support 
Change-Id: I505eb05991ca4c9b2e01e49988b8f962fad51462
 2015-02-12 16:16:57 -08:00
Luan Nguyen
474746c7b0 am 2ea209ab: am 8d0df9b8: Merge "docs: Update device art generator to include Wear generic devices." into lmp-docs 
automerge: fe2c687

* commit 'fe2c687b97f21b7dd5471279c1b2b9458dcd22bf':
  docs: Update device art generator to include Wear generic devices.
 2015-02-13 00:16:48 +00:00
Luan Nguyen
71cf2b6d53 am e726495a: am fe5e7e92: Merge "docs: Fix issue with onCreate() method declaration in file backup section" into lmp-docs 
automerge: e0306bb

* commit 'e0306bbece4fd32d1e2f837dc515506180e04e8e':
  docs: Fix issue with onCreate() method declaration in file backup section
 2015-02-13 00:15:09 +00:00
Luan Nguyen
b14aec1b95 am b6de0316: am e1f90b4e: Merge "docs: Fix notification api guide issues (7461154, 12765600)" into lmp-docs 
automerge: 946bf2d

* commit '946bf2de30545a548022b8b8ba1b0ebc890ab08e':
  docs: Fix notification api guide issues (7461154, 12765600)
 2015-02-13 00:13:35 +00:00
Mike Lockwood
5b14d9893a Merge "MidiManager API tweaks:" 2015-02-13 00:01:48 +00:00
Todd Volkert
f4f9a3015e Merge "Increase visibility of Transition.areValuesChanged() to protected to allow subclasses outside the android.transition package to override it." 2015-02-12 23:35:59 +00:00
Casey Burkhardt
032559650e am 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev 
automerge: d1a5b5d

* commit 'd1a5b5dc07dc3798ae13a5a9538b5e5bbbeb8058':
  Support circular magnification frame on circular devices
 2015-02-12 23:31:15 +00:00
Casey Burkhardt
d1a5b5dc07 am 6f2dd8a9: Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev 
* commit '6f2dd8a9b195a2bc8538820d8685a4a0576964f9':
  Support circular magnification frame on circular devices
 2015-02-12 23:28:30 +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
Geoff Mendal
1da54032e8 am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
automerge: 6c02d92  -s ours

* commit '6c02d9239885a529d4b160aa3938b14c61fbc3fd':
  Import translations. DO NOT MERGE
 2015-02-12 23:25:38 +00:00
Geoff Mendal
cacf90e515 am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
automerge: f6ee5db  -s ours

* commit 'f6ee5dbc5efc90467dd46c5317807676fdaf8ae6':
  Import translations. DO NOT MERGE
 2015-02-12 23:24:19 +00:00
Casey Burkhardt
6f2dd8a9b1 Merge "Support circular magnification frame on circular devices" into lmp-mr1-modular-dev 2015-02-12 23:23:45 +00:00
Geoff Mendal
6c02d92398 am 77c5de0d: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '77c5de0d68fb1e40e01082cf97758b2d35bfca91':
  Import translations. DO NOT MERGE
 2015-02-12 23:22:42 +00:00
Geoff Mendal
f6ee5dbc5e am fabfcfd9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'fabfcfd97e37b1cc194fa0e9f6db3268e1a2ae43':
  Import translations. DO NOT MERGE
 2015-02-12 23:22:38 +00:00
John Spurlock
07137c3440 am 1be4b702: am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 
* commit '1be4b702f531363903b46a88fc3d1603fb19c3ef':
  NoMan: Initialize filter value reported to listeners.
 2015-02-12 23:19:03 +00:00
Geoff Mendal
77c5de0d68 Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:16:49 +00:00
Geoff Mendal
fabfcfd97e Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 2015-02-12 23:16:37 +00:00
Geoff Mendal
1781b7ed13 am 5a2b966a: (-s ours) am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '5a2b966ac490e59d0285934ac652dbaa02764f6b':
  Import translations. DO NOT MERGE
 2015-02-12 23:12:18 +00:00
Geoff Mendal
10600e982d am cd15d997: (-s ours) am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'cd15d99721b514d6b104302217805ded5e194e43':
  Import translations. DO NOT MERGE
 2015-02-12 23:12:13 +00:00
Geoff Mendal
8a8d800fba am 682cec12: (-s ours) am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '682cec120ee73d8e831e4d04c478712dc408cf02':
  Import translations. DO NOT MERGE
 2015-02-12 23:12:09 +00:00
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
John Spurlock
1be4b702f5 am 7e7c91ec: am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 
* commit '7e7c91ec95eca5e1089ede9953f27d8c3d3b8bea':
  NoMan: Initialize filter value reported to listeners.
 2015-02-12 23:11:36 +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
16070689f0 Import translations. DO NOT MERGE 
Change-Id: I536dd9e059bc42c5c399539e62d8aed02c9e446a
Auto-generated-cl: translation import
 2015-02-12 15:06:15 -08:00
Geoff Mendal
5a2b966ac4 am e22cd0f9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'e22cd0f9e6da18fe6827a481774e2998efbb5f46':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:28 +00:00
John Spurlock
7e7c91ec95 am e4049b6d: am f45e5dbf: Merge "NoMan: Initialize filter value reported to listeners." into lmp-mr1-dev 
* commit 'e4049b6d36ded6ec808be5f884248772a4059a72':
  NoMan: Initialize filter value reported to listeners.
 2015-02-12 23:05:25 +00:00
Geoff Mendal
cd15d99721 am dfe8fe3f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'dfe8fe3fcf551386d6107b67bc348d88207979c3':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:23 +00:00
Geoff Mendal
682cec120e am 39b03e76: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '39b03e76365d1da92de51da3bd9f7677c7b16af8':
  Import translations. DO NOT MERGE
 2015-02-12 23:05:18 +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