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

89704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
d98e6dc680 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:44:54 -08:00
Baligh Uddin
20040dafbc Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:38:43 -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
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
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
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
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
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
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
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
Baligh Uddin
cd086f1162 Import translations. DO NOT MERGE 
Change-Id: I37daca17d62112249577b66dde31621f041eff62
Auto-generated-cl: translation import
 2012-11-06 14:27:46 -08:00
Baligh Uddin
bc3a2b9f65 Import translations. DO NOT MERGE 
Change-Id: I45d540fce163bd0eb6e2edbb6358a1aa6f50193b
Auto-generated-cl: translation import
 2012-11-06 13:57:58 -08:00
The Android Open Source Project
927372aec3 am f3456803: Reconcile with jb-mr1-release - do not merge 
* commit 'f3456803fed4ff529dea53fd9bc338887886acf9':
 2012-11-06 13:29:21 -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
Justin Koh
41048d670d Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 2012-11-06 13:22:26 -08:00
Justin Koh
58e0fb9adb Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 2012-11-06 13:20:51 -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
aecee8a985 am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit '717797db3e59ec34190e1230ebdeafecd14f4948':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-06 13:00:40 -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
ef44a77f91 am b93031e0: am 65cbcbea: Remove add widget transition jank (insecure). 
* commit 'b93031e0a64f3ec2548063cec6ea63b54be92c93':
  Remove add widget transition jank (insecure).
 2012-11-06 12:48:36 -08:00
John Spurlock
64091a1da0 am 8aa62362: am ae73c690: Fix regression in camera transition. 
* commit '8aa623628cbc7b859b1f94e5a09882fbe8cb209d':
  Fix regression in camera transition.
 2012-11-06 12:48:33 -08:00
Michael Jurka
7dfbe2d6a7 am 3eaa876c: am 08924d00: Merge "Supporting EXTRA_APPWIDGET_OPTIONS correctly" into jb-mr1-lockscreen-dev 
* commit '3eaa876cf317d064de1a32f1d34fd83b6e960e0b':
  Supporting EXTRA_APPWIDGET_OPTIONS correctly
 2012-11-06 12:48:29 -08:00
Jim Miller
bb9e7dcae9 am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'be2ca79abf2b1e5eb257560aa99ab48059e48cc8':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-06 12:48:26 -08:00
Jim Miller
16ddf343a6 am 8eb3048a: am 87d0366d: Fix NPE caused by applications that try to hide keyguard while it\'s not showing 
* commit '8eb3048acc2a3fddf0d6acfb43e69696672ae706':
  Fix NPE caused by applications that try to hide keyguard while it's not showing
 2012-11-06 12:48:22 -08:00
Svetoslav Ganov
ab77b5e6a2 am e97c6faa: am bb8abae5: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'e97c6faadb7d1b51d1dd194d4ccc47e299d09ba9':
 2012-11-06 12:48:19 -08:00
Mike Cleron
d97d16f0d1 am f154c9bd: am 624ea441: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'f154c9bdf81f20cf813064dd4e7e43805095b97a':
 2012-11-06 12:48:15 -08:00
Romain Guy
c4101b2b96 am a8e1d119: am 06da3378: am 6c642089: Merge "Add programmatic access to setters in TextClock Bug #7478328" into jb-mr1-dev 
* commit 'a8e1d119630ca3d351262ca3f3a11dda4e6edf75':
 2012-11-06 12:48:11 -08:00
Winson Chung
5418dd92ac am 6d47e9fc: am 48275d2d: Adding bouncer animation on PagedView. (Bug 7459660) 
* commit '6d47e9fc867ece4340869f72d9484c9e5eb71873':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-06 12:48:06 -08:00
Adam Powell
dd1dd60770 am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'd811f27f777d71da7ff226e72a68b09f30c39324':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 12:48:02 -08:00
Adam Cohen
eead927499 am 4e8a47e0: am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 
* commit '4e8a47e01cd0fd409f998e00976b1249c6b2f963':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 12:47:58 -08:00
Baligh Uddin
59880dfd2e am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit '0ca353fbd38345f0bdbcbc1028e0d292e9271392':
 2012-11-06 12:47:54 -08:00