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

85782 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Sams
8342162287 am 49801ecb: am cd664f0f: Merge "Add greyscale intrinsic test." into jb-mr1-dev 
* commit '49801ecb542531e0e83bfc4ded22a9f47f910d7c':
  Add greyscale intrinsic test.
 2012-09-10 17:08:15 -07:00
Jason Sams
bfd09308cf am c2f8f102: am 3f7bbe8c: Merge "Document ColorMatrix intrinsic and add helpers" into jb-mr1-dev 
* commit 'c2f8f102e1b7a38adc0fc835e532a7cfbee2cf04':
  Document ColorMatrix intrinsic and add helpers
 2012-09-10 17:08:09 -07:00
Amith Yamasani
f0d067ba44 am 4cf05484: am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 
* commit '4cf0548452493cabbb7f7c09ab3ecb2ebe77ff8e':
  Resolve the correct home intent for secondary users
 2012-09-10 17:07:59 -07:00
Chris Craik
2fcf554891 am 0d11ac12: am dc531fa7: Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 
* commit '0d11ac12a238379e0a9c24a3b522035997f40d4f':
  Handle different x, y scales in drawLines AA path
 2012-09-10 17:07:55 -07:00
The Android Open Source Project
bb999845cc am 100e36f2: (-s ours) am 330a5bf8: am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '100e36f2c21ed3028a09e6635c21d4b1627b5865':
  DO NOT MERGE - Make WebView track focal points more accurately
  DO NOT MERGE - Delay starting scale gesture events until a touch slop threshold
 2012-09-10 17:07:51 -07:00
Raph Levien
9aa6922ba5 am 3b43678c: (-s ours) am 965e7ff4: Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 
* commit '3b43678ca727b2a9c39662c6266d194e50c9bdc6':
  Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
 2012-09-10 17:07:34 -07:00
Christopher Tate
e6de051799 am 20779a1a: am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 
* commit '20779a1ace8322064575f03d10598650ba91181c':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
 2012-09-10 17:07:28 -07:00
The Android Open Source Project
193ae1077a am 07cdbadc: (-s ours) Reconcile with jb-mr1-release - do not merge 
* commit '07cdbadc17f3bc85ecda7797291ce79dd22c9792':
  Convert resized() method to new parameters.
  Don't depend on LockPatternUtils to get DevicePolicyManager
  Fix issue #7097984 java.lang.SecurityException: Permission Denial:
  Work around instability of Display.getRotation().
  GestureDetector - Mask action when checking POINTER_UP
  Turn off deadzone flash, replacing it with logcat.
  Fixed MemoryUsage issue with reporting results.
  Use focal point for scrolling in GestureDetector
  Fix keyguard layout on tablet
  Check proximity detector before powering off.
  Fix PendingIntent caching for multiuser
  Fix adb install
 2012-09-10 17:07:21 -07:00
Eric Laurent
585c19c79b am bf20314a: am 7c026320: Merge "AudioSystem: new audio device enums" into jb-mr1-dev 
* commit 'bf20314a8af8e4288b3d3ad6dc9313e0914f8955':
  AudioSystem: new audio device enums
 2012-09-10 17:07:04 -07:00
Chet Haase
be6665a933 am 39b72a7a: am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev 
* commit '39b72a7aaef1f7a5b7e43a6d0fe5a619b303fe66':
  Enable changing properties of layer paint
 2012-09-10 17:06:53 -07:00
Christopher Tate
bb8234b85b am f1c675bc: am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 
* commit 'f1c675bccd4efccb5acb982602943befa85ed660':
  Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
 2012-09-10 17:06:39 -07:00
Dianne Hackborn
3f6f96b526 am 00b7d2a0: am 649d0d71: Merge "More multi-user stuff:" into jb-mr1-dev 
* commit '00b7d2a0de5d235f7eab721d4369bf93af512351':
  More multi-user stuff:
 2012-09-10 17:06:32 -07:00
Romain Guy
310558876c am f9dd3811: am 55e6b77b: Merge "Reduce the number of locks acquired by display lists" into jb-mr1-dev 
* commit 'f9dd3811a3e6712fd88d3af064bd53100b0e6d15':
  Reduce the number of locks acquired by display lists
 2012-09-10 17:06:21 -07:00
Dianne Hackborn
dd164115a0 am 15f91d91: am 417984dc: Merge "Wrapped call to notifyAll() in a synchronized block" into jb-mr1-dev 
* commit '15f91d9151aa9c2090c4c410310ddac2b0616d25':
  Wrapped call to notifyAll() in a synchronized block
 2012-09-10 17:06:13 -07:00
Adam Koch
ff9d7b770a am 173166a2: am 14c62518: am aa98d509: am 6525f7bf: Merge "Updates to "Displaying Bitmaps Efficiently" class. Changes: -Updated code sample (see http://ag/214812) -Updated code snippets to match updated sample -Fixed <> in code snippets -Updated disk cache section 
* commit '173166a23080fd6ad8e7eb566fd38977bb5f6d18':
  Updates to "Displaying Bitmaps Efficiently" class. Changes:  -Updated code sample (see http://ag/214812)  -Updated code snippets to match updated sample  -Fixed <> in code snippets  -Updated disk cache section  -Some other minor updates
 2012-09-10 17:06:07 -07:00
Christopher Tate
06e6fb78ec am 041aa46a: am 970683c5: Merge "Further fixup of migration to global settings" into jb-mr1-dev 
* commit '041aa46a851f9e6d4e80b98f0c9cbe2ec89faec7':
  Further fixup of migration to global settings
 2012-09-10 17:06:00 -07:00
Teng-Hui Zhu
607caa925c am f6cc1ddc: am 4db5d23d: Merge "Back key to dismiss full screen video" into jb-mr1-dev 
* commit 'f6cc1ddc35d30a7314201011353840bd0aa8935b':
  Back key to dismiss full screen video
 2012-09-10 17:05:48 -07:00
Fabrice Di Meglio
5733c2c174 am 8bcf577a: am d672d29d: Merge "Update documentation for layout direction qualifiers for Resouces" into jb-mr1-dev 
* commit '8bcf577aa095d7f1e14c33ac5e6cf39f904bdfdd':
  Update documentation for layout direction qualifiers for Resouces
 2012-09-10 17:05:42 -07:00
Fabrice Di Meglio
b52d4e627d am 778d7508: am bae1d478: Merge "Fix the build" into jb-mr1-dev 
* commit '778d7508df2edacd2f9eac3df51979542cc5177b':
  Fix the build
 2012-09-10 17:05:35 -07:00
Katie McCormick
1264670e70 am 2eb318e6: am 56b62939: am 21d8331d: am ae050d56: Merge "Doc update: Appwidgets JB additions." into jb-dev 
* commit '2eb318e6c4e8a9d80585306311a05c472ca08d3d':
  Doc update: Appwidgets JB additions.
 2012-09-10 17:05:23 -07:00
Dirk Dougherty
c6bb211f45 am 1e118476: am 7629a917: am 0152a51c: am 882b267d: Merge "Doc change: fix typo in JB highlights." into jb-dev 
* commit '1e1184761a0f92de8517390b2e514f53c30062c2':
  Doc change: fix typo in JB highlights.
 2012-09-10 17:05:13 -07:00
Svetoslav Ganov
8d3d852243 am eef5dc63: am 390a06b8: Merge "Restore accessibility focus after ListView layout." into jb-mr1-dev 
* commit 'eef5dc63d805f39eb0c68c93980a7ae728db3f7f':
  Restore accessibility focus after ListView layout.
 2012-09-10 17:05:06 -07:00
Romain Guy
d9d1721812 am 45aef365: am 6543c292: Merge "The drawables cache strikes again Bug #7117785" into jb-mr1-dev 
* commit '45aef365f6087e6cca6fce480e6230a9eb35aa6e':
  The drawables cache strikes again Bug #7117785
 2012-09-10 17:05:02 -07:00
Fabrice Di Meglio
24d9c9c9b3 am 8060ee1f: am f6aa537c: Merge "Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction" into jb-mr1-dev 
* commit '8060ee1f11a504da82ebe6ac63a3e741c023837c':
  Make ProgressBar / SeekBar / RatingBar widgets aware of layout direction
 2012-09-10 17:04:58 -07:00
Fabrice Di Meglio
113fce81d8 am c94106d7: am 01fcb728: Merge "Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources" into jb-mr1-dev 
* commit 'c94106d7c9b3bfe5591a1433440cb19d73a9fb5d':
  Use "ldrtl" and "ldltr" config qualifiers for RTL / LTR resources
 2012-09-10 17:04:53 -07:00
John Spurlock
658c77cc32 am 2323ec7e: Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev 
* commit '2323ec7ee1fb614950f2f6891514964d07fd0bd4':
  Notifications: Hide ticker updates from background users.
 2012-09-10 11:09:21 -07:00
John Spurlock
2323ec7ee1 Merge "Notifications: Hide ticker updates from background users." into jb-mr1-dev 2012-09-10 11:07:21 -07:00
Svetoslav Ganov
a422003007 am 7e8f6c4c: Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev 
* commit '7e8f6c4cef8d65c5b470fc8700214e28d8cd4d43':
  Improve scaling vs pan in screen magnifier.
 2012-09-10 10:56:41 -07:00
Svetoslav Ganov
7e8f6c4cef Merge "Improve scaling vs pan in screen magnifier." into jb-mr1-dev 2012-09-10 10:54:26 -07:00
Svetoslav Ganov
0c381504a8 Improve scaling vs pan in screen magnifier. 
1. Due to frequent changes of the behavior of ScaleGestureDetector
   this patch rolls in a gesture detector used for changing the
   screen magnification level. It has an improved algorithm which
   uses the diameter of min circle around the points as the span, the
   center of this circle as the focal point, and the average slop
   of the lines from each pointer to the center to determine the
   angle of the diameter used when computing the span x and y.

Change-Id: I5cee8dba84032a0702016b8f9632f78139024bbe
 2012-09-10 10:49:04 -07:00
Baligh Uddin
095b54fc1d Import translations. DO NOT MERGE 
Change-Id: Iba715653d9716ae6da378f3852b7f9ccf2c3781a
Auto-generated-cl: translation import
 2012-09-10 10:46:20 -07:00
Amith Yamasani
9b4d051784 am 3c1a2011: Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev 
* commit '3c1a20118739fd6765e128c5d9c39c01d22a89e7':
  Fix DevicePolicyManager crash when settings password quality (and possibly others).
 2012-09-10 10:29:48 -07:00
Amith Yamasani
3c1a201187 Merge "Fix DevicePolicyManager crash when settings password quality (and possibly others)." into jb-mr1-dev 2012-09-10 10:27:13 -07:00
Amith Yamasani
b7a685978f Fix DevicePolicyManager crash when settings password quality (and possibly others). 
Bug: 7130570

Clear the calling identity before broadcasting to all users.

Change-Id: Ibe84af1ee00aecfe4b2d5bb7731a952f617b4885
 2012-09-10 10:24:36 -07:00
John Spurlock
61e36836b7 Notifications: Hide ticker updates from background users. 
We should only update the notification ticker area when
the notification is for the current user.

Bug:6924835
Change-Id: Ieaccbd8c972b3d0f62c74d29d42e0fa77ec3148c
 2012-09-10 09:43:27 -04:00
Wu-cheng Li
774f1fca6f am 753e1280: Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 
* commit '753e1280cbc3f0006b04f67385f02e1f92019f7d':
  Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE.
 2012-09-10 00:51:20 -07:00
Wu-cheng Li
753e1280cb Merge "Unhide INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE." into jb-mr1-dev 2012-09-10 00:48:26 -07:00
Irfan Sheriff
649f27a808 am 799553e0: Merge "Fix device list update" into jb-mr1-dev 
* commit '799553e02aa3350397d723982d42198a5bab774c':
  Fix device list update
 2012-09-10 00:38:17 -07:00
Irfan Sheriff
799553e02a Merge "Fix device list update" into jb-mr1-dev 2012-09-10 00:36:17 -07:00
Irfan Sheriff
e298d88458 Fix device list update 
Change-Id: I6a57d90f3750590db4ac5d538956b989d9589501
 2012-09-10 00:34:26 -07:00
Wu-cheng Li
d70703c135 am 41bd89f6: Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev 
* commit '41bd89f6b61296492d3775e5ef30e94c5f18d34f':
  Pass EXCLUDE_FROM_RECENTS when starting secure camera.
 2012-09-09 23:43:40 -07:00
Wu-cheng Li
41bd89f6b6 Merge "Pass EXCLUDE_FROM_RECENTS when starting secure camera." into jb-mr1-dev 2012-09-09 23:39:36 -07:00
Dianne Hackborn
aaf7fdbf89 am 01a7c79d: Merge "Various fixes." into jb-mr1-dev 
* commit '01a7c79dda60c572af0db5820a66680d0faf95cf':
  Various fixes.
 2012-09-09 18:22:19 -07:00
Dianne Hackborn
01a7c79dda Merge "Various fixes." into jb-mr1-dev 2012-09-09 18:19:50 -07:00
Dianne Hackborn
2d1b378191 Various fixes. 
Bug #7132226: Can't start instrumentation due to ActivityManagerService crash
Bug #6912004: tap on gmail notification sends me to home screen

Change-Id: I824128b01f368de95dee288f8e49039b84479a7e
 2012-09-09 18:14:32 -07:00
Jeff Brown
125fce7066 am 3e6d426d: Merge "Handle case where user info might not be available." into jb-mr1-dev 
* commit '3e6d426d8d28e172af6b62c7b9e4b70c25c5facb':
  Handle case where user info might not be available.
 2012-09-09 17:33:49 -07:00
Jeff Brown
3e6d426d8d Merge "Handle case where user info might not be available." into jb-mr1-dev 2012-09-09 17:31:01 -07:00
Jeff Brown
7a8cce3d8a Handle case where user info might not be available. 
The CursorLoader can return a null cursor if the query
failed for some reason.  This may happen in certain states
where the provider is not available.

Bug: 7133411
Change-Id: Id7b383bca45a61bc8726ba9f6115cbbc07e5d0b4
 2012-09-09 17:26:50 -07:00
Irfan Sheriff
e7d87ac0c5 am ab603ace: Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev 
* commit 'ab603ace22c9f0fe256616697ebfa4ef2928985b':
  Update WifiP2pWfdDevInfo from device found event
 2012-09-09 17:17:45 -07:00
Irfan Sheriff
ab603ace22 Merge "Update WifiP2pWfdDevInfo from device found event" into jb-mr1-dev 2012-09-09 17:16:35 -07:00