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

85580 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Baligh Uddin
095b54fc1d Import translations. DO NOT MERGE 
Change-Id: Iba715653d9716ae6da378f3852b7f9ccf2c3781a
Auto-generated-cl: translation import
 2012-09-10 10:46:20 -07:00
Geremy Condra
aaa8b0d50a Merge "Add components for the Android Config Updater to system server." 2012-09-08 17:51:16 -07:00
Geremy Condra
1d4e1204ca Add components for the Android Config Updater to system server. 
This adds the necessary bits to verify and install configuration
updates using system server. It also includes the cert pinning
updater as the first user.

Change-Id: I42307f58074157b33b6e01216aab10022340d449
 2012-09-07 16:50:11 -07:00
Amith Yamasani
4cf0548452 am 5fc62663: Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 
* commit '5fc626639aa7ff2aed224b58891149e19fb24b57':
  Resolve the correct home intent for secondary users
 2012-09-07 15:31:37 -07:00
Chris Craik
0d11ac12a2 am dc531fa7: Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 
* commit 'dc531fa7d4ec545ace1b3daae0849d3101102e49':
  Handle different x, y scales in drawLines AA path
 2012-09-07 15:29:59 -07:00
Amith Yamasani
5fc626639a Merge "Resolve the correct home intent for secondary users" into jb-mr1-dev 2012-09-07 15:28:09 -07:00
The Android Open Source Project
100e36f2c2 am 330a5bf8: am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '330a5bf82e60fca9591f14a4db5ee98066c610d1':
  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-07 15:27:06 -07:00
Chris Craik
dc531fa7d4 Merge "Handle different x, y scales in drawLines AA path" into jb-mr1-dev 2012-09-07 15:27:05 -07:00
The Android Open Source Project
330a5bf82e am 2ff43774: (-s ours) Reconcile with jb-mr0-release - do not merge 
* commit '2ff437745ec1e3463d4e7b831bf2b173aa38dad4':
  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-07 15:24:05 -07:00
The Android Open Source Project
2ff437745e Reconcile with jb-mr0-release - do not merge 
Change-Id: I1e3c8a0ea72c31ae91cdbd6453c32d8c6901a29a
 2012-09-07 15:21:16 -07:00
Chris Craik
75040f8a77 Handle different x, y scales in drawLines AA path 
bug:7114630

Fixes different x, y scales, and fixes boundaryWidthProportion to be from
center, not edge.

Also adds drawLine tests that previously drew blurry.

Change-Id: I2b648a60361ad3931eac67647b9b27909525ee1e
 2012-09-07 15:20:38 -07:00
Raph Levien
3b43678ca7 am 965e7ff4: Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 
* commit '965e7ff4de117a9681b04e84573cb5924efdd6d9':
  Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE
 2012-09-07 15:11:01 -07:00
Raph Levien
965e7ff4de Merge "Fix Time.parse and Time.parse3339 crashing bugs. DO NOT MERGE" into jb-mr1-dev 2012-09-07 15:08:42 -07:00
Christopher Tate
20779a1ace am d6a53c31: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 
* commit 'd6a53c3156fbfa63c88fad536cfac126eea6718d':
  Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace
 2012-09-07 15:05:53 -07:00
Amith Yamasani
259d5e56a8 Resolve the correct home intent for secondary users 
Fix some searches through the Activity stack.

This allows SetupWizard to be launched for the second user.

Change-Id: Icd306319f511c902557bd9985d80dda228e32d96
 2012-09-07 15:04:36 -07:00
The Android Open Source Project
07cdbadc17 Reconcile with jb-mr1-release - do not merge 
Change-Id: I78543f98dd668123d26915177c2c65ed01b9d2be
 2012-09-07 15:03:50 -07:00
Christopher Tate
d6a53c3156 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace" into jb-mr1-dev 2012-09-07 15:02:38 -07:00
Christopher Tate
62df6eb508 Refer to STAY_ON_WHILE_PLUGGED_IN via the Global namespace 
It moved from System to Global, so writes are not automatically redirected
to the new namespace (else apps would start crashing).

Bug 7126575

Change-Id: Ief31fcb5a6107a098da04d30d146e16921dee776
 2012-09-07 15:00:54 -07:00
Eric Laurent
bf20314a8a am 7c026320: Merge "AudioSystem: new audio device enums" into jb-mr1-dev 
* commit '7c0263204384cfa58183b9badcaccdac88efdf72':
  AudioSystem: new audio device enums
 2012-09-07 14:56:48 -07:00
Eric Laurent
7c02632043 Merge "AudioSystem: new audio device enums" into jb-mr1-dev 2012-09-07 14:53:29 -07:00
Chet Haase
39b72a7aae am 89b3f48f: Merge "Enable changing properties of layer paint" into jb-mr1-dev 
* commit '89b3f48fa3ccaf9a05628f0e540c1f94716809f7':
  Enable changing properties of layer paint
 2012-09-07 14:46:43 -07:00
Chet Haase
89b3f48fa3 Merge "Enable changing properties of layer paint" into jb-mr1-dev 2012-09-07 14:44:43 -07:00
Ben Murdoch
040887f12a Merge "Proxy View.dispatchDraw through WebViewProvider." 2012-09-07 14:31:15 -07:00
Ben Murdoch
e623e24484 Proxy View.dispatchDraw through WebViewProvider. 
Provide a no-op implementation in WebViewClassic.

Change-Id: I44e64c261fb8b4387cb53f0625300c3527ba2e40
 2012-09-07 22:26:32 +01:00
Christopher Tate
f1c675bccd am c0be8c85: Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 
* commit 'c0be8c85b09002359adb1fb20f2bf08e6983d146':
  Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace
 2012-09-07 14:25:24 -07:00
Christopher Tate
c0be8c85b0 Merge "Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace" into jb-mr1-dev 2012-09-07 14:22:59 -07:00
Christopher Tate
ad73532041 Refer to STAY_ON_WHILE_PLUGGED_IN in the global namespace 
This is the one relevant setting that moved from System to Global,
a move that we do not automatically redirect on writes.

Change-Id: I7b26d0c364695c4a10a7cd477db3dfcfe89d7ef5
 2012-09-07 14:19:43 -07:00