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

120835 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
e5ec1544f1 am 6bbfa5b5: am 2556034b: am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796 
* commit '6bbfa5b5b8174dab29f0b6b4b5473e1351f631f5':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
 2014-03-26 22:50:44 +00:00
Scott Main
6bbfa5b5b8 am 2556034b: am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796 
* commit '2556034b61287a719d919e63bc1925d86651016a':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
 2014-03-26 22:43:55 +00:00
Scott Main
2556034b61 am 322cf5c4: fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796 
* commit '322cf5c44f3e1329f51014ec3fa45f1c322d3d37':
  fix image sizes in design guide and code snippet bug bug: 13644390 bug: 13626796
 2014-03-26 22:36:55 +00:00
Scott Main
322cf5c44f fix image sizes in design guide and code snippet bug 
bug: 13644390
bug: 13626796

Change-Id: Ie5bb42c78190da6b6306c6ef6cc715a1ea33ffaa
 2014-03-26 15:26:50 -07:00
quddusc
52f6988b23 am fd95bffc: am ffba20b0: am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
* commit 'fd95bffc8b9399db8399c96cebb95d5bad3847a8':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
 2014-03-26 21:29:27 +00:00
quddusc
fd95bffc8b am ffba20b0: am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
* commit 'ffba20b058a556dd2d0224bcdedf0dcdb0f222ca':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
 2014-03-26 21:23:26 +00:00
quddusc
ffba20b058 am d43c1300: docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
* commit 'd43c13009cb9e5e9abb430390e7da302335651e1':
  docs: Fixed url to point to Google Analytics v4 Getting Started guide.
 2014-03-26 21:16:37 +00:00
quddusc
d43c13009c docs: Fixed url to point to Google Analytics v4 Getting Started guide. 
Change-Id: I4be35af686fcf3613f391c0c886728e5c19f22e6
 2014-03-26 13:53:41 -07:00
Mark Salyzyn
959bce3e69 am 4e3abafc: am 5daf51c0: Merge "jni: 64-bit compile issue" 
* commit '4e3abafc9400eed38a1e76897b79e923acfaf8ed':
  jni: 64-bit compile issue
 2014-03-26 20:00:13 +00:00
Mark Salyzyn
4e3abafc94 am 5daf51c0: Merge "jni: 64-bit compile issue" 
* commit '5daf51c0fe6d5bea858c37291fed88bd3094d3ec':
  jni: 64-bit compile issue
 2014-03-26 12:56:02 -07:00
Ricardo Cervera
39d1b3f0b8 am a8d12f76: am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev 
* commit 'a8d12f764ccf85da52b82d6726c4a2a12c475fcf':
  docs: Added release notes for Support Library 19.1.0
 2014-03-26 19:53:28 +00:00
Mark Salyzyn
5daf51c0fe Merge "jni: 64-bit compile issue" 2014-03-26 19:52:11 +00:00
Ricardo Cervera
a8d12f764c am 19a67a71: Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev 
* commit '19a67a71d0105bb27472e26e5f5e0c8ef3a71dfd':
  docs: Added release notes for Support Library 19.1.0
 2014-03-26 19:47:38 +00:00
Ricardo Cervera
19a67a71d0 Merge "docs: Added release notes for Support Library 19.1.0" into klp-ub-dev 2014-03-26 19:41:04 +00:00
Mark Salyzyn
aeb75fc5a3 jni: 64-bit compile issue 
- switch to PRId64
- some unused parameter warning suppression

Change-Id: Ia36bd1a247bb6e866a6b1050ab1362ebc9d31786
 2014-03-26 11:28:45 -07:00
Ricardo Cervera
5d005ba9a7 am 3d093ea6: am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit '3d093ea69a488e4afd982a59273f0bf8c3474b5a':
  docs: Added Android Studio build system doc.
 2014-03-26 18:23:10 +00:00
Ricardo Cervera
3d093ea69a am e59a2665: am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit 'e59a26650afbc664aeda08f7e69c2d135631c34d':
  docs: Added Android Studio build system doc.
 2014-03-26 18:16:35 +00:00
Ricardo Cervera
e59a26650a am 1b59f291: Merge "docs: Added Android Studio build system doc." into klp-docs 
* commit '1b59f291573deb4c1d6f60035637a3c49e671ab4':
  docs: Added Android Studio build system doc.
 2014-03-26 18:11:33 +00:00
Ricardo Cervera
1b59f29157 Merge "docs: Added Android Studio build system doc." into klp-docs 2014-03-26 18:06:51 +00:00
Nick Kralevich
32cc40a9b5 am fdd63510: am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit 'fdd6351067740f80148ff03c43d2ebc91f1d9656':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 15:55:41 +00:00
Nick Kralevich
fdd6351067 am 491eaf22: Merge "Note libselinux dependency on packages.list format changes." 
* commit '491eaf2255a95186e84092eae4ec43582eebb37b':
  Note libselinux dependency on packages.list format changes.
 2014-03-26 08:47:39 -07:00
Nick Kralevich
491eaf2255 Merge "Note libselinux dependency on packages.list format changes." 2014-03-26 15:41:14 +00:00
Stephen Smalley
e6e25554d3 Note libselinux dependency on packages.list format changes. 
Change-Id: I3c34a86f5706c4fca826a8634936131e4e4fc297
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
 2014-03-26 09:19:12 -04:00
Craig Mautner
16744ac3f7 am d1e32cd3: Merge "Defer removal of activity until animation complete." into klp-modular-dev 
* commit 'd1e32cd3207215e8bb63f18c6a5a4880b5344ef8':
  Defer removal of activity until animation complete.
 2014-03-26 00:26:03 +00:00
Craig Mautner
d1e32cd320 Merge "Defer removal of activity until animation complete." into klp-modular-dev 2014-03-26 00:21:56 +00:00
Scott Main
57be130352 am c3bcce59: am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'c3bcce5907553c6f006fc2c0ac74383f01647827':
  fix broken link
 2014-03-26 00:05:17 +00:00
Scott Main
c3bcce5907 am 01e68cab: am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit '01e68cabb523440382ef3a02a512f8ce3b8af287':
  fix broken link
 2014-03-25 23:58:10 +00:00
Scott Main
01e68cabb5 am ad52a4ce: Merge "fix broken link" into klp-docs 
* commit 'ad52a4ce9964508288316bfc5fb52833bf70b6a5':
  fix broken link
 2014-03-25 23:53:24 +00:00
Craig Mautner
79e6578b6c Defer removal of activity until animation complete. 
Do not remove an AppWindowToken or its Task if it is running an
animation. Doing so leaves windows orphaned and bad things happen
when the system tries to retrieve the task assoicated with the
windows during layout.

Fixes the ugly output associated with bug 13440426.

Change-Id: I9d5fc50a7cb6189160d51cee3c82f7813baee715
 2014-03-25 16:48:47 -07:00
Scott Main
ad52a4ce99 Merge "fix broken link" into klp-docs 2014-03-25 23:47:00 +00:00
Scott Main
a8c29e19e4 fix broken link 
Change-Id: If2f19d5c65372313860176808a3a0105f9fa118e
 2014-03-25 16:45:40 -07:00
Ricardo Cervera
3cd141c59f docs: Added Android Studio build system doc. 
Added a document explaning how to use the new build system
in Android Studio.

Change-Id: I45ae1902820c1aaaf4c5810ee683b4d7a5221f16
 2014-03-25 15:49:36 -07:00
Ricardo Cervera
287b5bb241 am 64906b52: am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '64906b52423a9829e7af9ff512fb18b0947f9920':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:08:12 +00:00
Ricardo Cervera
64906b5242 am 2564614c: am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '2564614c2ea1927b1bc26f6ac8a39e236c93e922':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 22:01:37 +00:00
Will Haldean Brown
f3f1c7a334 am 63d161e4: Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 
* commit '63d161e4ae57b61b33d77f4ea3c91279a6acb807':
  Remove all but two micro themes, light and dark.
 2014-03-25 21:47:06 +00:00
Will Haldean Brown
63d161e4ae Merge "Remove all but two micro themes, light and dark." into klp-modular-dev 2014-03-25 21:39:17 +00:00
Ricardo Cervera
2564614c2e am 39aed838: docs: Amend SDK release notes for 22.6.2 
* commit '39aed838f505314fe6f1947e39de79de2f84ba40':
  docs: Amend SDK release notes for 22.6.2
 2014-03-25 21:13:54 +00:00
Justin Koh
c635ef999b am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'ec5b6e8726a215ff912bbbf872b8bdf600a74e1e':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:13:53 +00:00
Justin Koh
ec5b6e8726 Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 2014-03-25 21:01:56 +00:00
Ricardo Cervera
39aed838f5 docs: Amend SDK release notes for 22.6.2 
Change-Id: I76e46ec5abf7e9f2203eeaef723d06597565d4c9
 2014-03-25 13:50:55 -07:00
Ricardo Cervera
917a83da70 am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '7133208a816dc3eedf9c45309112c05f7d9136e0':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:43:23 +00:00
Will Haldean Brown
61e0965678 Remove all but two micro themes, light and dark. 
Bug: 13434321
Change-Id: I201cb22e3fd7aa629f4d25004be6b4b9e05907a3
 2014-03-25 13:38:33 -07:00
Ricardo Cervera
7133208a81 am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '89a41db09a0a4935a111777e12c01a40765d20be':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:36:42 +00:00
Chris Craik
7e55b35a60 am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '4118480aabb4a7b332e289ebb71d2e4f9bc05d7e':
  Solve three memory leaks related to PatchCache
 2014-03-25 20:28:00 +00:00
Ricardo Cervera
89a41db09a am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '825280d2ac85cef7ec1f096b02006c26dba0374a':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:27:51 +00:00
Ricardo Cervera
825280d2ac Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 2014-03-25 20:22:59 +00:00
Chris Craik
4118480aab am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '80470cdf6c6995f4afe8d5e2c4b6e898625173fb':
  Solve three memory leaks related to PatchCache
 2014-03-25 13:21:01 -07:00
Justin Koh
f1596064d3 Add RobotoCondensed-Light to build. 
Add RobotoCondensed-Light to build so that apps don't all need to include their
own copy.
Bug: 13087110

Change-Id: I55973a4ba2a68858b79271519a0ecc9c54f6b31e
 2014-03-25 13:19:02 -07:00
Eino-Ville Talvala
63d61640d4 am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '55a1e78fbd38955a5f5d0f09a517b392cc8199cb':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:15:52 +00:00
Craig Mautner
c89283c586 am d0955068: am 74e19f57: am 6f955df8: am 550b44d1: am f4644189: am 4cf6286c: am 02c7ba73: am 41bb0637: am 76e85eec: am 3bc9971d: am 95d6e32b: am 86f9a93e: Merge "Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs" into jb-mr1-dev 
* commit 'd09550687360544f0659e37f393ba2f5b04b55a4':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 20:15:49 +00:00