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

126460 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Koh
9a8afb1c3a am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'd89929db3e010eaa68d8f7c8227f95cdd4fb5179':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:36:39 +00:00
Ricardo Cervera
1f88794f41 am 805f3fae: am 917a83da: am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '805f3fae25677d04d71470948d1ad855d5d6d9eb':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 21:23:57 +00:00
Chris Craik
e08f166955 am 72cf99ab: am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '72cf99abdb6648f9346b72e0ef6d4da3c4dc9d17':
  Solve three memory leaks related to PatchCache
 2014-03-25 21:23:52 +00:00
Eino-Ville Talvala
42004973cd am 1559e0b6: (-s ours) am 63d61640: am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '1559e0b6a76e089cddc56708ccb177b0d37cc1ba':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 21:23:44 +00:00
Craig Mautner
c9ef91a72f am f07788b9: am c89283c5: 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 'f07788b997e31578da202525ac72d4eec6fe4176':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 21:23:41 +00:00
Scott Main
9a07a66ba9 am 1adb8947: am 1cf8117a: am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '1adb8947dae240a11d96450971b3b84d745339c3':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 21:23:32 +00:00
Craig Mautner
578899571b am ac21f995: am 4f61f6d4: am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit 'ac21f995e8982c1dd83ba9f6313cf1481f4faf5e':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 21:23:29 +00:00
Kenny Root
6ab41d71eb am 266de3ef: am dd3e6399: am c1d863e7: am 77ceb5e8: Merge "Use X509ExtendedTrustManager and not Conscrypt" 
* commit '266de3efcd4b57ba3b301d87ff0fb692090d9a95':
  Use X509ExtendedTrustManager and not Conscrypt
 2014-03-25 21:23:18 +00:00
Craig Mautner
4abb86c05d am 732d5aaa: am 12b575bd: am 9bbd2f97: (-s ours) am 2cacc619: Merge "Don\'t wait for finishing animation when second display is disconnected" 
* commit '732d5aaa3bf50c06f3a7f306221613f4625610f3':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 21:23:15 +00:00
Baligh Uddin
561ffd248f am fe74cdcc: (-s ours) am 0a4bd7c9: (-s ours) am f3183062: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'fe74cdcc60fd2d3151e3ded9dbaf52cc14a2d918':
  Import translations. DO NOT MERGE
 2014-03-25 21:22:44 +00:00
Craig Mautner
62143f2f17 am 1df9bc5c: am d7bf82d6: am f32b22e9: resolved conflicts for merge of ca903d38 to klp-modular-dev 
* commit '1df9bc5c1d47a09b08d49287d81832e18674bece':
  Move task to top in window manager.
 2014-03-25 21:21:45 +00:00
Adam Lesinski
2471abec78 am e77786d5: am 99d60784: am 415e6f8e: Merge "Fix issue with early service start" into klp-modular-dev 
* commit 'e77786d51f574ca7bbb45df136f92fc7c7d06ffe':
  Fix issue with early service start
 2014-03-25 21:21:21 +00:00
Baligh Uddin
0deb8ad6b2 am fbb3ae6c: (-s ours) am cdd07216: (-s ours) am 27f67d25: (-s ours) am 29526cca: (-s ours) am 89078012: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'fbb3ae6ca69b3c2ee490fdf4471207627d7eafa7':
  Import translations. DO NOT MERGE
 2014-03-25 21:21:18 +00:00
Narayan Kamath
a0eeb5e172 am 2c595209: am 163b8655: am ea96d791: am 5f0d44f6: Merge "Fix scaleNinePatch." 
* commit '2c595209f99103be6572bafe4ad7faf52f81bbcb':
  Fix scaleNinePatch.
 2014-03-25 21:20:21 +00:00
Scott Main
86a01f7c56 am f71eebdb: am 686f041e: am 77dc3c00: am 27fa561f: am 52f449fd: fix size and behavior of video thumbnail when flash not available 
* commit 'f71eebdb22a251538a81c1fce8d5bf80ce5d7619':
  fix size and behavior of video thumbnail when flash not available
 2014-03-25 21:20:06 +00:00
Justin Koh
d89929db3e am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'c635ef999bae6d48654a9a6b442b6d5d42ff38dd':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:20:01 +00:00
Ricardo Cervera
ba8169ac46 am ba6bbb01: am addeab5c: am bd48af2c: am cd64a9ba: am 399b9994: docs: Added release notes for Google APIs System Image v4. 
* commit 'ba6bbb01d4f8b60c3c124797700122b717a2a5c4':
  docs: Added release notes for Google APIs System Image v4.
 2014-03-25 21:19:53 +00:00
Matthew Williams
0826bcc95d am 2c672973: (-s ours) am 4bcf922a: am c798e4f5: am 4701b51a: am bb87ac7f: DO NOT MERGE: Downgrade expedited to normal on reschedule. 
* commit '2c6729735290140959a7102afea3320d257d1f42':
  DO NOT MERGE: Downgrade expedited to normal on reschedule.
 2014-03-25 21:19:49 +00:00
Scott Main
33f1338fbc am b8a79fce: am 941eabc2: am e9b50e75: am 9d8184e7: am 779174ea: update wear homepage with layout fixes and replace GIFs with smaller versions 
* commit 'b8a79fcef37dba36733dc25064b40f706a13fc7a':
  update wear homepage with layout fixes and replace GIFs with smaller versions
 2014-03-25 21:19:42 +00:00
Selim Cinek
92a87e3026 am 50cd7c39: am f7805dd7: am 7290b56b: am 8ae8689d: am c41853ce: Fixed wallpaper bug where wrong size was taken when cropping 
* commit '50cd7c39bb9f62d443a62d1f4af7f6ebc107f217':
  Fixed wallpaper bug where wrong size was taken when cropping
 2014-03-25 21:18:45 +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
Gabriel Peal
f53d1a0197 Merge "resolved conflicts for merge of c1edfc2c to master" 2014-03-25 20:59:05 +00:00
Zhijun He
aaad0047a6 Merge "Camera2: Add partial flash state" 2014-03-25 20:54:55 +00:00
Gabriel Peal
68fe6e7f0e resolved conflicts for merge of c1edfc2c to master 
Change-Id: I95d690e5f0895c1dbfd911f345703f0f562be447
 2014-03-25 13:49:51 -07:00
Zhijun He
8dda7273db Camera2: Add partial flash state 
Bug 13637334

Change-Id: Ife5d943851f3f47d33b05d7450765dd273eb1036
 2014-03-25 13:49:30 -07:00
Adam Lesinski
7f3b7116b7 Merge "Shared library resource support" 2014-03-25 20:49:08 +00:00
Ricardo Cervera
805f3fae25 am 917a83da: am 7133208a: am 89a41db0: am 825280d2: Merge "docs: Added release notes for Android SDK 22.6.2" into klp-docs 
* commit '917a83da70d7007abfb3edd85b07a1f8a058af9b':
  docs: Added release notes for Android SDK 22.6.2
 2014-03-25 20:49:05 +00: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
Gabriel Peal
db0dca826d resolved conflicts for merge of c1edfc2c to master 
attempt 2

Change-Id: Ic9e6e9e02c4781617deeea3ddcb4a0b2b659e4fc
 2014-03-25 13:39:55 -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
72cf99abdb am 7e55b35a: am 4118480a: am 80470cdf: Merge "Solve three memory leaks related to PatchCache" 
* commit '7e55b35a603fe64e8db2c6050a1b778baaccd920':
  Solve three memory leaks related to PatchCache
 2014-03-25 20:36:15 +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
Eino-Ville Talvala
1559e0b6a7 am 63d61640: am 55a1e78f: am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '63d61640d41b85b32ca7287235ca638731555b63':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:21:33 +00:00
Craig Mautner
f07788b997 am c89283c5: 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 'c89283c5863855fadd8853e524e36e19aaaf142a':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 20:21:30 +00:00
Scott Main
1adb8947da am 1cf8117a: am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '1cf8117aa22c5ef16c5513fd1c6d428233df4833':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 20:21:27 +00:00
Craig Mautner
ac21f995e8 am 4f61f6d4: am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit '4f61f6d4bbd24fe1802d8aa81e1c32e57fbbbd78':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 20:21:24 +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
Scott Main
1cf8117aa2 am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit 'dc18ce783fa10466d15ec74be38d38555c4750c6':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 20:15:46 +00:00
Craig Mautner
4f61f6d4bb am e187441b: Merge commit \'703169a3\' into manualmerge 
* commit 'e187441b9b9b760a21da7c80b49c61f85eaec8e4':
  Don't wait for finishing animation when second display is disconnected
 2014-03-25 20:15:43 +00:00
Chris Craik
80470cdf6c Merge "Solve three memory leaks related to PatchCache" 2014-03-25 20:11:33 +00:00
Eino-Ville Talvala
55a1e78fbd am 1555cec2: am ecad0541: Merge "DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values" into klp-dev 
* commit '1555cec2e5452c6d4583dfd3deffbb28ebd886fe':
  DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
 2014-03-25 20:11:12 +00:00
Craig Mautner
d095506873 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 '74e19f572a598ce907661ed2f5127319f8d7c635':
  Allow FLAG_SHOW_WHEN_LOCKED to apply to dialogs
 2014-03-25 20:11:08 +00:00
Scott Main
dc18ce783f am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843 
* commit '78373edb8d5838276c73a418b07f735ad20286dc':
  fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
 2014-03-25 20:11:03 +00:00
Craig Mautner
e187441b9b Merge commit '703169a3' into manualmerge 2014-03-25 13:08:01 -07:00