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

174206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
60e554a16a am 61dc64f3: am 6ee90183: am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '61dc64f38b2669a9e1599bc5595b760f31f586f7':
 2015-02-10 23:21:00 +00:00
Eric Gilmore
f184a008f9 am 7372d2d1: am 2b7f0cff: am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
* commit '7372d2d1db3b56c2f6592c15a29d7c2fb00ccd1c':
 2015-02-10 23:20:19 +00:00
John Spurlock
3242e5d5d3 am 79448424: am 43c7741c: Doze: pulse less often. automerge: 618e420 
* commit '79448424c3fedeab19f09a931511ad05c1b5ce63':
 2015-02-10 23:19:54 +00:00
Leon Scroggins III
a6fab6e114 am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
automerge: dc77ec5  -s ours

* commit 'dc77ec59beb23a2ff300d5048633687c0d68a0ac':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-10 22:21:09 +00:00
Leon Scroggins III
dc77ec59be am 3bb5fdc7: Merge "Check that bitmap\'s size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 
* commit '3bb5fdc7e607febaad3bd41ed7a36b596b7286af':
  Check that bitmap's size does not exceed 32 bits. DO NOT MERGE
 2015-02-10 22:08:00 +00:00
Leon Scroggins III
3bb5fdc7e6 Merge "Check that bitmap's size does not exceed 32 bits. DO NOT MERGE" into lmp-mr1-dev 2015-02-10 22:03:44 +00:00
Leon Scroggins III
89a2466a2a Check that bitmap's size does not exceed 32 bits. DO NOT MERGE 
BUG:19270126
Change-Id: I075d1cefcd3208305a72b4fa629a262e92eb60ea
 2015-02-10 20:57:45 +00:00
Shanea King-Roberson
524c46001f am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs automerge: 696b68c 
automerge: accf077

* commit 'accf0770306419773c3119eb32ca912077894b11':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:50:57 +00:00
Shanea King-Roberson
accf077030 am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
automerge: 696b68c

* commit '696b68c4fc65b671a00cfa82e6bc29a7d665828e':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:25:34 +00:00
Shanea King-Roberson
696b68c4fc am 24513bc5: am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '24513bc580024a8a90c1ceab6746c0abb452d678':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:17:53 +00:00
Chris Warrington
4308c2aea4 am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
automerge: 4499888

* commit '449988872be61f273c91db13069d5b7172429032':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:14:44 +00:00
Shanea King-Roberson
24513bc580 am 31622894: am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit '3162289445ebade804c422162578d328c4762372':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:10:38 +00:00
Shanea King-Roberson
3162289445 am c86ac21f: Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 
* commit 'c86ac21f7393e579ad1585396ce3c212bf7d3bfb':
  Adding videos for 5.0 changes and watch face development.
 2015-02-10 20:04:17 +00:00
Chris Warrington
449988872b am 510c24e8: Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 
* commit '510c24e8930447811f6725cbf7f3cefec2194a5d':
  Fix AAPT daemon mode with paths containg spaces.
 2015-02-10 20:01:00 +00:00
Shanea King-Roberson
c86ac21f73 Merge "Adding videos for 5.0 changes and watch face development." into lmp-docs 2015-02-10 19:57:30 +00:00
Chris Warrington
510c24e893 Merge "Fix AAPT daemon mode with paths containg spaces." into lmp-mr1-dev 2015-02-10 19:56:32 +00:00
Luan Nguyen
c6ec79913f am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
automerge: 6ee9018

* commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:18:37 +00:00
Eric Gilmore
ac4dfec8b3 am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
automerge: 2b7f0cf

* commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 19:16:49 +00:00
Luan Nguyen
61dc64f38b am 6ee90183: am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '6ee90183ab79f9c3b5216a9b0b6518de7679734a':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:09:14 +00:00
Luan Nguyen
6ee90183ab am 18fc7b85: am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '18fc7b85543cd21317475962521606038cd44383':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 19:02:50 +00:00
Luan Nguyen
18fc7b8554 am ba795593: am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'ba795593e5941d89a861bb848c3f98800a0be3d6':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:56:32 +00:00
Luan Nguyen
ba795593e5 am 9b432bbe: am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit '9b432bbece3cca6316b2638a947983e21c65917f':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:47:38 +00:00
Luan Nguyen
9b432bbece am e49fbfa2: Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 
* commit 'e49fbfa21ccdeba56001b48604524794acea119e':
  docs: Fix various issues with incorrect code samples.
 2015-02-10 18:40:34 +00:00
Luan Nguyen
e49fbfa21c Merge "docs: Fix various issues with incorrect code samples." into lmp-docs 2015-02-10 18:31:30 +00:00
Eric Gilmore
d86211292e Adding videos for 5.0 changes and watch face development. 
On branch pilot-videos
 Changes to be committed:
	modified:   docs/html/about/versions/android-5.0-changes.jd
	modified:   docs/html/training/wearables/watch-faces/index.jd

Change-Id: I2dd852f3af8ae39f91ec08aadd5c03ff9996b46b
 2015-02-10 10:29:36 -08:00
Eric Gilmore
7372d2d1db am 2b7f0cff: am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
* commit '2b7f0cff1eebdb56a0c09bf5aec712df45147e25':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:20:44 +00:00
Eric Gilmore
2b7f0cff1e am f35e8159: am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs automerge: 2b36779 
* commit 'f35e815939d60863ec84fdd906d96279b652e33c':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:12:47 +00:00
Eric Gilmore
f35e815939 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
automerge: 2b36779

* commit '2b36779f30a511cc4439a519c95963280a779fdc':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 18:05:23 +00:00
Eric Gilmore
2b36779f30 am 99b91b2f: am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit '99b91b2fd28888b20511316cb6f81b510b05cdf5':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:56:51 +00:00
Eric Gilmore
99b91b2fd2 am c9dbaf04: Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 
* commit 'c9dbaf0483b0274879164806297180d260689f1f':
  Doc change: refactor GCM docs to be platform-agnostic.
 2015-02-10 17:45:47 +00:00
John Spurlock
79448424c3 am 43c7741c: Doze: pulse less often. automerge: 618e420 
* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.
 2015-02-10 17:40:40 +00:00
John Spurlock
90fc289102 Doze: pulse less often. automerge: 618e420 
automerge: 43c7741

* commit '43c7741c28c39aa4f5be1252af67c8b1e7bd84c3':
  Doze: pulse less often.
 2015-02-10 17:40:33 +00:00
Luan Nguyen
c25adda636 docs: Fix various issues with incorrect code samples. 
bug: 15671968
Change-Id: I3219f9c5e492ee95257439d9f284120dadd277ac
 2015-02-10 09:39:44 -08:00
John Spurlock
43c7741c28 Doze: pulse less often. 
automerge: 618e420

* commit '618e420adf2ab2478f62891738320bb9cc5260ec':
  Doze: pulse less often.
 2015-02-10 17:32:27 +00:00
Calin Juravle
16df82d7ac am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." 
automerge: d1e074a

* commit 'd1e074a72452c909c7ed2a4baf220d9d2f306b20':
  Get the instruction set that the libraries of secondary Abi is supported.
 2015-02-10 16:23:51 +00:00
Calin Juravle
d1e074a724 am fd523efc: Merge "Get the instruction set that the libraries of secondary Abi is supported." 
* commit 'fd523efcde98e97cd8c088f95198e6e13f4f8b64':
  Get the instruction set that the libraries of secondary Abi is supported.
 2015-02-10 16:18:27 +00:00
Calin Juravle
fd523efcde Merge "Get the instruction set that the libraries of secondary Abi is supported." 2015-02-10 16:13:30 +00:00
John Spurlock
618e420adf Doze: pulse less often. 
Remove the trailing pulse @ 2 minutes, and only allow 2 schedule resets.

Bug: 19330195
Change-Id: I492581c081fafd2a1e5e09f7cce08d7a14da6d6b
 2015-02-10 09:23:29 -05:00
Chris Warrington
de3ab0a9e8 Fix AAPT daemon mode with paths containg spaces. 
Use new line as a delimiter rather than space.
Fixes: https://code.google.com/p/android/issues/detail?id=135757
Gradle CL: https://android-review.googlesource.com/130423

Change-Id: I7c73e680b0417b0e7cff9e0110822675c53ae20f
 2015-02-09 21:20:52 -08:00
Svetoslav
c052b0efce am cf2c8545: am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit 'cf2c8545bd6a8888801fa8c04d263879602eeb36':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:09:20 +00:00
Svetoslav
cf2c8545bd am 5521f39f: am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit '5521f39ff75d2af909061581e27810afaa9ed242':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 03:01:50 +00:00
Svetoslav
5521f39ff7 am c73cfa0f: Accessibiltiy: missed update to the previous patch. 
* commit 'c73cfa0ffba344a83d61e2f4eb9715152a2807b8':
  Accessibiltiy: missed update to the previous patch.
 2015-02-10 02:51:30 +00:00
Svetoslav
c73cfa0ffb Accessibiltiy: missed update to the previous patch. 
Change-Id: I4c47d38f5e137dcc1c6db0561b3824a26572027d
 2015-02-09 18:33:07 -08:00
Jason Sams
ec10f833b4 am 2a3cdf57: Merge "Implement array types" 
automerge: 6e0ad25

* commit '6e0ad25ca8def88a48c9cc6436b12da7ff4600c2':
  Implement array types
 2015-02-10 01:44:11 +00:00
Neil Fuller
04bd52d77c am 37e5a941: Merge "Avoid static initialization of Layout from TextUtils" 
automerge: 86b9cc3

* commit '86b9cc30099cf0836484a5231686cb1d85ebfdca':
  Avoid static initialization of Layout from TextUtils
 2015-02-10 01:42:41 +00:00
Elliott Hughes
aa122241fa am 77a8f9d2: Merge "Remove obsolete \'numeric_date_template\'." 
automerge: da1bd4c

* commit 'da1bd4c01abf9ec3aa5a0d9717a60935304068c4':
  Remove obsolete 'numeric_date_template'.
 2015-02-10 01:40:59 +00:00
Baligh Uddin
a314754575 am 2083173a: am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit '2083173af997419fbc2e92627fe5500f91ac7e5b':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:25:54 +00:00
Baligh Uddin
2083173af9 am fbf9666f: am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit 'fbf9666f846284ee1d4d09e2d36f0d2b92120656':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:17:42 +00:00
Eric Gilmore
c9dbaf0483 Merge "Doc change: refactor GCM docs to be platform-agnostic." into lmp-docs 2015-02-10 01:13:03 +00:00
Baligh Uddin
fbf9666f84 am b2ba6dfc: Merge "Accessibility: Handle a missed case when clicking focused views." into lmp-mr1-dev 
* commit 'b2ba6dfc7b33ec9e58d9f556206440a26069e264':
  Accessibility: Handle a missed case when clicking focused views.
 2015-02-10 01:07:08 +00:00