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

122885 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
4f133894a6 Exclude KXmlParser from LayoutLib. 
The class was incorrectly being included in the LayoutLib.

Change-Id: I3c86662efa068019fe9165f2fc49a00d0a1b7f2d
 2014-10-08 10:12:11 -07:00
Joe Fernandez
59c04ece56 am bcd1af39: Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 
* commit 'bcd1af39fa674dcc46ddb30778304eaf67100a13':
  docs: Wear UI Lib training fixes
 2014-10-08 14:45:59 +00:00
Joe Fernandez
bcd1af39fa Merge "docs: Wear UI Lib training fixes" into klp-modular-docs 2014-10-08 14:37:35 +00:00
Deepanshu Gupta
11b14e3996 LayoutLib: Use ICU's line break algo. [DO NOT MERGE] 
Change-Id: I7e5b0ab7423a72f5a4b0e1163d0a537f0b03ba07
(cherry picked from commit 760f6394d0f65fbb5365186e8e068d53c506b653)
 2014-10-08 02:05:05 +00:00
Rich Slogar
916a6ea303 am 6af8fc7f: Merge "docs:64 bit image and skd update" into klp-modular-docs 
* commit '6af8fc7f89cb5dec15c23ee04c271188ff11138d':
  docs:64 bit image and skd update
 2014-10-08 00:34:38 +00:00
Rich Slogar
6af8fc7f89 Merge "docs:64 bit image and skd update" into klp-modular-docs 2014-10-08 00:31:43 +00:00
Quddus Chong
bb5a184872 am 8730092a: Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 
* commit '8730092af798d27b9e9a9a4ba00cef0d3ebea55f':
  docs: Added API highlights for Google Play services 6.1 (Manchego).
 2014-10-07 23:33:10 +00:00
Quddus Chong
bf29d69780 am 6628e602: Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 
* commit '6628e602fb616355db8272a697a7004d91f485b8':
  Updataed Google Play services Javadocs for v6.1 (Manchego) release.
 2014-10-07 23:33:03 +00:00
Quddus Chong
8730092af7 Merge "docs: Added API highlights for Google Play services 6.1 (Manchego)." into klp-modular-docs 2014-10-07 23:27:02 +00:00
Quddus Chong
6628e602fb Merge "Updataed Google Play services Javadocs for v6.1 (Manchego) release." into klp-modular-docs 2014-10-07 23:26:49 +00:00
Rich Slogar
1b0fba6478 docs:64 bit image and skd update 
Change-Id: I53d3d8e8714cb4689ba80766b155fb1b3ea93484
 2014-10-07 11:40:27 -07:00
Ricardo Cervera
a18075e82b am bd964cad: docs: Removing references to self note on Common Intents page. 
* commit 'bd964cadd4846d5d954eadb7fcd2a61e51814c65':
  docs: Removing references to self note on Common Intents page.
 2014-10-07 18:38:24 +00:00
Ricardo Cervera
bd964cadd4 docs: Removing references to self note on Common Intents page. 
Change-Id: Ia1324f2363ce66ad0019946605a6a74a4cd28ecc
 2014-10-07 10:37:19 -07:00
Ricardo Cervera
6d30f57614 am 3f7b4d8f: Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 
* commit '3f7b4d8ff385ce30c6c266f8b0418fc621db2da8':
  docs: Update Common Intents page with Google Now actions
 2014-10-07 04:49:17 +00:00
Ricardo Cervera
3f7b4d8ff3 Merge "docs: Update Common Intents page with Google Now actions" into klp-modular-docs 2014-10-07 04:41:13 +00:00
Ricardo Cervera
cee4ed8a1d docs: Update Common Intents page with Google Now actions 
Change-Id: I474539d37791b16df693193bcdaee4e2161a2612
 2014-10-06 19:16:06 -07:00
Quddus Chong
4be6fdebdd am ba2199fa: Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 
* commit 'ba2199fa8c369d9627a216a4c3ea19497bf9e9c7':
  docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API.
 2014-10-04 01:30:43 +00:00
Quddus Chong
ba2199fa8c Merge "docs: Modified the notice in the android.location package file to strongly encourage developers to migrate to the Google Play Services Location API." into klp-modular-docs 2014-10-04 01:20:14 +00:00
Ricardo Cervera
0e61e44ddf am 2a02b881: Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 
* commit '2a02b8813bd6bfd3d36cca6e5e3a3ff6a868d881':
  docs: Training class for the Wearable UI Library
 2014-10-04 00:01:21 +00:00
Rich Slogar
64460a2b6e am 83d5c9bf: docs:change required ADT version to 23.0.2 
* commit '83d5c9bfbd75831375009e21989de40368afc04a':
  docs:change required ADT version to 23.0.2
 2014-10-04 00:01:17 +00:00
Ricardo Cervera
3ffe146151 docs: Wear UI Lib training fixes 
Change-Id: I8d4610b68218455b8a00a34a101cee1f0d945633
 2014-10-03 16:43:25 -07:00
Ricardo Cervera
2a02b8813b Merge "docs: Training class for the Wearable UI Library" into klp-modular-docs 2014-10-03 23:25:24 +00:00
smain@google.com
8267ffccbe am cef9aab6: Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 
* commit 'cef9aab68ec45340186261d39ded6261ba1c5966':
  make sdk download links use HTTPS bug: 8033954
 2014-10-03 22:13:14 +00:00
Rich Slogar
83d5c9bfbd docs:change required ADT version to 23.0.2 
Change-Id: I6312cd45df94a89f2812aa3c53e2974f6cfbb0ed
 2014-10-03 15:12:17 -07:00
smain@google.com
cef9aab68e Merge "make sdk download links use HTTPS bug: 8033954" into klp-modular-docs 2014-10-03 22:06:44 +00:00
Quddus Chong
380dde32a7 docs: Modified the notice in the android.location package file to strongly 
encourage developers to migrate to the Google Play Services Location API.

Change-Id: I9c2602daa7198eca38841582865c6a973f5acec8
 2014-10-03 14:14:08 -07:00
Ricardo Cervera
32cfe2bbc7 am d37afa37: Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 
* commit 'd37afa37452d5e5dab3704ecab0ab7cebb3da292':
  docs: Unbuntu troubleshooting link to CamelCase ID
 2014-10-03 18:00:37 +00:00
Ricardo Cervera
d37afa3745 Merge "docs: Unbuntu troubleshooting link to CamelCase ID" into klp-modular-docs 2014-10-03 17:55:36 +00:00
Ricardo Cervera
43c758b4ce docs: Unbuntu troubleshooting link to CamelCase ID 
Change-Id: I705d17346c470563c350df9bb17d23f3fda5fbc5
 2014-10-03 09:44:25 -07:00
Rich Slogar
46d8d0cdb3 am c470faab: docs:ADT 23.0.4 doc updates 
* commit 'c470faab3ee47b5643ee6b0a97c925c8f0f587fa':
  docs:ADT 23.0.4 doc updates
 2014-10-02 22:47:15 +00:00
Rich Slogar
c470faab3e docs:ADT 23.0.4 doc updates 
Change-Id: Ibf412802e7c98ed3beff6c61394f1b3962254d9a
 2014-10-02 15:31:04 -07:00
Ricardo Cervera
bab2bf78ef docs: Training class for the Wearable UI Library 
Change-Id: I93e9f6fc407f9afa79ce9af43d90719eb526bffa
 2014-10-02 15:02:03 -07:00
Joe Fernandez
d36dbe09a1 am e961d0b5: Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 
* commit 'e961d0b521bc25caf964258e75fef3d3ea22e4ac':
  Revert "docs: Update for Android 23.0.4"
 2014-10-02 21:14:59 +00:00
Joe Fernandez
e961d0b521 Merge "Revert "docs: Update for Android 23.0.4"" into klp-modular-docs 2014-10-02 21:08:27 +00:00
Joe Fernandez
65ba319742 Revert "docs: Update for Android 23.0.4" 
This reverts commit f34d0e69033165b7a6e9c73b99f4ef6ac36b3896.

Change-Id: I4d521392733f1b028c72d4623d6d69a4c5910bc4
 2014-10-02 21:07:49 +00:00
Ricardo Cervera
957f45c328 am 680092c5: Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 
* commit '680092c5987e701043ff0fa0d2c5390e829412c0':
  docs: Provide direct link to Ubuntu troubleshooting.
 2014-10-02 18:07:53 +00:00
Ricardo Cervera
680092c598 Merge "docs: Provide direct link to Ubuntu troubleshooting." into klp-modular-docs 2014-10-02 18:04:42 +00:00
Ricardo Cervera
4ffffb8e8c docs: Provide direct link to Ubuntu troubleshooting. 
Change-Id: I6a9f8c3f3ef01abcfdaf95730139156ba443a4be
 2014-10-02 10:57:39 -07:00
Rich Slogar
b15cd52966 am c074c3a4: Merge "docs: Update for Android 23.0.4" into klp-modular-docs 
* commit 'c074c3a4074791ae1270e3177e2299f31b9bb5a1':
  docs: Update for Android 23.0.4
 2014-10-02 17:38:35 +00:00
Rich Slogar
c074c3a407 Merge "docs: Update for Android 23.0.4" into klp-modular-docs 2014-10-02 17:31:05 +00:00
Rich Slogar
f34d0e6903 docs: Update for Android 23.0.4 
Change-Id: I7025dcf9bbfd03b555f7f5059d0e35f67f836dcf
 2014-10-02 10:19:17 -07:00
Deepanshu Gupta
fca5e5577f Merge "Mark constructor as accessible in LayoutInflater. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:32:28 +00:00
Deepanshu Gupta
76aff1f6ab Merge "Resource resolution bug fix. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:49 +00:00
Deepanshu Gupta
5793383457 Merge "Fix Tests after cherry picks. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:43 +00:00
Deepanshu Gupta
52af468b5e Merge "Update intelliJ copyright profile [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:38 +00:00
Deepanshu Gupta
891f38d181 Merge "Build layoutlib create tests as part of sdk build. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:32 +00:00
Deepanshu Gupta
a2f088b677 Merge "Add layoutlib tests to DIST_DIR [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:22 +00:00
Deepanshu Gupta
541e6e5d47 Merge "Build layoutlib_create tests. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:08 +00:00
Deepanshu Gupta
2d77fad26b Merge "Remove ANDROID_BUILD_TOP from intelliJ path variables. [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:26:03 +00:00
Deepanshu Gupta
ffa4115a0e Merge "Get filename from File faster [DO NOT MERGE]" into klp-modular-dev 2014-10-02 03:25:44 +00:00