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

36651 Commits

Author SHA1 Message Date
Adam Powell
70eeec5c06 am 79b08a49: am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b':
  add bouncer frame to glowpad.
 2012-11-08 15:46:58 -08:00
Daniel Sandler
b57693d7c4 am e7689b82: am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit 'e7689b82fa8a544289e7bcbb33ac6b33da6c9648':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 15:46:32 -08:00
Adam Powell
805f386d51 am ef79efdc: am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit 'ef79efdc479ea8d5ec623c14260e775f9e6a474b':
  Fiddle with keyguard glowpad layouts
 2012-11-08 15:46:25 -08:00
Jim Miller
23b94022ba am 3a191b49: am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3a191b495c886a654f33fe717467a74975137e58':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 15:46:07 -08:00
Winson Chung
1540a21f3d am 29f16178: am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '29f161781c4544c7b1e78c8d1ae07605b3dcde86':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 15:45:59 -08:00
Adam Cohen
bd8c736bfd am 79d4bf6e: am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit '79d4bf6e2f241d9d648789cdd5170e48614cc764':
  Fixing up overscroll asset / sizing
 2012-11-08 15:45:55 -08:00
Svetoslav Ganov
09b6f4bbff am 8fa69381: am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '8fa69381f212b85ec9156e0a95382cd3ff312444':
  Slide unlock cannot get accessibility focus.
 2012-11-08 15:45:48 -08:00
Jim Miller
0927eb2112 am bb01e9b8: am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit 'bb01e9b82f296102f9f5fdcf0545d61664e6ca06':
  Implement fallback clock in keyguard
 2012-11-08 15:45:43 -08:00
Adam Cohen
92f828f2a4 am 24b1764e: am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '24b1764e6c1996926ecba280f236ab05cec68b2c':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 15:45:35 -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
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
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
Adam Powell
79b08a499f am 2cfb9373: am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '2cfb9373fa1e1f1be107a310c49ef68722544aa3':
  add bouncer frame to glowpad.
 2012-11-08 13:13:19 -08:00
Daniel Sandler
e7689b82fa am 3a54aaed: am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit '3a54aaed02a79e589892389f1004ebcf3f8325be':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 13:12:53 -08:00
Adam Powell
ef79efdc47 am 868edfde: am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit '868edfdee6df34a0275c76e11ba3ca44e0327942':
  Fiddle with keyguard glowpad layouts
 2012-11-08 13:12:42 -08:00
Jim Miller
3a191b495c am f3add313: am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit 'f3add313dcbcda6711b441022fe340b412b7d1a0':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 13:12:25 -08:00
Winson Chung
29f161781c am 27ed0c2d: am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '27ed0c2d002587010456c87321902c276ae6e11a':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 13:12:17 -08:00
Adam Cohen
79d4bf6e2f am efacf143: am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit 'efacf14349286916d7dfd904617cda659f93cf91':
  Fixing up overscroll asset / sizing
 2012-11-08 13:12:13 -08:00
Svetoslav Ganov
8fa69381f2 am 0e538548: am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit '0e538548d75b97cfb3f29cce9c39e0ba65bbaa46':
  Slide unlock cannot get accessibility focus.
 2012-11-08 13:12:06 -08:00
Jim Miller
bb01e9b82f am b1938777: am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit 'b1938777afd8d7888779102ea2f3b5c0077c8f88':
  Implement fallback clock in keyguard
 2012-11-08 13:12:02 -08:00
Adam Cohen
24b1764e6c am 9477f8de: am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '9477f8dee1068f7b07713a33b18fd4aea6b5c039':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 13:11:54 -08:00
Adam Powell
2cfb9373fa am 5dd8b008: Merge "add bouncer frame to glowpad." into jb-mr1-lockscreen-dev 
* commit '5dd8b00891faff39ecadb1a0322e14528883bfe3':
  add bouncer frame to glowpad.
 2012-11-08 13:08:38 -08:00
Daniel Sandler
3a54aaed02 am 838195db: Merge "Compress lockscreen\'s account login fallback to fit." into jb-mr1-lockscreen-dev 
* commit '838195db8f69968690971977e4b615df39504465':
  Compress lockscreen's account login fallback to fit.
 2012-11-08 13:08:17 -08:00
Adam Powell
868edfdee6 am e7e210cb: Merge "Fiddle with keyguard glowpad layouts" into jb-mr1-lockscreen-dev 
* commit 'e7e210cb4373877785130ff06ad4e6635592eaa8':
  Fiddle with keyguard glowpad layouts
 2012-11-08 13:08:06 -08:00
Jim Miller
f3add313dc am 3c9297c3: Merge "Attempt to fix NegativeArraySizeException crash in keyguard" into jb-mr1-lockscreen-dev 
* commit '3c9297c3cb739b9aec9ccff7e4e3e05006edb836':
  Attempt to fix NegativeArraySizeException crash in keyguard
 2012-11-08 13:07:46 -08:00
Winson Chung
27ed0c2d00 am 4181e8a4: Merge "Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)" into jb-mr1-lockscreen-dev 
* commit '4181e8a4ac07e118724f7935928d2c3a1bb291f7':
  Fixing issue where you can reorder/delete a non-widget page. (Bug 7493984)
 2012-11-08 13:07:39 -08:00
Adam Cohen
efacf14349 am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev 
* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
  Fixing up overscroll asset / sizing
 2012-11-08 13:07:36 -08:00
Svetoslav Ganov
0e538548d7 am cd1f3095: Merge "Slide unlock cannot get accessibility focus." into jb-mr1-lockscreen-dev 
* commit 'cd1f3095056bd4148030f6f6c514387d623db800':
  Slide unlock cannot get accessibility focus.
 2012-11-08 13:07:29 -08:00
Jim Miller
b1938777af am 40962880: Merge "Implement fallback clock in keyguard" into jb-mr1-lockscreen-dev 
* commit '40962880225c74d8f776e6ce03f1ec6dde63ef04':
  Implement fallback clock in keyguard
 2012-11-08 13:07:25 -08:00
Adam Cohen
9477f8dee1 am 3e66286f: Merge "Fixing up glowpad scaling issues (issue 7494378)" into jb-mr1-lockscreen-dev 
* commit '3e66286f7cf33ef13fd9f4f033816b84828c1f2b':
  Fixing up glowpad scaling issues (issue 7494378)
 2012-11-08 13:07:18 -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