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

153817 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Makoto Onuki
4650b32856 am d37368bf: Address API review comments: 
* commit 'd37368bf06dcaf8956cf69198636562b3043d182':
  Address API review comments:
 2014-08-27 16:42:10 +00:00
Joe Fernandez
4327228c20 am 37bd72c6: am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '37bd72c6b74131305ea90af2308afd1aed7b2b98':
  docs: add warning to redirects file
 2014-08-27 16:42:06 +00:00
Raph Levien
9aa7028d25 am 6dcfc268: am b73047ff: Merge "New weight-aware font config" into lmp-dev 
* commit '6dcfc268954e2f1f23ccdfda4e6c6aa2c7c5a62d':
  New weight-aware font config
 2014-08-27 16:38:35 +00:00
Raph Levien
648e94c256 am bdd95259: am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev 
* commit 'bdd95259eb3ba6614734cd5947773cf61944c8ff':
  Fix incorrect return value on missing glyph
 2014-08-27 16:38:21 +00:00
Ricardo Cervera
05fae8ec32 am 6c885e6f: am b37b252a: am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '6c885e6f315b621e0f496a952bc547b58e7b832d':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:38:16 +00:00
Ricardo Cervera
f6f13d827d am 300b212c: am d3288173: am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '300b212c8273bd0811ac98a4f2808a0481b315ed':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:38:11 +00:00
Ricardo Cervera
c9af0dc4c4 am 8dd47a7e: am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit '8dd47a7eb7bfc989b337ac9a3ef667ce01a7c9b2':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:38:06 +00:00
Baligh Uddin
acbbaa6e29 am 3aa96926: (-s ours) am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '3aa969269fb281c5ad4f0327fb350128d49d194c':
  Import translations. DO NOT MERGE
 2014-08-27 16:38:00 +00:00
Baligh Uddin
bc985bd993 am 753fcdd4: (-s ours) am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '753fcdd48eca0ec38596ce7a9ca08df1430a64af':
  Import translations. DO NOT MERGE
 2014-08-27 16:37:56 +00:00
Baligh Uddin
bf8f4b807e am 2dd99c5b: (-s ours) am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '2dd99c5bad960a971023cca2bb453e4533c18f68':
  Import translations. DO NOT MERGE
 2014-08-27 16:37:51 +00:00
Calin Juravle
2d3571cc17 Merge "Fix the length of a profiler system property" 2014-08-27 16:36:53 +00:00
Raph Levien
2ea962cf20 Merge "Remove duplicate line breaking" 2014-08-27 16:29:56 +00:00
Makoto Onuki
0e917336a2 Address API review comments: 
- Rename isCorpContactId() to isEnterpriseContactId().
- Update EXTRA_* constant values.
- Update javadoc on NAME_VERIFIED.

Bug 17253963

Change-Id: I1bef3adbb4125b39129c77cca29c4b8089e1f8cc
 2014-08-27 16:29:40 +00:00
Raph Levien
1ebf8d619f am b73047ff: Merge "New weight-aware font config" into lmp-dev 
* commit 'b73047ffc83d9858677e2174c04697502c9d854c':
  New weight-aware font config
 2014-08-27 16:28:09 +00:00
Joe Fernandez
67a8aae3c8 am 402282f3: am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '402282f3b5c544a40cc9e19a4c37bfe5277da0ce':
  docs: add warning to redirects file
 2014-08-27 16:28:07 +00:00
Raph Levien
f1800dcfee am 145f5780: Merge "Fix incorrect return value on missing glyph" into lmp-dev 
* commit '145f5780fabc99b36532d4f57a5c99c7eb727d2c':
  Fix incorrect return value on missing glyph
 2014-08-27 16:28:05 +00:00
Ricardo Cervera
003f88ae7b am b37b252a: am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'b37b252ab8069f7e5442fdcc499334de73ceb0cc':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:28:01 +00:00
Ricardo Cervera
6a19e7464b am d3288173: am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit 'd32881732588677f0c6985d11e7e1ef120b9c6c7':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:27:52 +00:00
Raph Levien
772d576b97 Merge "New weight-aware font config" into lmp-dev 2014-08-27 16:24:37 +00:00
Raph Levien
2a5fab9d47 Merge "Fix incorrect return value on missing glyph" into lmp-dev 2014-08-27 16:24:14 +00:00
Raph Levien
b8082603b6 Remove duplicate line breaking 
Fix for bug 17297223 "minikin crashing after boot on hammerhead in
master"

Due to improperly merged code, the line breaker was being run twice,
causing two copies of the layout. That in turn caused text crashes
because the line ends are not monotonic.

Change-Id: Ieaa702c530d6e9b2a90fb52a4ad716a9ddb567e7
 2014-08-27 09:22:27 -07:00
Ricardo Cervera
39ce6ba27e am d7a3ae38: am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'd7a3ae3835cb48289dfacb3215594550a9bd8969':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:22:14 +00:00
Baligh Uddin
8364cea60a am 7f74dffc: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '7f74dffc181e4cd2d237d85ef29f2bd6a04964da':
  Import translations. DO NOT MERGE
 2014-08-27 16:22:08 +00:00
Baligh Uddin
26b0882a7d am d87aa19b: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit 'd87aa19b12056d5e9dafc0dd8d34204d9b1bfc05':
  Import translations. DO NOT MERGE
 2014-08-27 16:22:04 +00:00
Baligh Uddin
43d650b732 am 550578f5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev 
* commit '550578f574fc0988c43b0e19a8611f6eab2014db':
  Import translations. DO NOT MERGE
 2014-08-27 16:21:59 +00:00
Calin Juravle
97da4613a3 am 2f63f7ab: am 852debcc: Merge "Update the handling of the native bridge property." 
* commit '2f63f7abd390dd2ee16889c047164caac308d101':
  Update the handling of the native bridge property.
 2014-08-27 16:18:31 +00:00
Calin Juravle
fa9f2d5445 am 9dcfcff9: (-s ours) am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd." 
* commit '9dcfcff9207b57e5bfa87b18f2383a5637f06bbb':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-27 16:18:18 +00:00
Ricardo Cervera
fc2497fe00 am 665fc318: am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '665fc3185d2bda1780ddc9074f46e11777e05405':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:17:03 +00:00
Ricardo Cervera
1794dd8b7d am 76428e01: am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '76428e01565997f21b6a50bd82088b11f7a1ac15':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:16:55 +00:00
Joe Fernandez
402282f3b5 am cafad301: am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit 'cafad30176ad621f3d943cab942af2187bdec7dc':
  docs: add warning to redirects file
 2014-08-27 16:16:13 +00:00
Ricardo Cervera
665fc3185d am df139acf: am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit 'df139acff19cdbca43d9cc312653f03463e645ed':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 16:05:10 +00:00
Ricardo Cervera
76428e0156 am 37e3f101: am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '37e3f10174bbe0308147323e8fcdf01ae09c5622':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 16:05:05 +00:00
Ricardo Cervera
20ce284f54 am 1f6a16f1: am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit '1f6a16f1def5f09dbfa9a527ee2f33b182b5f0ef':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 16:05:04 +00:00
Joe Fernandez
cafad30176 am 82521171: Merge "docs: add warning to redirects file" into klp-modular-docs 
* commit '825211712c2af5a2b9190662adf3fc93264eefd4':
  docs: add warning to redirects file
 2014-08-27 16:04:47 +00:00
Baligh Uddin
878da52a8b Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:00:31 +00:00
Baligh Uddin
085511a284 Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:20 +00:00
Baligh Uddin
1237584983 Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:11 +00:00
Baligh Uddin
c733367f5a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 16:00:03 +00:00
Baligh Uddin
28bb0aae3b Merge "Import translations. DO NOT MERGE" 2014-08-27 16:00:01 +00:00
Baligh Uddin
04cb07bb6c Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-27 15:59:58 +00:00
Baligh Uddin
30b785b566 Merge "Import translations. DO NOT MERGE" 2014-08-27 15:59:56 +00:00
Calin Juravle
2f63f7abd3 am 852debcc: Merge "Update the handling of the native bridge property." 
* commit '852debcc906dbf850b09e7e2fc822fe78bc735e6':
  Update the handling of the native bridge property.
 2014-08-27 15:58:43 +00:00
Calin Juravle
9dcfcff920 am 3bec87c9: Merge "Pass vmSafeMode (manifest attribute) to installd." 
* commit '3bec87c9fab49fc2cc7ad1909331f3978803bdd6':
  Pass vmSafeMode (manifest attribute) to installd.
 2014-08-27 15:58:39 +00:00
Joe Fernandez
825211712c Merge "docs: add warning to redirects file" into klp-modular-docs 2014-08-27 15:57:05 +00:00
Ricardo Cervera
1f6a16f1de am cde64643: am d91deea5: Merge "docs: Fixed notification background bug. Bug: 16801684" into klp-modular-docs 
* commit 'cde64643f9ff0ba3de5757520bead74d4ac52a19':
  docs: Fixed notification background bug. Bug: 16801684
 2014-08-27 15:54:29 +00:00
Ricardo Cervera
df139acff1 am 1cf6ff30: Merge "docs: Fixed Google Play Services version number. Bug: 17195954" into klp-modular-docs 
* commit '1cf6ff306e992711c1d6682ed5d69701669fdce3':
  docs: Fixed Google Play Services version number. Bug: 17195954
 2014-08-27 15:54:28 +00:00
Ricardo Cervera
37e3f10174 am 4f0fedd5: Merge "docs: Changed studio links to HTTPS from HTTP. Bug: 17295924" into klp-modular-docs 
* commit '4f0fedd5017563408436c8fa7702766a487e724f':
  docs: Changed studio links to HTTPS from HTTP. Bug: 17295924
 2014-08-27 15:54:25 +00:00
Calin Juravle
852debcc90 Merge "Update the handling of the native bridge property." 2014-08-27 15:50:38 +00:00
Calin Juravle
3bec87c9fa Merge "Pass vmSafeMode (manifest attribute) to installd." 2014-08-27 15:50:10 +00:00
Julia Reynolds
9ed66da8df Limit the settings profile/device owners can update. 
Bug: 16351901
Change-Id: Id33a57ad651b5b7b58de0549eb90d5a1fe5c19c5
 2014-08-27 11:49:37 -04:00