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

92516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Adam Powell
605ada850a am d921f604: am 0fcb5cda: am c717d110: Merge "Fix keyguard measurement bugs" into jb-mr1-lockscreen-dev 
* commit 'd921f604409f5715dd65d59af81274b2614c2476':
  Fix keyguard measurement bugs
 2012-11-08 15:45:31 -08:00
Eric Laurent
91d5cc56d3 am 2b988843: am 30717b68: Merge "AudioService: undock audio glitch - DO NOT MERGE" into jb-mr1.1-dev 
* commit '2b9888439d4016ac4890b0c6018d2f5a9e5bd653':
  AudioService: undock audio glitch - DO NOT MERGE
 2012-11-08 15:45:27 -08:00
Eric Laurent
8a8e2a4b9c am 98e5c814: am 73176865: Merge "audio service fix dock after crash - DO NOT MERGE" into jb-mr1.1-dev 
* commit '98e5c81438f36d907215eeba338ee834c29791de':
  audio service fix dock after crash - DO NOT MERGE
 2012-11-08 15:45:23 -08:00
The Android Open Source Project
122dbe96d8 am cc16a7ef: am 75993947: Reconcile with jb-mr1-release - do not merge 
* commit 'cc16a7efaa5346fb3876ed729bbd4d954c18df2e':
 2012-11-08 15:45:07 -08:00
Amith Yamasani
807dc6f038 am 081c36de: am bfb8a7b1: am 3fe2cb4d: Merge "Don\'t cancel any notifications that are meant for all users, if no package is specified." into jb-mr1-dev 
* commit '081c36ded6a562ae2bde4238592a1e7bc13ba151':
  Don't cancel any notifications that are meant for all users, if no package is specified.
 2012-11-08 15:44:40 -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
Sascha Prueter
45d0a78be7 am ef378ae2: am 14c89330: am de974f6f: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit 'ef378ae2047e3095fbf135c07b8f470f7e07cb54':
 2012-11-08 15:44:21 -08:00
Victoria Lease
29be45f53f am 5def8930: am d9da50ba: am eb6cbc22: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit '5def893095e9e14cf79d1ac18345f578592f98cd':
 2012-11-08 15:44:17 -08:00
Chris Wren
9ede3fd568 am 483483f8: am c0cbe8ab: am 8e3bf41d: Merge "add logging to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '483483f85ecc193457b8c68c28e502f43389ec13':
  add logging to enableUserSelectorIfNecessary.
 2012-11-08 15:44:13 -08:00
Chris Wren
eac1e897bb am 29cc9489: am 74c5d53e: am b524f4b9: Merge "add some defensive code to enableUserSelectorIfNecessary." into jb-mr1-lockscreen-dev 
* commit '29cc94898ff6e851ddd22d53e12f96524d9074a9':
  add some defensive code to enableUserSelectorIfNecessary.
 2012-11-08 15:44:09 -08:00
Daniel Sandler
566e78d9f7 am 5e6944bc: am e4e6c97e: am 2d09880d: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '5e6944bc000c85160b19a0f96631165fd4a32b3f':
 2012-11-08 15:44:06 -08:00
Baligh Uddin
84037a76e9 am 24ee3595: am 70869876: am 62e2374b: am 32226b73: (-s ours) Import translations. DO NOT MERGE 
* commit '24ee3595dc481a9b45d92afebd9142e980a7da60':
 2012-11-08 15:44:02 -08:00
Baligh Uddin
7a08dc970b am eeb747c5: am d9550886: am d44c4344: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit 'eeb747c559f3dc8c7815e6ba25d600c204b40d10':
  Import translations. DO NOT MERGE
 2012-11-08 15:43:59 -08:00
Adam Cohen
6da1fdd101 am fdfa4b7d: am b579714c: am 8f837a69: Merge "Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)" into jb-mr1-lockscreen-dev 
* commit 'fdfa4b7d52d0e83f78b6b9fe6eb3c1da083cc4d8':
  Storing boot completed in KeyguardUpdateMonitor so it is persistent (issue 7492235)
 2012-11-08 15:43:55 -08:00
Baligh Uddin
13fb25b0d2 am 5c89a592: am 4d0e5e0e: am db60b675: am fc958f12: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '5c89a59231e213a52a7557ee1362e093af1c0e2f':
 2012-11-08 15:43:51 -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
Irfan Sheriff
c03b51641c am 5c8e5585: am 1f6cf5fa: Merge "Re-use existing thread" into jb-mr1.1-dev 
* commit '5c8e5585e254f9d24320ece18e850140b29236ac':
  Re-use existing thread
 2012-11-08 15:43:30 -08:00
Sascha Prueter
d95ee5f753 am 61026ab1: am eb3aa44c: am 972dd431: Merge "Final icon for notifications panel" into jb-mr1-dev 
* commit '61026ab15d03c309f2741f1eff708611e1407fd6':
  Final icon for notifications panel
 2012-11-08 15:42:59 -08:00
Victoria Lease
63fd43ba50 am bf328b40: am 4abe2d3d: am ad84f7f4: Merge "disable geofences for secondary users" into jb-mr1-dev 
* commit 'bf328b4043e2f37aba8a5e86ee10726fe65ffc8a':
  disable geofences for secondary users
 2012-11-08 15:42:56 -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
Baligh Uddin
041f633c56 am 6ee0c2b8: am 0d29833f: am 32226b73: Import translations. DO NOT MERGE 
* commit '6ee0c2b868ebe69841d322b29a7261399249bb23':
  Import translations. DO NOT MERGE
 2012-11-08 15:42:41 -08:00
Baligh Uddin
7aa9e32457 am eaa70d72: am b97aadec: am fc958f12: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'eaa70d7218b7d98649d51b9bc4b135224f8032ed':
  Import translations. DO NOT MERGE
 2012-11-08 15:42:35 -08:00
The Android Open Source Project
87aa1a24bf am bc287eb8: am 63985103: Reconcile with jb-mr1-release - do not merge 
* commit 'bc287eb8fe660bc1646aa6e87299cd00ac3935d6':
 2012-11-08 15:42:23 -08:00
John Spurlock
f220f11766 am 5d561365: am 66453ff5: am 506fd3b0: Merge "Low battery dialog should use UserHandle.CURRENT." into jb-mr1-dev 
* commit '5d5613651e3ec78f6b068a9455c8b5cd262508ae':
  Low battery dialog should use UserHandle.CURRENT.
 2012-11-08 15:42:20 -08:00
Jean-Baptiste Queru
ec04edca16 Merge commit '658e350d' into HEAD 2012-11-08 15:40:21 -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
Roman Nurik
69097e5041 am a62316b3: am 081e6b7d: am 0fc1b5ec: am 512950a9: Merge "docs: Minor Nexus 10 fix in Device Art Generator" into jb-mr1-dev 
* commit 'a62316b393c7f2c34412ebce77547abda6446bf6':
 2012-11-08 15:33:48 -08:00
Baligh Uddin
3d6d75bd47 am 19068c08: am dac8d6d9: am a40ec75e: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '19068c088bf27defe64fe183cf133b1dee9adbcb':
  Import translations. DO NOT MERGE
 2012-11-08 15:33:45 -08:00
Daniel Sandler
591272848a am 334d66ed: am 6f562e9f: am 1b803450: Merge "Show the assist ring on center-button longpress on lockscreen." into jb-mr1-lockscreen-dev 
* commit '334d66ed41bbeb3456ee1366428076e85c875b7d':
  Show the assist ring on center-button longpress on lockscreen.
 2012-11-08 15:33:41 -08:00
Baligh Uddin
a1a229daa2 am 9310aa18: am b38b3ed1: (-s ours) am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '9310aa18865221ea8bf16345565313cc71f2d5f2':
  Import translations. DO NOT MERGE
 2012-11-08 15:33:35 -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
John Spurlock
b4119441a0 am 1ef6398e: am 3dcb3628: am 34c4fe52: Fix remaining jank in secure add-widget transition. 
* commit '1ef6398e93eefe08ae7195e83f04910610568f28':
  Fix remaining jank in secure add-widget transition.
 2012-11-08 15:33:20 -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
Jim Miller
f920a2729b am 63ef8dc0: am 52bf955e: am 9d0d796f: Merge "Fix emergency call area updates." into jb-mr1-lockscreen-dev 
* commit '63ef8dc03021faeb51af22868fcf7631f9383a1a':
  Fix emergency call area updates.
 2012-11-08 15:33:01 -08:00
Adam Cohen
416d486248 am 24d230e9: am 16a3f4c9: am 42164efa: Merge "Ensuring bindAppWidget isn\'t called until boot completed (issue 7469267)" into jb-mr1-lockscreen-dev 
* commit '24d230e9e972451b15326c819247163132709796':
  Ensuring bindAppWidget isn't called until boot completed (issue 7469267)
 2012-11-08 15:32:57 -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
Svetoslav Ganov
a8bc8a5a98 am 00a0ed03: am 1cbb449c: am ad9f594e: am 5fff5f01: Merge "Make partially visible widget pages not important for accessibility." into jb-mr1-dev 
* commit '00a0ed03b2f740666d60b75b44b8c5ab21910a02':
 2012-11-08 15:32:49 -08:00
Sascha Prueter
586f02f7d1 am 7286ff58: am 62855332: am bc69698c: am 872965bb: Merge "Use a consistent policy for filtering wake keys." into jb-mr1-dev 
* commit '7286ff586b6be315045bb15392651065d634dfc3':
 2012-11-08 15:32:46 -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
Romain Guy
9f6f38aeb8 am 4e889f00: am 96f6491a: am 475255bf: am 1b3b2544: Merge "Dismiss error icon on setError(null) [regression] Bug #7442935" into jb-mr1-dev 
* commit '4e889f008b148ab8d557c4d1d77bdb715a401383':
 2012-11-08 15:32:36 -08:00
Eino-Ville Talvala
077b81ff83 am 75dd6d2f: am f83ace0b: am 688d98fe: am 4a1b6e42: Merge "Camera: Document new video snapshot picture size behavior." into jb-mr1-dev 
* commit '75dd6d2fa180af352ed55b24a0ebc83a6a3f552a':
 2012-11-08 15:32:32 -08:00
Adam Powell
412545f7f0 am f2d7c67f: am de565f3b: am 7136544c: Merge "Keyguard - MultiPaneChallengeLayout measurement/layout changes" into jb-mr1-lockscreen-dev 
* commit 'f2d7c67f946deb6ba3ba224f1e4d2f3454058da2':
  Keyguard - MultiPaneChallengeLayout measurement/layout changes
 2012-11-08 15:32:24 -08:00
Victoria Lease
e006945d34 am b69c08a8: am b000c362: am 8d803258: am e6299d5a: Merge "Fires geofence if the device is already in the geofence area." into jb-mr1-dev 
* commit 'b69c08a832a9b5d45273bcf694d7177f23b734f7':
 2012-11-08 15:32:20 -08:00
Chris Wren
e2b6a93596 am f5dc0a19: am 888322a6: am 5fcca70d: Merge "animating challenge closed should close the challenge." into jb-mr1-lockscreen-dev 
* commit 'f5dc0a19acd17d827b932e78373530508ea70fe4':
  animating challenge closed should close the challenge.
 2012-11-08 15:32:17 -08:00
Winson Chung
b10df88b02 am 267214f4: am 43ecd191: am 6cf53bb3: Using screen dimensions to calculate the expanded PagedView dimensions. 
* commit '267214f4e63f0cf01918a4f491d40b79dcb6ab57':
  Using screen dimensions to calculate the expanded PagedView dimensions.
 2012-11-08 15:32:13 -08:00