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

125130 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ricardo Cervera
e34167cef7 Merge "docs: Fixed minor issues with Wear docs. Bug: 16062631" into klp-modular-dev 2014-07-09 14:50:26 +00:00
Ricardo Cervera
4adf1e069b docs: Fixed minor issues with Wear docs. Bug: 16062631 
Change-Id: Ieaa02cfedd1b9b6f59c6937a056c8d4f4eb4188e
 2014-07-09 11:30:23 -07:00
Robert Ly
a0d38aa4e5 Merge "docs: remove gms core preview for wear and redirect" into klp-modular-dev 2014-07-09 14:50:26 +00:00
Robert Ly
fa813cebaa docs: remove gms core preview for wear and redirect 
Change-Id: I8dd618a8fc99034cd73927d4aa312fe871081f83
 2014-07-09 09:46:45 -07:00
Robert Ly
1d5393298b docs: surface ui toolkit at a higher level 
Change-Id: If17cebda4606404f13d10ecb1540eda75b5e11ec
 2014-07-09 09:42:29 -07:00
Robert Ly
6d36bbe11b docs: fix wear packaging for paid apps instructions 
Change-Id: Ibf2cbe2e4bcb7e998665b10c5632c786dcc90e76
 2014-07-09 09:23:23 -07:00
Robert Ly
106ecfdca7 docs: fix 2d picker image description 
Change-Id: Id554a7090986e71a502dc070468d26f8d546cc2c
 2014-07-09 08:46:37 -07:00
Robert Ly
546d0ba888 docs: fix link to messages doc 
Change-Id: I382a2ec26634f8d7427344657de0a66b187562cb
 2014-07-09 07:59:07 -07:00
Stephen Hines
4fea742c07 Merge "Update copyFrom(BaseObj[]) for large objects." 2014-07-09 14:45:53 +00:00
Tim Murray
31e12acca5 Update copyFrom(BaseObj[]) for large objects. 
Change-Id: I99cadbd1ad925cad0dd357c9abbd1a49c07785c9
 2014-07-09 17:09:33 -07:00
Elliott Hughes
d74f99d390 Merge "Switch frameworks/base/libs/androidfw to the new icu." 2014-07-09 14:45:53 +00:00
Elliott Hughes
6a4deeda70 Switch frameworks/base/libs/androidfw to the new icu. 
Change-Id: Id82830750dd7e83bbc66811a1133b403cc697c97
 2014-07-09 16:58:28 -07:00
Robert Ly
33f5a318b9 Merge "docs: surface ui toolkit at a higher level" into klp-modular-dev 2014-07-09 14:43:38 +00:00
Robert Ly
cc2af1c010 Merge "Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html"" into klp-modular-dev 2014-07-09 14:38:35 +00:00
Robert Ly
9cac8112e0 Revert "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html" 
This reverts commit 42fcd1463d416ede744550810bdfd7974e685f15.

Change-Id: I0956e4e07b558c1f445d3209a52a54974e060b99
 2014-07-10 00:04:45 +00:00
Andrew Solovay
6462615c39 Merge "docs: Changed screenshot to use layout name" into klp-modular-dev 2014-07-09 14:38:35 +00:00
Andrew Solovay
f0deb94c80 docs: Changed screenshot to use layout name 
Updated doc is staged to:

http://asolovay.mtv:9125/guide/topics/ui/layout/linear.html#Example

bug: 15940125
Change-Id: I1628fd6527a02516bf288340059db433f591ac7e
 2014-07-09 16:31:45 -07:00
Robert Ly
e0b5829eb1 Merge "docs: fix 2d picker image description" into klp-modular-dev 2014-07-09 14:38:35 +00:00
Robert Ly
6f52e7be18 Merge "docs: fix link to messages doc" into klp-modular-dev 2014-07-09 14:38:35 +00:00
Brian Carlstrom
ce75618e12 am 5aba0149: am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]" 
* commit '5aba0149b953fb8e85851811dde995fb35c10051':
  Make dex2oat heap size product configurable [frameworks/base]
 2014-07-09 12:36:47 +00:00
Brian Carlstrom
5aba0149b9 am b85afb38: Merge "Make dex2oat heap size product configurable [frameworks/base]" 
* commit 'b85afb38e88ceca61af2855e30d34bc6ec4d32d9':
  Make dex2oat heap size product configurable [frameworks/base]
 2014-07-09 12:21:54 +00:00
Deepanshu Gupta
e5d9dca16f am d3a77b16: am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit 'd3a77b16c7e0cd54cde9a855654fe02897a50b87':
  Change font family name. [DO NOT MERGE]
 2014-07-09 00:06:22 +00:00
Deepanshu Gupta
d3a77b16c7 am e7ef4dde: am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit 'e7ef4dde3cd9a9b7f6e8317563158b954ca679be':
  Change font family name. [DO NOT MERGE]
 2014-07-09 00:02:06 +00:00
David Friedman
f88aca1d00 am d9843b2e: Merge "Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html" into klp-modular-dev 
* commit 'd9843b2ebeb9a99b620aae3a3d17ea64fb00358a':
  Change list for NDK Revision 10. Staged at: http://boku.mtv.corp.google.com:9198/tools/sdk/ndk/index.html
 2014-07-09 00:01:55 +00:00
Deepanshu Gupta
b996a186f1 am 9f595d98: am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '9f595d98979151860d76516f37bcc47238370f44':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-09 00:01:51 +00:00
Deepanshu Gupta
e7ef4dde3c am 575e334d: am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit '575e334d1d132321155d9afddc5733cfd5e58b2d':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:57:43 +00:00
Deepanshu Gupta
9f595d9897 am 6077f5f2: am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '6077f5f2340a26954033c5e1724506efbe478fba':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:54:06 +00:00
Deepanshu Gupta
575e334d1d am 813e2ac3: (-s ours) am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit '813e2ac3a03aec7052f1d9fcd2f53ef51493374c':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:52:33 +00:00
Deepanshu Gupta
c97f249cdc am 6dfce3f7: am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit '6dfce3f72c6e315013e323f4c1bb918c449d7d61':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:50:15 +00:00
Deepanshu Gupta
6077f5f234 am 2e9dc1fe: am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '2e9dc1fe510ae2c41bdd7415e9fc1c903ebfa336':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:50:09 +00:00
Deepanshu Gupta
813e2ac3a0 am bda28629: am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit 'bda28629dd2be00c1fda9a09192aef17f44fc919':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:48:14 +00:00
Deepanshu Gupta
2e9dc1fe51 am 4b84593f: (-s ours) am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '4b84593f8b34ecb16cf9ff413d0e4f3d14f0e422':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:45:05 +00:00
Deepanshu Gupta
bda28629dd am 1e344694: am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit '1e34469469fca5770f9c5f811b592d1f3687ddc5':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:43:39 +00:00
Deepanshu Gupta
6dfce3f72c am 00a10334: am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit '00a1033408407bce5997e81165ffea35844786a1':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:41:59 +00:00
Deepanshu Gupta
4b84593f8b am b0470a1f: am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b0470a1fce9e496b4812e8d652db20b8af656c02':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:39:43 +00:00
Deepanshu Gupta
1e34469469 am 0b487604: (-s ours) am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit '0b4876043be6eb9c2eaccb8270370b9275d4d899':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:38:48 +00:00
Deepanshu Gupta
5c92964e03 am c295c08f: am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'c295c08fb4d08e4f335754aa62ff0d957a339109':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:38:26 +00:00
Deepanshu Gupta
00a1033408 am 931e049e: am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit '931e049e6566723027554e57905de109b6faa783':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:36:50 +00:00
Deepanshu Gupta
b0470a1fce am d7ce8452: am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd7ce84528da16ef53eb8e3c9f34a5c7ca90fd1b3':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:35:09 +00:00
Deepanshu Gupta
c295c08fb4 am efa0e90c: am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'efa0e90cc581a9bbef9ae15ce8f1b6780c1c4bfe':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:34:08 +00:00
Deepanshu Gupta
4c0f9664de am 61d3dea6: am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE] 
* commit '61d3dea672ed8f2f4f90860580c37766b0197a58':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:33:00 +00:00
Deepanshu Gupta
931e049e65 am 5414f83d: (-s ours) am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit '5414f83d38455fcd8c788ea1b5cf61aaef3d0a5d':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:32:12 +00:00
Robert Ly
db520137db Merge "docs: fix wear packaging for paid apps instructions" into klp-modular-dev 2014-07-08 23:31:34 +00:00
Deepanshu Gupta
0b4876043b am d53a9fcb: am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit 'd53a9fcb7c56d6495e88cc3e39e2892e449a9171':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:30:20 +00:00
Deepanshu Gupta
d7ce84528d am 10e54073: (-s ours) am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '10e540733416a94206a656ce749fa046ab3e7655':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:30:10 +00:00
Deepanshu Gupta
61d3dea672 am 8c8bb83e: am 8e11659a: Change font family name. [DO NOT MERGE] 
* commit '8c8bb83e623e1932853230cb25a3330fcedb73ff':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:29:03 +00:00
Deepanshu Gupta
efa0e90cc5 am e63b7ad3: am 5acf782c: (-s ours) am d751eed4: am b49e21e1: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'e63b7ad391effb405712647f761402ce15d0ea48':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:28:41 +00:00
Deepanshu Gupta
5414f83d38 am d2829b49: am 432d16f9: Change font family name. [DO NOT MERGE] 
* commit 'd2829b490989b595118c7bd17c1dbff6789cacaa':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:28:32 +00:00
Deepanshu Gupta
10e5407334 am ca82da92: am 5d0db7f2: am 5455ddc4: Merge "Add a script to rename fonts for SDK. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'ca82da92db2949f134af01f577167639cbfc79bc':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-07-08 23:26:15 +00:00
Deepanshu Gupta
d53a9fcb7c am 979f9c68: am e30d3fdd: Change font family name. [DO NOT MERGE] 
* commit '979f9c685e31a07e9bd1d89c0947b863dd456940':
  Change font family name. [DO NOT MERGE]
 2014-07-08 23:25:22 +00:00