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

87778 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Irfan Sheriff
511d5346ce Stop supplicant and dhcp before start 
Bug: 7227463
Change-Id: Iaa0df7522edc38d25fae2bbda8d24490e997e733
 2012-11-06 15:53:32 -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
Robert Greenwalt
bbe5cafeeb Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 2012-11-06 15:07:35 -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
The Android Open Source Project
f3456803fe Reconcile with jb-mr1-release - do not merge 
Change-Id: I6206907ad603bf70ca2c9ca3b9afc136fe2a1695
 2012-11-06 13:26:48 -08:00
The Android Automerger
f0de33bef1 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-06 13:13:34 -08:00
Amith Yamasani
717797db3e am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'f763b71756d4d810e78e368fbcd56ff8a844f62c':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-06 12:58:39 -08:00
Amith Yamasani
f763b71756 Merge "Authenticate correct user's account when pattern fails multiple times." into jb-mr1-dev 2012-11-06 12:56:17 -08:00
John Spurlock
b93031e0a6 am 65cbcbea: Remove add widget transition jank (insecure). 
* commit '65cbcbea8a88a14dd9a001d23d09f0a02b0b3805':
  Remove add widget transition jank (insecure).
 2012-11-06 12:44:28 -08:00
John Spurlock
8aa623628c am ae73c690: Fix regression in camera transition. 
* commit 'ae73c6908ffd3c450d56a4fde95513cfff19d8a2':
  Fix regression in camera transition.
 2012-11-06 12:44:21 -08:00
Michael Jurka
3eaa876cf3 am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '08924d007f2323b6fb57c858732d32b1083da639':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:44:18 -08:00
Jim Miller
be2ca79abf am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit '7dfc588a9db81a797b881aab41ac8951bebb033d':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-06 12:44:15 -08:00
Jim Miller
8eb3048acc am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '87d0366d9e41a0fb1e20cc021ba391ed92fab385':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-06 12:44:07 -08:00
Svetoslav Ganov
e97c6faadb am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'bb8abae507119612b4168b951354516b0bf7112d':
 2012-11-06 12:44:03 -08:00
Mike Cleron
f154c9bdf8 am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit '624ea44120dcf8e7305bbb54072417f189855187':
 2012-11-06 12:44:00 -08:00
Romain Guy
a8e1d11963 am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit '06da33787620b20f59db8ae8df2b3414fa724fc2':
 2012-11-06 12:43:55 -08:00
Winson Chung
6d47e9fc86 am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660) 
* commit '48275d2de99ff2556031929c48f295d3f93447b6':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-06 12:43:52 -08:00
Adam Powell
d811f27f77 am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit '9ff6d4f8db8d3d7a6f22afa726685feb47694fbe':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 12:43:49 -08:00
Adam Cohen
4e8a47e01c am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 
* commit '79e0f875002d7bde5cf71053f9e9f054e9b5ffa2':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 12:43:46 -08:00
Baligh Uddin
0ca353fbd3 am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit 'af0d09be288214e01a4cc661a8173bb11c453061':
 2012-11-06 12:43:42 -08:00
Adam Powell
58bbc5f788 am 5da6430f: Optimize keyguard/IME interactions 
* commit '5da6430fff7812e58ee7e9a05c62d72c36f366c8':
  Optimize keyguard/IME interactions
 2012-11-06 12:43:39 -08:00
Joe Malin
cc2a14a8ce am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'ff91b179d37f5ab1e3cdcd179ee5799220b51ba8':
 2012-11-06 12:43:36 -08:00
The Android Open Source Project
55e7bdc772 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e
 2012-11-06 12:17:05 -08:00
Robert Greenwalt
a72b3aa034 Add Coin graphic to premium-sms dialog. 
bug:7205024
bug:7180681
Change-Id: Iece09d89598aefc5fd879587c65e5b179569e8e5
 2012-11-06 10:53:15 -08:00
Victoria Lease
4cd0a50b26 Fires geofence if the device is already in the geofence area. 
Process the location of the fence as soon as it is added.

Clarified how the distance to the fence was being used.

Added more debug logs (disabled by default).

Fixed a numerical overflow in the location request if the
distance to the border of the nearest fence was greater
than about 2000Km.

Removed a useless call to request location updates passively
when the geofence manager is initialized.  We have no need
of location updates unless there are active geofences.
The effect of this call was undone the next time the location
request was updated anyhow.

Changed the location request to always request a fastest update
interval of 0 which accomplishes the goal of passively
monitoring all updates.  This does not increase the power
consumption because we are conservative about choosing
a minimum location update interval.  We're simply stating
that the geofence manager is willing to handle a higher
report rate which is very important.

Subject location to a "freshness test" - only use relatively
recent locations for geofence testing.

Run all geofence updates on the handler and avoid making
multiple redundant calls into the location manager when
updating the provider requirements.

Ensure that we update geofences correctly even if we don't
know the initial location of the device at the time the
geofence is created.

Pin update interval value to the range [1m..2hr].

Distance to fence is now distance to fence's border, not
distance to fence's centre.

Bug: 7466334
Change-Id: I28e571ecfc508d5ceb9bb2afcabaaf05abb26369
 2012-11-06 10:01:33 -08:00
John Spurlock
65cbcbea8a Remove add widget transition jank (insecure). 
Refactor to use common activity launcher.

Still work to do on secure.

Bug:7482560
Change-Id: I2f8869afe8172850e1cb019a051aaeb49bb8c5bc
 2012-11-06 11:41:29 -05:00
John Spurlock
ae73c6908f Fix regression in camera transition. 
Caused by: Ic18188a2a3caa9dfde8785611242b1c9925f7b87
  "Adding bouncer animation on PagedView."

Bug:7483566
Change-Id: Ie0b4e7cf3d4dc717cac02c7cf8a1ec24b9b860a6
 2012-11-06 09:48:03 -05:00
Michael Jurka
08924d007f Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 2012-11-05 23:06:40 -08:00
Jim Miller
7dfc588a9d Workaround for layout bug in SIM PIN/PUK views 
This prevents a degenerate layout while we figure out what's
going on.

Change-Id: I99d1c6e5ce59fd48a74258158208270b775c1511
 2012-11-05 22:45:35 -08:00
Jim Miller
87d0366d9e Fix NPE caused by applications that try to hide keyguard while it's not showing 
Fixes bug 7466360

Change-Id: Idec4c60c2ca2477e49e0f4526ae2357353d4a1e3
 2012-11-05 20:28:09 -08:00
Michael Jurka
0a75b94872 Supporting EXTRA_APPWIDGET_OPTIONS correctly 2012-11-05 18:57:10 -08:00
The Android Automerger
469f6212b3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:53 -08:00
Amith Yamasani
2c7bc26a74 Authenticate correct user's account when pattern fails multiple times. 
Bug: 7473142

Provide hidden methods in AccountManager for querying accounts and
authenticating for a specific user. Lockscreen is running in the
system process. Allow only system process to access accounts across
users.

Also make sure to launch the lock settings screen on the just reset
user using startActivityAsUser()

Change-Id: Ifefc0039ba2b51396b8bd0268f36d5271a3d8676
 2012-11-05 18:17:40 -08:00
Svetoslav Ganov
bb8abae507 am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit '0f4d5df5d815466398dba5f2d07aa98f18c35aaa':
  View's visibility to the user not checking predecessor alpha.
 2012-11-05 17:05:50 -08:00
Mike Cleron
624ea44120 am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8':
  TextView not respecting "speak passwords" setting when adding before text to events.
 2012-11-05 17:05:47 -08:00
Svetoslav Ganov
0f4d5df5d8 Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev 2012-11-05 17:03:37 -08:00
Mike Cleron
c87f198b8c Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 2012-11-05 17:03:06 -08:00
Romain Guy
06da337876 am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit '6c642089bcd13bf17d7c445b2ec89b62a79c9823':
  Add programmatic access to setters in TextClock Bug #7478328
 2012-11-05 16:39:37 -08:00
Romain Guy
6c642089bc Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 2012-11-05 16:36:39 -08:00
Winson Chung
48275d2de9 Adding bouncer animation on PagedView. (Bug 7459660) 
- Adding Remove text for translations.

Change-Id: Ic18188a2a3caa9dfde8785611242b1c9925f7b87
 2012-11-05 16:15:34 -08:00
Adam Powell
9ff6d4f8db Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 2012-11-05 15:52:43 -08:00