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

86106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
4b0764eef2 Reconcile with jb-mr0-release - do not merge 
Change-Id: I41a4b710eb0846eaf276f21b75c8d9bb2f76c977
 2012-09-12 07:49:49 -07:00
The Android Open Source Project
2b2b53c713 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib11ce3b2ad34e79b32e10fff1a91eec6347ad774
 2012-09-12 07:40:36 -07:00
The Android Automerger
0240397263 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-09-12 06:59:45 -07:00
Jeff Sharkey
81eb7640b1 am 8b29d63d: Merge "Include user identifier in external storage paths." into jb-mr1-dev 
* commit '8b29d63d0857337057db707549ef1faed39792fd':
  Include user identifier in external storage paths.
 2012-09-11 23:38:16 -07:00
Jeff Sharkey
8b29d63d08 Merge "Include user identifier in external storage paths." into jb-mr1-dev 2012-09-11 23:36:50 -07:00
Jeff Sharkey
b049e212ab Include user identifier in external storage paths. 
When building external storage paths, always include user in path
to enable cross-user paths and aid debugging.

Each Zygote process continues to only have access to the appropriate
user-specific emulated storage through bind mounts. A second set of
mounts continue supporting legacy /sdcard-style paths. For example,
a process running as owner has these mount points:

/storage/emulated_legacy
/storage/emulated_legacy/Android/obb
/storage/emulated/0
/storage/emulated/obb

Since Environment is created before Zygote forks, we need to update
its internal paths after each process launches.

Bug: 7131382
Change-Id: I6f8c6971f2a8edfb415c14cb4ed05ff97e587a21
 2012-09-11 23:11:14 -07:00
Daniel Sandler
de3debd9f5 Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 22:20:12 -07:00
Daniel Sandler
40c6ae4d22 Single finger notification expansion. 
If you liked these changes...

  Change Ie4e79aa5
  Change I8a6f8606
  Change I824937e9
  Change I957b6d50

You'll love this one!

Change-Id: I5256366175fa7ebc965b1c5df02f10ba802ed977
 2012-09-11 22:19:50 -07:00
Daniel Sandler
2966351be2 am 8a0e1fef: am b8026996: (-s ours) am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit '8a0e1fefeeefac5024ff1ca1d044caa66b6c36a6':
  Fix notification gestures.
 2012-09-11 21:42:48 -07:00
Daniel Sandler
8a0e1fefee am b8026996: (-s ours) am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit 'b802699618ead6c91c862817744fbde72adb4b38':
  Fix notification gestures.
 2012-09-11 21:40:07 -07:00
Daniel Sandler
1bd6260235 am ec4c62bf: am 2da1e221: (-s ours) am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit 'ec4c62bfe51d5a035b4ce0e883d16a81547fd3ed':
  Single finger notification expansion.
 2012-09-11 21:40:00 -07:00
Daniel Sandler
ec4c62bfe5 am 2da1e221: (-s ours) am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit '2da1e2215fb22b5aa9a18c6c96f0d3a4f8b25574':
  Single finger notification expansion.
 2012-09-11 21:37:17 -07:00
Daniel Sandler
b802699618 am e445c258: Merge "Fix notification gestures." into jb-dev 
* commit 'e445c25877bac16ea4438057f37bc668315133cd':
  Fix notification gestures.
 2012-09-11 21:30:49 -07:00
Geremy Condra
c3ec0d01a6 Push event logging down into libcore.EventLogger 
This changes the default behavior of the EventLogger from logging
to the normal logs to logging to the event logs.

Change-Id: I4338a1605928b82246a369adb3514bd31cd552e8
 2012-09-11 21:29:06 -07:00
Daniel Sandler
2da1e2215f am a5e042f9: Merge "Single finger notification expansion." into jb-dev 
* commit 'a5e042f9232c26505968d8add60f3f84c6a87dae':
  Single finger notification expansion.
 2012-09-11 21:29:06 -07:00
Daniel Sandler
e445c25877 Merge "Fix notification gestures." into jb-dev 2012-09-11 21:19:23 -07:00
Daniel Sandler
a5e042f923 Merge "Single finger notification expansion." into jb-dev 2012-09-11 21:17:41 -07:00
Jeff Brown
81da4c7780 am c7b6ec7a: Merge "Improve reporting of wifi connection state." into jb-mr1-dev 
* commit 'c7b6ec7a7c8ee33278baddb0889d67042f38daef':
  Improve reporting of wifi connection state.
 2012-09-11 18:49:16 -07:00
Jeff Brown
c7b6ec7a7c Merge "Improve reporting of wifi connection state." into jb-mr1-dev 2012-09-11 18:47:37 -07:00
Daniel Sandler
c0229e29de Fix notification gestures. 
Broken by recent changes to ScaleGestureDetector, which we
were using incorrectly.

Change-Id: Ie5a7981cc14873d34de9041f59b5de442c948a61
 2012-09-11 21:46:39 -04:00
Svetoslav Ganov
e020020f21 am 5e900e3a: Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev 
* commit '5e900e3a17a87e91a0d190bc1c96efc440eb026a':
  Adding a scaling threshold in ScreenMagnifier
 2012-09-11 18:18:38 -07:00
Svetoslav Ganov
5e900e3a17 Merge "Adding a scaling threshold in ScreenMagnifier" into jb-mr1-dev 2012-09-11 18:16:14 -07:00
Svetoslav Ganov
3e1476a697 Adding a scaling threshold in ScreenMagnifier 
Change-Id: I1fdd7c93de571a61d88d7386c5c2a423a6b83fb9
 2012-09-11 18:15:17 -07:00
Jean-Baptiste Queru
cdb22217cf am d057e73e: am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit 'd057e73e7ea9ea665686b0e61d4af7d006f8278d':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 18:06:20 -07:00
Jean-Baptiste Queru
d057e73e7e am c095eb04: (-s ours) am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit 'c095eb04fa931c1d838fc4505089502ecc9eba62':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 18:03:43 -07:00
Jean-Baptiste Queru
c095eb04fa am 70a5967e: am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit '70a5967e0bb295f64c99593043f138fdd62365f4':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 17:59:14 -07:00
Jean-Baptiste Queru
70a5967e0b am 5c09d605: Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 
* commit '5c09d605678d64e05579bb668b615764a714f1f7':
  Fix CacheBitmap crash issue when using H/W UI rendering
 2012-09-11 17:57:19 -07:00
Svetoslav Ganov
0d6e17b468 am b1ee5886: Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev 
* commit 'b1ee58860280e2dfad63170495393a914ab34804':
  Refactoring the scale and pan detection in the ScreenMagnifier.
 2012-09-11 17:53:56 -07:00
Svetoslav Ganov
b1ee588602 Merge "Refactoring the scale and pan detection in the ScreenMagnifier." into jb-mr1-dev 2012-09-11 17:50:53 -07:00
Svetoslav Ganov
d420e3ac94 Refactoring the scale and pan detection in the ScreenMagnifier. 
Change-Id: I8560f53f88ef0c9244e2b48d40119574cacb544f
 2012-09-11 17:48:28 -07:00
Jean-Baptiste Queru
5c09d60567 Merge "Fix CacheBitmap crash issue when using H/W UI rendering" 2012-09-11 17:48:09 -07:00
Romain Guy
0c5e2cfd1c am 0585744a: Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev 
* commit '0585744a2d9402f4197d2a9fdb162058f1492c32':
  Discard framebuffer commands when we redraw the entire buffer
 2012-09-11 17:35:15 -07:00
Romain Guy
0585744a2d Merge "Discard framebuffer commands when we redraw the entire buffer" into jb-mr1-dev 2012-09-11 17:32:05 -07:00
Romain Guy
45e4c3df6c Discard framebuffer commands when we redraw the entire buffer 
Change-Id: I32e3014832cbd3bdbace8c3d2206eb20a2002d64
 2012-09-11 17:30:43 -07:00
Winson Chung
4bd63054bb am 709c542b: Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev 
* commit '709c542b6758d2e40ed15ab8aa2a2dc0e52a342d':
  Fixing crash in emulator due to missing bluetooth.
 2012-09-11 17:13:28 -07:00
Winson Chung
709c542b67 Merge "Fixing crash in emulator due to missing bluetooth." into jb-mr1-dev 2012-09-11 17:10:43 -07:00
Winson Chung
6072b00b62 Fixing crash in emulator due to missing bluetooth. 
Change-Id: I0f652198cc759fac44f0de1729fcb52f515071a3
 2012-09-11 17:10:32 -07:00
Jeff Brown
f8f0eddd07 Improve reporting of wifi connection state. 
We should only report that the wifi display is connected
after the RTSP connection has been fully established.

Change-Id: Ifc6bc5d5cebd42d551026885b31cbc74b7ece2b1
 2012-09-11 17:05:11 -07:00
Geremy Condra
a913e70f81 Added event logging for config installation failures. 
This just logs the directory the data is being written to, which
will tell us whether we've pushed a bad update and are about to
start wedging devices.

Change-Id: Iaaef6d41b2ab18bcce295c583ee13f49e337ed65
 2012-09-11 17:02:48 -07:00
Benoit Goby
d5e190312d am 73e0d75c: Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev 
* commit '73e0d75c9d3869a39635e55461349b3f5dd75604':
  UsbDebuggingActivity: Strings update after review
 2012-09-11 16:17:58 -07:00
Benoit Goby
73e0d75c9d Merge "UsbDebuggingActivity: Strings update after review" into jb-mr1-dev 2012-09-11 16:14:47 -07:00
Amith Yamasani
ac3ef9dbe1 am 9c673b05: Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev 
* commit '9c673b0536f0c19be289e15fe0e5fb9825769a3f':
  Go back to keyguard if user is switched in lock screen
 2012-09-11 16:13:38 -07:00
Amith Yamasani
9c673b0536 Merge "Go back to keyguard if user is switched in lock screen" into jb-mr1-dev 2012-09-11 16:12:16 -07:00
Benoit Goby
45f6aaa558 UsbDebuggingActivity: Strings update after review 
Bug: 7056209
Change-Id: I447b021973332414e5e57a3b7066bf25dfccb628
 2012-09-11 16:10:35 -07:00
Svetoslav Ganov
2b5c5b640d am 0bb4d078: Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 
* commit '0bb4d078afeadf4996240d0ac41514c28e5f795a':
  Screen magnifier should handle window rebuilds correctly.
 2012-09-11 15:54:41 -07:00
Amith Yamasani
d979dd7fbc Go back to keyguard if user is switched in lock screen 
This is not the preferred solution, but at least it is not incorrect.

Bug: 7144478
Change-Id: Iec26723b21ff5c64546d57f9d8744a3bf2929862
 2012-09-11 15:53:37 -07:00
Svetoslav Ganov
0bb4d078af Merge "Screen magnifier should handle window rebuilds correctly." into jb-mr1-dev 2012-09-11 15:52:33 -07:00
Svetoslav Ganov
9b4125e435 Screen magnifier should handle window rebuilds correctly. 
1. The way for computing the magnified region was simplistic and
   incorrect. It was ignoring window layering resulting in broken
   behavior. For example, if the IME is up, then the everything else
   is magnifed and the IME not. Now the keyguard appears and covers
   the IME but the magnified region does not expand while it would
   since the keyguard completely covers the not magnified IME window.

bug:7138937

Change-Id: I21414635aefab700ce75d40f3e913c1472cba202
 2012-09-11 15:50:58 -07:00
Geremy Condra
c023c434aa Create intermediate directories when installing config data. 
This prevents an issue where a user factory data resets and
hoses the default directory layout- it will now be recreated
on first update.

Change-Id: I7e3cb47a0fa3aa941a74d46fba7e15865484b66d
 2012-09-11 15:46:56 -07:00
Irfan Sheriff
8a2cf2ca3d am 85cf4a15: Merge "Disable suspend optimizations during DHCP" into jb-mr1-dev 
* commit '85cf4a15197391c99720c85951655ef19c3cd157':
  Disable suspend optimizations during DHCP
 2012-09-11 15:46:28 -07:00