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

172989 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
e3c10bf96c am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
automerge: d3b6d61

* commit 'd3b6d61d1320aca69c22fd597197b8dd6de61799':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:49:30 +00:00
Ricardo Cervera
d8bd117ce0 Merge "docs: Add parent calls to WatchFaces snippet." into lmp-docs 2015-01-12 21:49:23 +00:00
Joe Fernandez
d3b6d61d13 am d15b54d2: am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit 'd15b54d23fbc2f5582c9491cca46830b84f388ae':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:46:38 +00:00
Joe Fernandez
eabea18ee8 am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
automerge: 56c56f7

* commit '56c56f7d20f7c7621f746955dd275d252ca37732':
  docs: Remove Wear preview reference docs
 2015-01-12 21:39:30 +00:00
Joe Fernandez
d15b54d23f am 0bb84bb5: am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '0bb84bb5e2a137475718e31fb25f06b160163588':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:39:24 +00:00
Joe Fernandez
56c56f7d20 am 520a3c82: am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit '520a3c825855e27de8b755f358c6849d08c7edd0':
  docs: Remove Wear preview reference docs
 2015-01-12 21:37:06 +00:00
Yang Ni
ae0278e966 am cc9efb78: am 21454aa2: Merge "New Script Group API." 
* commit 'cc9efb78fadfb63538cb1c50577440dcf617ffdb':
  New Script Group API.
 2015-01-12 21:36:36 +00:00
Joe Fernandez
0bb84bb5e2 am 661ca547: am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '661ca54706c146697fe45dfcf81840c25b9022b2':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:34:19 +00:00
Yang Ni
cc9efb78fa am 21454aa2: Merge "New Script Group API." 
* commit '21454aa27643f69a0ee9377ae09a01e96af3718f':
  New Script Group API.
 2015-01-12 21:31:42 +00:00
Joe Fernandez
520a3c8258 am acd5f3ab: am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit 'acd5f3ab40c81b5267b4b551e0fd55ce839351b9':
  docs: Remove Wear preview reference docs
 2015-01-12 21:31:02 +00:00
Joe Fernandez
661ca54706 am 8062f1f3: Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 
* commit '8062f1f34113f4d73d37ebb57245342cca9d8f9c':
  docs: Removing obsolete L-Preview docs and images
 2015-01-12 21:27:24 +00:00
Joe Fernandez
acd5f3ab40 am 1946978c: am 76110e7c: docs: Remove Wear preview reference docs 
* commit '1946978c5341fe06db287a4535769ea12e6b6745':
  docs: Remove Wear preview reference docs
 2015-01-12 21:25:42 +00:00
Yang Ni
21454aa276 Merge "New Script Group API." 2015-01-12 21:25:13 +00:00
Joe Fernandez
8062f1f341 Merge "docs: Removing obsolete L-Preview docs and images" into lmp-docs 2015-01-12 21:23:17 +00:00
Joe Fernandez
1946978c53 am 76110e7c: docs: Remove Wear preview reference docs 
* commit '76110e7c46297a221d8f2c92fbaef46b6f405294':
  docs: Remove Wear preview reference docs
 2015-01-12 21:16:26 +00:00
Jason Monk
2168062b23 am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
automerge: a50a668

* commit 'a50a66824c3cb17bc618b4e2ca3166003b6ddc26':
  Carrier text handle sim removal
 2015-01-12 21:08:38 +00:00
Jason Monk
a50a66824c am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
* commit '0a1eb640d29830813bb478b8635763a708b6310c':
  Carrier text handle sim removal
 2015-01-12 21:06:46 +00:00
Jason Monk
0a1eb640d2 Merge "Carrier text handle sim removal" into lmp-mr1-dev 2015-01-12 21:00:09 +00:00
Ricardo Cervera
afd23aba8e docs: Add parent calls to WatchFaces snippet. 
Bug: 18982021

Change-Id: I2b39255827826d1e097ccba97e90e92a587fc39b
 2015-01-12 12:54:32 -08:00
Prashant Malani
0142097a03 am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev 
automerge: 4212bf1

* commit '4212bf1fad7ab15b10926b30038aae380697aaa3':
  Improve the circularMask for round displays
 2015-01-12 18:42:48 +00:00
Prashant Malani
4212bf1fad am b71f9f96: Merge "Improve the circularMask for round displays" into lmp-mr1-dev 
* commit 'b71f9f96f7f464267c59a80add495388338ced04':
  Improve the circularMask for round displays
 2015-01-12 18:40:56 +00:00
Prashant Malani
b71f9f96f7 Merge "Improve the circularMask for round displays" into lmp-mr1-dev 2015-01-12 18:34:46 +00:00
Joe Fernandez
76110e7c46 docs: Remove Wear preview reference docs 
These docs are out of date and unreachable due to redirect rules.

Change-Id: I76d9ccfff139b2377c45d71af2998a99b82a2f14
 2015-01-12 10:28:03 -08:00
Joe Fernandez
05d9a5107f docs: Removing obsolete L-Preview docs and images 
- /preview/images/
- TV Preview index pages
- Notifications preview page

Change-Id: I3e7c4e06bcdb6804fd83a80a8171a9d8e0c57117
 2015-01-12 10:20:41 -08:00
Eric Gilmore
85ac9f153b am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
automerge: 39b167a

* commit '39b167a644f3859a59e814662295c9247b77f0b9':
  Adding Android Fundamentals video.
 2015-01-12 17:26:22 +00:00
Eric Gilmore
39b167a644 am c6a22851: am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit 'c6a228511c15506602b03f96183bb3c06d12163f':
  Adding Android Fundamentals video.
 2015-01-12 17:24:49 +00:00
Geoff Mendal
eb99c82602 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
automerge: 8858db6  -s ours

* commit '8858db6b7eaabd5ce4356c9a48dff082c3af21d5':
  Import translations. DO NOT MERGE
 2015-01-12 17:19:25 +00:00
Eric Gilmore
c6a228511c am 3fca2e7f: am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit '3fca2e7fee3d657c74406f8405bc1d669b9392e8':
  Adding Android Fundamentals video.
 2015-01-12 17:19:05 +00:00
Geoff Mendal
8858db6b7e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-01-12 17:18:02 +00:00
Eric Gilmore
3fca2e7fee am 10b829e1: am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit '10b829e126482c54657371485ecf425b3f05bb0f':
  Adding Android Fundamentals video.
 2015-01-12 17:13:14 +00:00
Geoff Mendal
5274364a3b Import translations. DO NOT MERGE 
Change-Id: I5ebfac09df5e81b91db2b24d87f939793e5f8319
Auto-generated-cl: translation import
 2015-01-12 09:07:58 -08:00
Eric Gilmore
10b829e126 am fec824b6: Merge "Adding Android Fundamentals video." into lmp-docs 
* commit 'fec824b6118a73bdc760acaf7dbd9420ffe7fe91':
  Adding Android Fundamentals video.
 2015-01-12 17:07:12 +00:00
Eric Gilmore
979dc00bb9 am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
automerge: 1908515

* commit '1908515d59b57ebad82c0ee655caa0f5494c8b86':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 17:05:01 +00:00
Eric Gilmore
1908515d59 am c726557c: am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit 'c726557cbd1189c11e0ee6f0447b2bc21ce05de8':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 17:03:37 +00:00
Eric Gilmore
fec824b611 Merge "Adding Android Fundamentals video." into lmp-docs 2015-01-12 17:02:32 +00:00
Tyler Gunn
cd5d33c89f Fix for call timer resetting when starting IMS conference call. 1/4 
- Added support in Conference for specifying the connect time when the
conference is created.

Bug: 18959443
Change-Id: I501edde3b62f6bf021eb7455089e80626013da12
 2015-01-12 09:02:01 -08:00
Eric Gilmore
c726557cbd am 2c7e5631: am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '2c7e563181405ae6a91edb57f654f884b8759c8e':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:55:40 +00:00
Eric Gilmore
2c7e563181 am 7862ba29: am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '7862ba297f7106ef0208e8f1dbbe9f9e35c63485':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:46:35 +00:00
Neil Fuller
60b268f039 am f5f345cf: am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 
* commit 'f5f345cf929908bd863143815743c44778d29e4a':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
 2015-01-12 16:44:36 +00:00
Olawale Ogunwale
0f8ecc84c8 am 9d293911: am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit '9d293911221cac930eb8edfef01362ea083eeaab':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:44:28 +00:00
Olawale Ogunwale
d362d19364 am cacf5564: am e3f85985: Merge "bindService can\'t start up service process" 
* commit 'cacf55647f64076f840f37537a5edb979fe2c3ab':
  bindService can't start up service process
 2015-01-12 16:44:22 +00:00
Olawale Ogunwale
d07b9ea63d am a9ae5050: am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage." 
* commit 'a9ae505053585b6c46a6a86475959fd9fe501b09':
  [ActivityManager] Fix process record leakage.
 2015-01-12 16:44:12 +00:00
Geoff Mendal
60d791c864 am 3d9875f4: (-s ours) Import translations. DO NOT MERGE 
automerge: 83c2c04  -s ours

* commit '83c2c049bc090043e9042257ddd1d3cfa5a26f52':
  Import translations. DO NOT MERGE
 2015-01-12 16:31:22 +00:00
Eric Laurent
fe254b6ed2 am 695233fe: Merge "AudioService: send connection intent for HDMI ARC device" into lmp-mr1-dev 
automerge: f672783

* commit 'f67278306b7f4c48f92113a8f1c1ace39c9b62e7':
  AudioService: send connection intent for HDMI ARC device
 2015-01-12 16:29:59 +00:00
Jason Monk
afeefb63c6 am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
automerge: 3454612

* commit '3454612e2c0879ece4ac17c8b7ba93dce59b1907':
  Avoid showing emergency calls when not possible
 2015-01-12 16:28:02 +00:00
Neil Fuller
f5f345cf92 am 837261cc: Merge "Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade." 
* commit '837261cc997cbb188de05e3d1194adb91cb75825':
  Fix HttpResponseCacheTest in anticipation of an OkHttp upgrade.
 2015-01-12 16:27:04 +00:00
Olawale Ogunwale
9d29391122 am ebdfb6e8: Merge "[ActivityManager] Distinguish FG or BG receiver finished" 
* commit 'ebdfb6e8642e649f7efe877af398eae71cd9b80c':
  [ActivityManager] Distinguish FG or BG receiver finished
 2015-01-12 16:26:58 +00:00
Olawale Ogunwale
cacf55647f am e3f85985: Merge "bindService can\'t start up service process" 
* commit 'e3f859854712e96daf38d88b260afa8ac67a4e32':
  bindService can't start up service process
 2015-01-12 16:26:52 +00:00
Olawale Ogunwale
a9ae505053 am 8ddd5f4c: Merge "[ActivityManager] Fix process record leakage." 
* commit '8ddd5f4cd6e0619bbcf374ce073f4bc8acdbb182':
  [ActivityManager] Fix process record leakage.
 2015-01-12 16:26:45 +00:00
Eric Gilmore
7862ba297f am 6c8b80ac: Merge "Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built." into lmp-docs 
* commit '6c8b80acbb456b5b537137a181dc2ad4cbd07adc':
  Removing three obsolete lessons from TOC, which in turn removes them from building-userinfo.jd when built.
 2015-01-12 16:26:43 +00:00