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

37748 Commits

Author SHA1 Message Date
Satoshi Kataoka
350d4cbec1 am ae41ba15: am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit 'ae41ba156364f5625280c4229169899adea965d5':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-08 15:55:59 -08:00
Justin Koh
9d0640cfb6 am 3e94c562: am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 
* commit '3e94c56215fa540ca722ab7b23710b82c08d20a4':
  Catch exception of nonfound activities
 2012-11-08 15:55:14 -08:00
Daniel Sandler
facda3d1c5 am 7f83ef61: am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '7f83ef619a3ad067c0b010c2f8bb113abf53b6c0':
  Fix docs to refer to the correct class.
 2012-11-08 15:54:51 -08:00
Satoshi Kataoka
ae41ba1563 am 4424951f: am 1e29e49c: Merge "Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI" into jb-mr1.1-dev 
* commit '4424951fa566b3bf6e57b08f615facc680059164':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-08 15:44:26 -08:00
Justin Koh
3e94c56215 am cd38c32d: Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 
* commit 'cd38c32d85c13fde87ca7bee501cbe35230078b6':
  Catch exception of nonfound activities
 2012-11-08 15:43:34 -08:00
Daniel Sandler
7f83ef619a am ccbfd617: am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'ccbfd617e730e5c3660fb3b9edf4f272db4abfd0':
  Fix docs to refer to the correct class.
 2012-11-08 15:42:51 -08:00
Romain Guy
238c892ece am 11d43794: am de60dd2d: am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit '11d43794b92e917bebc527d6e597eb6bd6581bfb':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-08 15:38:43 -08:00
Chris Wren
8531a0bec7 am 1ed908ec: am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 
* commit '1ed908ec3762da543143b84144cc4bf7743e2da6':
  Don't pop the IME for passwors at ScreenOn on tablets.
 2012-11-08 15:38:19 -08:00
Brian Colonna
a2e07821d8 am 318e8189: am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 
* commit '318e81896b46b33d01c942ed82387bd087e65c65':
  Centering FUL fixes b/7480608
 2012-11-08 15:38:15 -08:00
Michael Jurka
069d5ee9ac am 9d15b4cb: am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit '9d15b4cb70e0141bb5fe4e266bb505b4f84eb1ec':
  Allowing rotation while adding lockscreen widgets
 2012-11-08 15:38:07 -08:00
Adam Cohen
df8a020c61 am 0c06c2b3: am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 
* commit '0c06c2b35c50a8391fb95e8f9b277e0b9899c1c1':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
 2012-11-08 15:38:03 -08:00
Adam Powell
eaa0cc8a37 am c4e0614b: am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking 
* commit 'c4e0614bcaf6e4cabb7b532d876ed1c2fe7a85bf':
  Keyguard layout tweaking/reworking
 2012-11-08 15:37:59 -08:00
Daniel Sandler
2a08223fd6 am 744fa85f: am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit '744fa85f12fdb4b601339c12abe342ada2dc8e18':
  Updated assets.
 2012-11-08 15:37:55 -08:00
Michael Jurka
7df23b0c51 am d31bc8ca: am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 
* commit 'd31bc8ca2ce4c1288f14cf650944c9b65a588b72':
  Removing sticky widgets in lockscreen
 2012-11-08 15:37:43 -08:00
Jim Miller
7779c83a36 am fcb80423: am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit 'fcb8042316bad141cab189de6dfacd60e8d09848':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-08 15:37:30 -08:00
Jim Miller
d97b09b0f3 am bef82757: am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'bef827572ce9644253ea42ab91b11b8107d2300f':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-08 15:37:01 -08:00
Adam Cohen
1c2576ae18 am 1b19b519: am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit '1b19b519e659783236661fecf22f4f8897742dc3':
  Attempted fix for issue 7469415
 2012-11-08 15:36:45 -08:00
Romain Guy
11d43794b9 am de60dd2d: am fcd7ad4e: am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit 'de60dd2d136557ff7dce52c37625c4475ef42e7d':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-08 15:34:12 -08:00
Chris Wren
1ed908ec37 am 193cd46c: am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 
* commit '193cd46c47e7552c6b92b20aef51064d87e88d84':
  Don't pop the IME for passwors at ScreenOn on tablets.
 2012-11-08 15:33:31 -08:00
Brian Colonna
318e81896b am 1e85c8ed: am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 
* commit '1e85c8edfb39aa951134599b6019a7fa4fc8b4a7':
  Centering FUL fixes b/7480608
 2012-11-08 15:33:27 -08:00
Michael Jurka
9d15b4cb70 am 5dc8ce48: am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit '5dc8ce48d80c339070b626903a57846d4357c2f2':
  Allowing rotation while adding lockscreen widgets
 2012-11-08 15:33:16 -08:00
Adam Cohen
0c06c2b35c am 580657a3: am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 
* commit '580657a34851c29f013586578241d2f4d6dc4f5d':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
 2012-11-08 15:33:13 -08:00
Adam Powell
c4e0614bca am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking 
* commit 'e7394d1eef3ef8a89ec6ceea8f0318f38ac67b33':
  Keyguard layout tweaking/reworking
 2012-11-08 15:33:09 -08:00
Daniel Sandler
744fa85f12 am f6a5070b: am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit 'f6a5070bf59ecc5497196f923930d28286b49287':
  Updated assets.
 2012-11-08 15:33:05 -08:00
Michael Jurka
d31bc8ca2c am f1424272: am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 
* commit 'f142427244dde3e467b126df4840f496e09cef56':
  Removing sticky widgets in lockscreen
 2012-11-08 15:32:53 -08:00
Jim Miller
fcb8042316 am 8920c259: am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '8920c259c8f5c63e4fae40f00afb185daa8008fb':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-08 15:32:40 -08:00
Jim Miller
bef827572c am c7dc250d: am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'c7dc250d5a3dab93ff87e9986a71ae58ff124399':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-08 15:32:09 -08:00
Adam Cohen
1b19b519e6 am d50f206a: am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit 'd50f206a08663c05dbe6c14918c6eef61df0bc97':
  Attempted fix for issue 7469415
 2012-11-08 15:31:57 -08:00
Jean-Baptiste Queru
7c8d2b63c0 Merge from jb-mr1-dev-plus-aosp 
Change-Id: I28afbc0b04c22b9416973dc4d37783404997a4a3
 2012-11-08 15:19:11 -08:00
Jean-Baptiste Queru
c23cfe57a9 Merge remote-tracking branch 'goog/jb-mr1-dev-plus-aosp' into HEAD 2012-11-08 14:48:54 -08:00
Jean-Baptiste Queru
5189fca3df Merge commit '9a962d7c7df9ff762e3d9798cde868ad73b164db' into HEAD 2012-11-08 14:48:28 -08:00
Jean-Baptiste Queru
de8717c5f2 Merge commit '5418dd92ac6a0e60493ea85d9ac3a0f0d6155908' into HEAD 2012-11-08 14:44:44 -08:00
Jean-Baptiste Queru
40a419c2a5 Merge commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6' into HEAD 2012-11-08 14:44:35 -08:00
Jean-Baptiste Queru
d35f576ea0 Merge commit 'eead92749924e47ba6758bbded560b6aab0d7485' into HEAD 2012-11-08 14:40:34 -08:00
Jean-Baptiste Queru
8d3d0250c4 Merge commit '432c71d77e376c948b6e287b2b6b2d134e1f2a11' 
Change-Id: Iafcba7225e662bc2c3a3c113a1b36656889e2f18
 2012-11-08 14:40:12 -08:00
Jean-Baptiste Queru
ce2a3746b8 merge 19f8aa180a7ccb29b11a322378002e37517abfc9 
Change-Id: I9922b99379cd653b7a707cb2b635c1d544972f51
 2012-11-08 14:13:21 -08:00
Irfan Sheriff
8449bb0378 am 37794c20: am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit '37794c200fa24e622d842d420b49a2a2a87a38bb':
  Stop supplicant and dhcp before start
 2012-11-08 06:18:47 -08:00
Romain Guy
18d9a26941 am a965fc5e: am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit 'a965fc5e8f0c84cbeeaae7006eddbaf3bba64586':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-08 06:18:40 -08:00
Eino-Ville Talvala
f0352e03fd am f4334f63: am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit 'f4334f63c5162035ead3b44131c48015dfc6be58':
  Camera: Document new video snapshot picture size behavior.
 2012-11-08 06:18:36 -08:00
Robert Greenwalt
1f030df226 am 744c5204: am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit '744c520472d59c59f5320e1b0cf0801418eba773':
  Add Coin graphic to premium-sms dialog.
 2012-11-08 06:18:25 -08:00
Justin Koh
5d1a9a902e am 4608a0ae: am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 
* commit '4608a0aec230a1a4857b54354afc3f233af7c1f2':
  Support new touchpad event protocol.
 2012-11-08 06:18:15 -08:00
Justin Koh
b892e8c642 am a1459793: am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 
* commit 'a1459793d4e2ea483deb8baa733abbac56c2c199':
  Trigger Google Now intent with swipe from bottom
 2012-11-08 06:18:07 -08:00
Amith Yamasani
cb2f707f86 am cb5cb740: am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'cb5cb740b587744150df7414bdc2974144e9167a':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:17:59 -08:00
Irfan Sheriff
37794c200f am f264e8e3: am 567a2919: Merge "Stop supplicant and dhcp before start" into jb-mr1.1-dev 
* commit 'f264e8e34e32bfb8e7e75b61b9da9b6f219690b0':
  Stop supplicant and dhcp before start
 2012-11-08 06:14:33 -08:00
Romain Guy
a965fc5e8f am b37e5d75: am 7b9b41c1: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit 'b37e5d756f04489ff95226e26ebfdf141d135f91':
  Dismiss error icon on setError(null) [regression] Bug #7442935
 2012-11-08 06:14:11 -08:00
Eino-Ville Talvala
f4334f63c5 am 9671e6e1: am e980adfd: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '9671e6e116bbb8a82784457382cab3f90289e31b':
  Camera: Document new video snapshot picture size behavior.
 2012-11-08 06:14:01 -08:00
Robert Greenwalt
744c520472 am 08db1ceb: am bbe5cafe: Merge "Add Coin graphic to premium-sms dialog." into jb-mr1.1-dev 
* commit '08db1ceba24925cd8a710aa0153519351a9fa2c7':
  Add Coin graphic to premium-sms dialog.
 2012-11-08 06:13:17 -08:00
Justin Koh
4608a0aec2 am 41048d67: Merge "Support new touchpad event protocol." into jb-mr1-aah-dev 
* commit '41048d670d42075732723e72d7f303498690ea99':
  Support new touchpad event protocol.
 2012-11-08 06:12:30 -08:00
Justin Koh
a1459793d4 am 58e0fb9a: Merge "Trigger Google Now intent with swipe from bottom" into jb-mr1-aah-dev 
* commit '58e0fb9adbe579a068849a7865a7f1bce7531d1c':
  Trigger Google Now intent with swipe from bottom
 2012-11-08 06:12:26 -08:00
Amith Yamasani
cb5cb740b5 am aecee8a9: am 717797db: am f763b717: Merge "Authenticate correct user\'s account when pattern fails multiple times." into jb-mr1-dev 
* commit 'aecee8a98543118dacec14a94052243754560e9d':
  Authenticate correct user's account when pattern fails multiple times.
 2012-11-08 06:12:21 -08:00