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

95293 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
c7dc250d5a am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:17:08 -08:00
Danielle Millett
ae54cd6e3d am 2f4be247: am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev 
* commit '2f4be247b647cdbe433ff35d30aa54b131e6bd2a':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
 2012-11-07 11:17:04 -08:00
Adam Cohen
e5785461b7 am 441d3401: am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev 
* commit '441d3401bfd9b30a82b7104eeb644d39ccf44a93':
  Making sure the sticky widget logic works with music
 2012-11-07 11:17:01 -08:00
Adam Cohen
d50f206a08 am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit 'a7af02098a0192b36e98c5ab809fd0f6eae9ce21':
  Attempted fix for issue 7469415
 2012-11-07 11:16:57 -08:00
Amith Yamasani
9862ac9c69 am 22559dc5: am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit '22559dc5bffc159e171b2ca81414416a59c0f54d':
 2012-11-07 11:16:52 -08:00
Chris Wren
66425daffc am 950f947c: am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev 
* commit '950f947cea6890799ccd4e45e7cb2cf8b2283fcf':
  make challengeShowing sticky across bounce.
 2012-11-07 11:16:49 -08:00
Chris Wren
ac20bfe178 am 98f95b3a: am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev 
* commit '98f95b3af1ce00bc02ae18d76ee9aab278f57e04':
  specify start value: Drawables don't have getAlpha(). also, some clean up.
 2012-11-07 11:16:42 -08:00
Jim Miller
259e3121d3 am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '51117262c8fadb6d227d137e83ad66996b013141':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-07 11:14:14 -08:00
Romain Guy
96f6491aa7 am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '475255bffc792b48e18213a6bfde0fc9ebeb4a34':
 2012-11-07 11:14:11 -08:00
Eino-Ville Talvala
f83ace0b4b am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '688d98fe2185774322aa87dffd656fad471823ef':
 2012-11-07 11:14:07 -08:00
Adam Powell
de565f3bcb am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev 
* commit '7136544c06c2d10c7a1c6aa8715d2b717221aee8':
  Keyguard - MultiPaneChallengeLayout measurement/layout changes
 2012-11-07 11:14:04 -08:00
Victoria Lease
b000c36207 am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '8d803258ca1550583d03c1a24c5c6d4b38535ba8':
 2012-11-07 11:14:01 -08:00
Chris Wren
888322a659 am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev 
* commit '5fcca70d280a789002f540ea04b9d7ae5d7fe324':
  animating challenge closed should close the challenge.
 2012-11-07 11:13:57 -08:00
Winson Chung
43ecd1912c am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions. 
* commit '6cf53bb3a94ec5a6eebc96a315dac32d042f1945':
  Using screen dimensions to calculate the expanded PagedView dimensions.
 2012-11-07 11:13:52 -08:00
Jim Miller
fe7e94a094 am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:13:48 -08:00
Danielle Millett
2f4be247b6 am 2d9fae2b: Merge "Removing callbacks in onDetachedFromWindow, fixes b/7465673" into jb-mr1-lockscreen-dev 
* commit '2d9fae2bcfbc8021873a39b3935644e9b9fb5af2':
  Removing callbacks in onDetachedFromWindow, fixes b/7465673
 2012-11-07 11:13:43 -08:00
Adam Cohen
441d3401bf am 7741e620: Merge "Making sure the sticky widget logic works with music" into jb-mr1-lockscreen-dev 
* commit '7741e6209ab4c6425ee4156631f54fe9bfce5fc3':
  Making sure the sticky widget logic works with music
 2012-11-07 11:13:37 -08:00
Adam Cohen
a7af02098a am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415
 2012-11-07 11:13:34 -08:00
Amith Yamasani
22559dc5bf am 5eac4d85: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit '5eac4d852bdc62964acd1c8805b6e9cd8301f262':
 2012-11-07 11:13:31 -08:00
Chris Wren
950f947cea am 9f79d0db: Merge "make challengeShowing sticky across bounce." into jb-mr1-lockscreen-dev 
* commit '9f79d0db09818e94b6c2089f952d1ef42e1e1fae':
  make challengeShowing sticky across bounce.
 2012-11-07 11:13:27 -08:00
Chris Wren
98f95b3af1 am f7e47a00: Merge "specify start value: Drawables don\'t have getAlpha(). also, some clean up." into jb-mr1-lockscreen-dev 
* commit 'f7e47a003ada4b225dcafe722ab0de35a846b58a':
  specify start value: Drawables don't have getAlpha(). also, some clean up.
 2012-11-07 11:13:24 -08:00
Elliott Hughes
9197d170b7 am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
  It's 2012. We're always WITH_JIT.
 2012-11-07 10:48:26 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
The Android Open Source Project
a4d8f80468 am a8540f2a: Reconcile with jb-mr1-release - do not merge 
* commit 'a8540f2ae3b75e41192c49472959d141122dc5f9':
 2012-11-07 10:22:19 -08:00
The Android Open Source Project
a8540f2ae3 Reconcile with jb-mr1-release - do not merge 
Change-Id: I3d0120226503d1aa5538039f17811e01131d99c8
 2012-11-07 10:19:51 -08:00
Elliott Hughes
fec5f611fe Merge "It's 2012. We're always WITH_JIT." 2012-11-07 09:57:16 -08:00
Roman Nurik
7a00ac7cb7 am a93f94d3: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit 'a93f94d32cf3780cd8e4ff4edae90dbc27ed7fb8':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-07 09:55:38 -08:00
Roman Nurik
a93f94d32c am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit '512950a9713f79f2900c73201906436d12da8639':
  docs: Minor Nexus 10 fix in Device Art Generator
 2012-11-07 09:52:36 -08:00
Roman Nurik
512950a971 Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 2012-11-07 09:49:37 -08:00
Baligh Uddin
b7135adf72 Merge "Import translations. DO NOT MERGE" 2012-11-07 09:49:12 -08:00
Baligh Uddin
d98e6dc680 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:44:54 -08:00
Baligh Uddin
f6a4a04cad Merge "Import translations. DO NOT MERGE" 2012-11-07 09:41:08 -08:00
Baligh Uddin
20040dafbc Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:38:43 -08:00
The Android Automerger
80d1781731 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 18:04:04 -08:00
Svetoslav Ganov
dc564945bb am 7ccb2806: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit '7ccb280611f885850f1ff8168fc7a4505b92789d':
  Make partially visible widget pages not important for accessibility.
 2012-11-06 17:51:53 -08:00
Svetoslav Ganov
7ccb280611 am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit '5fff5f01f8af05164d5d7be72bdadee46360ba92':
  Make partially visible widget pages not important for accessibility.
 2012-11-06 17:49:15 -08:00
Svetoslav Ganov
5fff5f01f8 Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 2012-11-06 17:46:44 -08:00
Irfan Sheriff
f264e8e34e am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '567a2919f3ad66dcb972e45411d18a4515d9f0b1':
  Stop supplicant and dhcp before start
 2012-11-06 17:43:05 -08:00
Irfan Sheriff
567a2919f3 Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 2012-11-06 17:39:46 -08:00
Sascha Prueter
a517fc3a39 am ee8fab8b: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit 'ee8fab8be5806381904e1fec4ed0123ca39e2b4f':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:17:51 -08:00
Elliott Hughes
be8b47f6ce It's 2012. We're always WITH_JIT. 
Change-Id: Ia3d1a1b1df06816f2cfa3879ec669b34c62cf9b9
 2012-11-06 17:16:21 -08:00
Sascha Prueter
ee8fab8be5 am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit '872965bb22ba74a06b755547883c5d0de62bb956':
  Use a consistent policy for filtering wake keys.
 2012-11-06 17:14:59 -08:00
Sascha Prueter
872965bb22 Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 2012-11-06 17:11:26 -08:00
Jim Miller
51117262c8 Handle DevicePolicyManagement and safe mode when inflating widgets 
Bug 7459120
Bug 7444159
Bug 7444016

Change-Id: I7966ec510da8113ac571b5a4b9dc48dd291396e8
Conflicts:
	policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
 2012-11-06 17:04:26 -08:00
Doris Liu
de05b93a1e Merge "Adding width and height into screenshot metadata" 2012-11-06 16:57:17 -08:00
Jeff Brown
1c2e4948a1 Use a consistent policy for filtering wake keys. 
Previously wake keys were filtered differently depending on whether
a keyguard was showing.  If the user disables the keyguard then
no filtering was applied, which means that the volume key may
wake your device while in your pocket.

This change ensures that we use the same policy consistently
regardless of whether keyguard is showing.  The behavior is
otherwise the same.

Removed the "Locked" suffix on a method that was actually
being called without a lock held and which in fact does not
require it.

Bug: 7481025
Change-Id: I704c71ca009bc5437f349f858b9de7c77ea73e4b
 2012-11-06 16:48:15 -08:00
Doris Liu
5aa011b18a Adding width and height into screenshot metadata 
Bug: 7486020
Change-Id: I375cf9f1065bd1c75558d5f986e7e483cfd4a404
 2012-11-06 16:29:46 -08:00
Craig Mautner
184b2c1ed1 Merge "Layout windows that are about to animate." 2012-11-06 16:22:50 -08:00
Romain Guy
b37e5d756f am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '7b9b41c18d0dc9d238111fa1865c72e4a5bb22cc':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:21:05 -08:00
Romain Guy
7b9b41c18d am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '1b3b2544e647a40094b9c9df2c94e34df7921da5':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-06 16:18:23 -08:00