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

122637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
0932eb35ec am 8028e4a0: am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '8028e4a063b49aadfb08fab012d2388a7466a9a1':
  docs: fix some notification code for wear stacks
 2014-05-10 02:53:28 +00:00
Robert Ly
8028e4a063 am 1f14c107: am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '1f14c107f825a9a309b396f65fbfc92a4c57eb3d':
  docs: fix some notification code for wear stacks
 2014-05-10 02:48:57 +00:00
Robert Ly
1f14c107f8 am 0689fad8: Merge "docs: fix some notification code for wear stacks" into klp-docs 
* commit '0689fad8cc51e136c9c4401ef40f0a8c0abf3ea9':
  docs: fix some notification code for wear stacks
 2014-05-10 02:43:52 +00:00
Robert Ly
0689fad8cc Merge "docs: fix some notification code for wear stacks" into klp-docs 2014-05-10 02:40:40 +00:00
Robert Ly
37cb8d7530 docs: fix some notification code for wear stacks 
Change-Id: Iea6b444480b161ab08a9ba02dbabb22773862cf0
 2014-05-09 17:01:21 -07:00
Chris Craik
90eaf92e32 am 7e13d1d4: am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" 
* commit '7e13d1d4a46a01ebaa412d622ef76d90bd39d12a':
  Correct stride for drawing to cached glyph bitmap
 2014-05-09 21:51:49 +00:00
Chris Craik
7e13d1d4a4 am f6c9c420: Merge "Correct stride for drawing to cached glyph bitmap" 
* commit 'f6c9c4204c2f8f86277d081112c9dd863ddaa778':
  Correct stride for drawing to cached glyph bitmap
 2014-05-09 21:46:43 +00:00
Chris Craik
f6c9c4204c Merge "Correct stride for drawing to cached glyph bitmap" 2014-05-09 21:39:55 +00:00
Andrew Solovay
99aa0c17d2 am 5119f6e6: am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '5119f6e6db1cd7254ee71537a56bd133eb7e6a09':
  doc: Documented how to set notification priority.
 2014-05-09 21:15:10 +00:00
Andrew Solovay
5119f6e6db am 3f22f22a: am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit '3f22f22aab7d641b9d56e57a2ceec6614e09a5d8':
  doc: Documented how to set notification priority.
 2014-05-09 21:10:28 +00:00
Andrew Solovay
3f22f22aab am bff632c8: Merge "doc: Documented how to set notification priority." into klp-docs 
* commit 'bff632c8ff3e1f889093fcb070e86ffb19fce0ef':
  doc: Documented how to set notification priority.
 2014-05-09 21:05:06 +00:00
Andrew Solovay
bff632c8ff Merge "doc: Documented how to set notification priority." into klp-docs 2014-05-09 21:01:08 +00:00
Vinod Krishnan
88aa8aab3d am c4ebd014: Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev 
* commit 'c4ebd014cec31a2d5a18c2339681ca71bd1f5d0e':
  Adding a margin for the AlertDialog to work on circular UI.
 2014-05-09 18:09:53 +00:00
Vinod Krishnan
c4ebd014ce Merge "Adding a margin for the AlertDialog to work on circular UI." into klp-modular-dev 2014-05-09 18:05:10 +00:00
Vinod Krishnan
119ba2c72d Adding a margin for the AlertDialog to work on circular UI. 
- also removing the background completely for sdk >= 20

Change-Id: I239c8d066bb7ed0d1ab852a4d162475948b8a0d5
 2014-05-09 11:03:20 -07:00
Brian Carlstrom
09d1189668 am edc31509: am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything" 
* commit 'edc31509c2ff8cba86f30c836934d32a3e249dec':
  If PackageUsage information is missing, treat as first boot and compile everything
 2014-05-09 17:38:10 +00:00
Brian Carlstrom
edc31509c2 am b98ca5b0: Merge "If PackageUsage information is missing, treat as first boot and compile everything" 
* commit 'b98ca5b0dd73f374178022b4a4b37412f01a3c03':
  If PackageUsage information is missing, treat as first boot and compile everything
 2014-05-09 17:33:04 +00:00
Brian Carlstrom
b98ca5b0dd Merge "If PackageUsage information is missing, treat as first boot and compile everything" 2014-05-09 17:29:06 +00:00
Brian Carlstrom
7c5c864c8a If PackageUsage information is missing, treat as first boot and compile everything 
Bug: 14663243
Change-Id: I0ae33882044211f777590f482e17e87596be4463
 2014-05-09 09:52:09 -07:00
Mikhail Naganov
a08771edfa am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'fa75ff626ca48db1007105fa5fd72d83c81c56e2':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:19:12 +00:00
Mikhail Naganov
fa75ff626c am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit 'b76bc8e06e456715a36edd92cb4ea5437d5306e4':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:14:16 +00:00
Mikhail Naganov
b76bc8e06e am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass 
* commit '6940b664093c7e66708b125957a2879e027e8cfa':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
 2014-05-09 16:08:58 +00:00
Eino-Ville Talvala
8bfb3513ee am 1caeb10a: DO NOT MERGE: Add android.hardware.camera.external feature. 
* commit '1caeb10a7a288d937195d925c52f441f454cbc9a':
  DO NOT MERGE: Add android.hardware.camera.external feature.
 2014-05-09 15:47:58 +00:00
Digish Pandya
b9312a54e4 Correct stride for drawing to cached glyph bitmap 
fixes the glyph cachebuffer index to account for pixelbuffer
format size.

issue: in launcher home screen create icon group and rename the
group to some text string with emo-icons (smilies). without this
change the drop shadows for emo-icons will look bad.

Change-Id: I525a9219d35f4541363fd64e7fc5fd1053269725
Signed-off-by: Digish Pandya <digishp@codeaurora.org>
 2014-05-09 15:05:16 +05:30
Andrew Solovay
3701cbef0f doc: Documented how to set notification priority. 
This is related to change http://ag/459520, where I added info about appropriate
priority constants for setPriority(int)

Doc is staged to:

http://asolovay.mtv:8998/guide/topics/ui/notifiers/notifications.html#Priority

Bug: 13514649
Change-Id: I792e2f02614c88fbcfe1b0714a9c10da27eb6c37
 2014-05-08 17:58:30 -07:00
Eino-Ville Talvala
1caeb10a7a DO NOT MERGE: Add android.hardware.camera.external feature. 
This feature will be listed by Android devices that allow for an
external camera to be connected to it. Such camera devices may
not always be available or connected.

Also clarify that android.hardware.camera.any also encompasses
devices that list android.hardware.camera.external.

Change-Id: I57497758877e4286c1f0116961731d483b56808f
 2014-05-08 21:47:36 +00:00
Chris Wren
2dc97d48b9 am 90abb78b: am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '90abb78b51a35055f86dee35c4e391e74f325125':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:08:24 +00:00
Chris Wren
90abb78b51 am 678f7edd: Merge "Avoid SystemUI crash due to NPE" 
* commit '678f7edd140f3914655bc600d207d3dcb986f881':
  Avoid SystemUI crash due to NPE
 2014-05-08 21:03:04 +00:00
Chris Wren
678f7edd14 Merge "Avoid SystemUI crash due to NPE" 2014-05-08 21:00:21 +00:00
Baligh Uddin
33c08e2986 am 825bfb4f: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '825bfb4f7e9b87bf49a76d9fb43623da1df0df19':
  Import translations. DO NOT MERGE
 2014-05-08 14:43:50 +00:00
Baligh Uddin
825bfb4f7e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-08 14:37:50 +00:00
Mikhail Naganov
6940b66409 Add EventLog event for logging of attempts to call java.lang.Object.getClass 
Bug: 13694467
Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39
 2014-05-08 10:10:24 +01:00
Ying Wang
db55bb0622 am 4463cbc6: am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '4463cbc61d0947eccb67a52f60661a92d0cad508':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:27:09 +00:00
Ying Wang
4463cbc61d am 3b9600b6: Merge "Remove unused LOCAL_LDLIBS." 
* commit '3b9600b673ad6a83481dcf88db6c9b2dc5bc9ba3':
  Remove unused LOCAL_LDLIBS.
 2014-05-08 00:21:38 +00:00
Ying Wang
3b9600b673 Merge "Remove unused LOCAL_LDLIBS." 2014-05-08 00:15:14 +00:00
Mindy Pereira
101e379318 am 07763e30: Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 
* commit '07763e305404bce16df500e1a65493d2f2b7d0c9':
  Make distance count when dismissing swipedismisslayout
 2014-05-07 23:42:00 +00:00
repo sync
90cfa00112 resolved conflicts for merge of 5ae1c4f7 to klp-modular-dev-plus-aosp 
Change-Id: I4e1448af91c158e4b5a25577b9b392773d7d3bfc
 2014-05-07 16:34:51 -07:00
Mindy Pereira
07763e3054 Merge "Make distance count when dismissing swipedismisslayout" into klp-modular-dev 2014-05-07 22:46:02 +00:00
Ying Wang
b38e3fdf5a Remove unused LOCAL_LDLIBS. 
Change-Id: I01346e76f4ac6402af0ef33e3b2eef4a69e704a2
 2014-05-07 15:23:37 -07:00
Vinod Krishnan
03498d349a am b9d71fa1: Merge "Adding a HeartRate Feature" into klp-modular-dev 
* commit 'b9d71fa1081dc318a811b60660009d0769c02971':
  Adding a HeartRate Feature
 2014-05-07 21:46:45 +00:00
Dmitry Grinberg
5ae1c4f708 Merge "DO NOT MERGE: change preloaded classes" into klp-modular-dev 2014-05-07 21:39:44 +00:00
Baligh Uddin
8152ee5e83 Import translations. DO NOT MERGE 
Change-Id: I17154078eaa160864a641882dee6d7d49c56ff31
Auto-generated-cl: translation import
 2014-05-07 13:38:21 -07:00
Vinod Krishnan
b9d71fa108 Merge "Adding a HeartRate Feature" into klp-modular-dev 2014-05-07 20:33:12 +00:00
Brian Carlstrom
0b5598c924 am 691079dd: am a21ba5be: Merge "Add BackgroundDexOptService" 
* commit '691079ddc0055fac9b82dccaf35b4591978b2a55':
  Add BackgroundDexOptService
 2014-05-07 20:28:25 +00:00
Brian Carlstrom
3bbef521d4 resolved conflicts for merge of f2db00fd to klp-modular-dev-plus-aosp 
Change-Id: I745164033962f6222832f8f19fa316a2e2634fd0
 2014-05-07 13:20:23 -07:00
Jim Miller
424edf064f am cc6b9eb2: am 92ddac04: Merge "Fix can\'t change airplane mode from GlobalActions." 
* commit 'cc6b9eb23c3a6168d6cb5cb10977c43ebdcbbea4':
  Fix can't change airplane mode from GlobalActions.
 2014-05-07 19:44:28 +00:00
Mindy Pereira
072c6033fd Make distance count when dismissing swipedismisslayout 
verify the user's gesture took up at least 40% of the screen
before dismissing
Part of b/14319825 Cliff guard against accidental card dismissals

Works in conjunction with GridViewPager change:
https://googleplex-android-review.git.corp.google.com/#/c/461036/
Change-Id: Id8ff02d0a2d727b54c9950ad14ddef7a110f4eef
 2014-05-07 10:06:55 -07:00
Guang Zhu
1e8a87dd3c am f31d73c9: Merge "send accessibility events on view property invalidation" into klp-modular-dev 
* commit 'f31d73c9859a4124e5d4e618f4b147f55f693ef6':
  send accessibility events on view property invalidation
 2014-05-07 12:43:59 +00:00
Guang Zhu
f31d73c985 Merge "send accessibility events on view property invalidation" into klp-modular-dev 2014-05-07 07:38:59 +00:00
Brian Carlstrom
691079ddc0 am a21ba5be: Merge "Add BackgroundDexOptService" 
* commit 'a21ba5bec748e2f10d7e6d38181ec1124991cb60':
  Add BackgroundDexOptService
 2014-05-07 03:33:41 +00:00