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

92392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jim Miller
9d0d796f47 Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev 2012-11-06 19:05:43 -08:00
Adam Cohen
42164efac3 Merge "Ensuring bindAppWidget isn't called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev 2012-11-06 19:04:55 -08:00
Adam Cohen
efb3ffb029 Ensuring bindAppWidget isn't called until boot completed (issue 7469267) 
Change-Id: I997f5a191116db7c840bf4a947385958b57cd657
 2012-11-06 19:03:29 -08:00
Michael Jurka
835579e817 Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 2012-11-06 19:01:51 -08:00
Michael Jurka
76017cad4f Removing sticky widgets in lockscreen 
Also adding mechanism to show a widget after
adding it

Change-Id: Ic4d49e6ef1343c38fa731b0ed2a327c55b678abf
 2012-11-06 18:56:41 -08:00
Jim Miller
0928e019ce Fix emergency call area updates. 
This fixes a bug where the emergency call button doesn't reflect the current
state.

Fixes bug 7482869

Change-Id: I7de2100f10a078943cb92c13d638c72e99c7a643
 2012-11-06 18:43:22 -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
ad9f594e1c 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:02 -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
bc69698c8f 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:35 -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
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
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
Romain Guy
475255bffc 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:19 -08:00
Romain Guy
1b3b2544e6 Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 2012-11-06 16:15:27 -08:00
Eino-Ville Talvala
9671e6e116 am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit 'e980adfd7085e99e57722e5576798c0ccdfb3f20':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:13:42 -08:00
Eino-Ville Talvala
e980adfd70 am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:10:55 -08:00
Eino-Ville Talvala
688d98fe21 am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '4a1b6e42424d08da0d22a24464e568034ea557ee':
  Camera: Document new video snapshot picture size behavior.
 2012-11-06 16:10:52 -08:00
Eino-Ville Talvala
4a1b6e4242 Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 2012-11-06 16:06:01 -08:00
Romain Guy
d1cc1878cc Dismiss error icon on setError(null) [regression] 
Bug #7442935

Change-Id: I783d868173637007be326e20795cbb4cb8c7b899
 2012-11-06 16:03:37 -08:00
Romain Guy
a1ca6d39f9 am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1 am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:55:22 -08:00
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start 
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
 2012-11-06 15:53:32 -08:00
Adam Powell
7136544c06 Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev 2012-11-06 15:50:12 -08:00
Adam Powell
9d34f9db81 Keyguard - MultiPaneChallengeLayout measurement/layout changes 
Have the widget view and the user switcher stay fixed when IME insets
are applied. This keeps more stability in the layouts as the IME comes
and goes.

Change-Id: I5ac62c3da6ec618280f89e87993837b3e4941ec9
 2012-11-06 15:38:28 -08:00
Adam Powell
b5f27ddb3e am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'dd1dd60770dccf83bba3e4abab2221f2bb7f1e1d':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 15:30:49 -08:00
Svetoslav Ganov
a90a18db91 Make partially visible widget pages not important for accessibility. 
1. If the lockscreen has more than one widet, the left and right widget
   pages are partially on the screen and visible. Therefore they may
   take accessibility focus so the user will hear a prompt that he is
   on the partially visible widget page but will not be able to interact
   with it - confusing. This change makes partially shown windget frames
   not important for accessibility.

bug:7454355

Change-Id: I475b21e215474a4421acaec485cde64dc4e2aee5
 2012-11-06 15:22:16 -08:00
Jean-Baptiste Queru
ecf372213d Merge eead9274 
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
 2012-11-06 15:16:09 -08:00
Victoria Lease
66f3d7f3c8 am 446ffe00: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit '446ffe00cd402e18c041fb36c4d0d03429186224':
  Fires geofence if the device is already in the geofence area.
 2012-11-06 15:12:44 -08:00
Robert Greenwalt
08db1ceba2 am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit 'bbe5cafeebbbd08516909a3d9d12d5d319cba345':
  Add Coin graphic to premium-sms dialog.
 2012-11-06 15:11:04 -08:00
Victoria Lease
8d803258ca am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit 'e6299d5af702dd17eb3585dbe84d29c289bfa8da':
  Fires geofence if the device is already in the geofence area.
 2012-11-06 15:09:38 -08:00
Victoria Lease
446ffe00cd am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit 'e6299d5af702dd17eb3585dbe84d29c289bfa8da':
  Fires geofence if the device is already in the geofence area.
 2012-11-06 15:09:37 -08:00
Chris Wren
5fcca70d28 Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev 2012-11-06 15:08:41 -08:00
Robert Greenwalt
bbe5cafeeb Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 2012-11-06 15:07:35 -08:00
Winson Chung
6cf53bb3a9 Using screen dimensions to calculate the expanded PagedView dimensions. 
- Disallowing taps/interaction outside of the viewport (Bug 7459448)
- Fixing regression in incorrect pivot for Camera page
- Fixing issue where the bouncer was both scaling and shrinking widget pages.

Change-Id: Iefee62061962625b622ff2cf9a307d9429c2ad54
 2012-11-06 15:07:14 -08:00
Victoria Lease
e6299d5af7 Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 2012-11-06 15:06:16 -08:00
Chris Wren
da8f622b90 animating challenge closed should close the challenge. 
Bug: 7486591
Change-Id: Ie19a3765c63b885539a621467c2fdc81041578a7
Proto:Id: Iedf69f2f4e97f313af0228954a75f5a494b33c88
 2012-11-06 18:02:57 -05:00
Baligh Uddin
f5525b9967 Import translations. DO NOT MERGE 
Change-Id: Ic647d879dc7392501863f4531f048b17faa1fd07
Auto-generated-cl: translation import
 2012-11-06 14:29:53 -08:00
Baligh Uddin
cd086f1162 Import translations. DO NOT MERGE 
Change-Id: I37daca17d62112249577b66dde31621f041eff62
Auto-generated-cl: translation import
 2012-11-06 14:27:46 -08:00
Jim Miller
088fb915f7 Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 2012-11-06 14:21:12 -08:00
Baligh Uddin
e5f4562ff7 Import translations. DO NOT MERGE 
Change-Id: I76ae2d0dfa8538ffd649c69ed2aaa7128a29e2ea
Auto-generated-cl: translation import
 2012-11-06 14:06:25 -08:00