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
4424951fa5 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 '1e29e49cf8b2654f999b2fdb16e8f7f262b73c68':
  Reduce jankiness of the transition between a text field with FLAG_NO_FULLSCREEN and a text field with FLAG_NO_EXTRACT_UI
 2012-11-07 20:50:37 -08:00
Satoshi Kataoka
1e29e49cf8 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 2012-11-07 20:48:01 -08:00
Justin Koh
cd38c32d85 Merge "Catch exception of nonfound activities" into jb-mr1-aah-dev 2012-11-07 17:10:24 -08:00
Jim Miller
9210016ff9 am 449f48ff: am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit '449f48ff3bc99544ecf1676ed15a4126beea1f1e':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:10:12 -08:00
Ben Pietrzak
6b1d912b25 Catch exception of nonfound activities 
Change-Id: Id019c71937e73c38eb7a7c0a0cccfc2b9e87d069
 2012-11-07 15:07:18 -08:00
Jim Miller
449f48ff3b am bb9e7dca: am be2ca79a: am 7dfc588a: Workaround for layout bug in SIM PIN/PUK views 
* commit 'bb9e7dcae96c8913050166c9cc949e9f1c3c8d1f':
  Workaround for layout bug in SIM PIN/PUK views
 2012-11-07 15:06:37 -08:00
Jean-Baptiste Queru
f5a79d313e am 476fceab: Merge 5418dd92 
* commit '476fceaba3e8c8d5b775fc07ad098792fc757f76':
  Adding bouncer animation on PagedView. (Bug 7459660)
 2012-11-07 14:54:34 -08:00
Jean-Baptiste Queru
476fceaba3 Merge 5418dd92 
Change-Id: I50cd61c9dce55d528005b8d36dddf5cc62af89a8
 2012-11-07 14:41:18 -08:00
Kenny Root
7b172a49a9 am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6':
  Correct executable bit for source files
 2012-11-07 13:08:25 -08:00
Elliott Hughes
e4d08f11c4 am 9197d170: am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit '9197d170b770f2b87abd0cd0e13dcf71e5a181c2':
  It's 2012. We're always WITH_JIT.
 2012-11-07 13:08:11 -08:00
Daniel Sandler
ccbfd617e7 am 7b5a9276: am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit '7b5a92766a0b04af7cb6a9e9905ec37e7885ea64':
  Fix docs to refer to the correct class.
 2012-11-07 12:40:30 -08:00
Daniel Sandler
7b5a92766a am afc5210a: Merge "Fix docs to refer to the correct class." into jb-mr1-dev 
* commit 'afc5210a811da3824d75e32d998370203aba1968':
  Fix docs to refer to the correct class.
 2012-11-07 12:37:28 -08:00
Daniel Sandler
afc5210a81 Merge "Fix docs to refer to the correct class." into jb-mr1-dev 2012-11-07 12:35:01 -08:00
Baligh Uddin
0d29833f96 am 32226b73: Import translations. DO NOT MERGE 
* commit '32226b73ca908b2ee45c6ee651437aec2ab93489':
  Import translations. DO NOT MERGE
 2012-11-07 11:57:36 -08:00
Baligh Uddin
32226b73ca Import translations. DO NOT MERGE 
Change-Id: I82793ad9ed66b4e2924b3c32a2292bad69b56579
Auto-generated-cl: translation import
 2012-11-07 11:54:30 -08:00
Kenny Root
58ed5d748c am 768d9e1a: Merge "Correct executable bit for source files" 
* commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04':
  Correct executable bit for source files
 2012-11-07 11:52:12 -08:00
Kenny Root
768d9e1a72 Merge "Correct executable bit for source files" 2012-11-07 11:45:14 -08:00
Baligh Uddin
658e350daf Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 11:33:07 -08:00
Baligh Uddin
d5ef55df10 Import translations. DO NOT MERGE 
Change-Id: Ia17c77e31bea23907d9d28a0d12acf4ed9040eb6
Auto-generated-cl: translation import
 2012-11-07 11:31:14 -08:00
Romain Guy
de60dd2d13 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 'fcd7ad4e28df6a408e84c6d2b2f425b029efbfbe':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-07 11:22:43 -08:00
Romain Guy
fcd7ad4e28 am 59d73ab6: Merge "Respond to ticks when a timezone is set and it doesn\'t display seconds Bug #7489774" into jb-mr1-dev 
* commit '59d73ab6fcc80b9e08ff06cfc13617a2f65af60e':
  Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774
 2012-11-07 11:18:55 -08:00
Chris Wren
193cd46c47 am 53d81968: am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 
* commit '53d819687e29ea8b400f4852295fbec3fabb9f7b':
  Don't pop the IME for passwors at ScreenOn on tablets.
 2012-11-07 11:18:21 -08:00
Brian Colonna
1e85c8edfb am 9885568e: am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 
* commit '9885568eb7b85f743ff7c8a1503251a54ed9ea73':
  Centering FUL fixes b/7480608
 2012-11-07 11:18:17 -08:00
Michael Jurka
5dc8ce48d8 am c7037934: am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit 'c70379347e2a1bc469da10149f8d443ab7c94468':
  Allowing rotation while adding lockscreen widgets
 2012-11-07 11:18:06 -08:00
Adam Cohen
580657a348 am 96c3f7e5: am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 
* commit '96c3f7e5f21c6b38d00dd259941d8c72c2283160':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
 2012-11-07 11:18:03 -08:00
Adam Powell
e7394d1eef am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking 
* commit '3c0a353a05555819394d74795b9825c7210c3e1d':
  Keyguard layout tweaking/reworking
 2012-11-07 11:17:59 -08:00
Daniel Sandler
f6a5070bf5 am f74cac46: am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit 'f74cac46991cb46dc6e80a02f0c3a83dc5ed12ed':
  Updated assets.
 2012-11-07 11:17:55 -08:00
Michael Jurka
f142427244 am 1aad5be9: am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 
* commit '1aad5be9161397db505c2812c1a8279421c245c3':
  Removing sticky widgets in lockscreen
 2012-11-07 11:17:43 -08:00
Jim Miller
8920c259c8 am 259e3121: am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '259e3121d301c29112dad028931d9d477264be96':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-07 11:17:33 -08:00
Jim Miller
c7dc250d5a am fe7e94a0: am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit 'fe7e94a094746b608eb926fadc3ee1446bbb0d58':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:17:08 -08:00
Adam Cohen
d50f206a08 am a7af0209: am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit 'a7af02098a0192b36e98c5ab809fd0f6eae9ce21':
  Attempted fix for issue 7469415
 2012-11-07 11:16:57 -08:00
Romain Guy
59d73ab6fc Merge "Respond to ticks when a timezone is set and it doesn't display seconds Bug #7489774" into jb-mr1-dev 2012-11-07 11:15:36 -08:00
Baligh Uddin
b38b3ed123 am 8dbf3b8d: Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 
* commit '8dbf3b8df0f29d457155e5831dbecf5ba4fff98e':
  Import translations. DO NOT MERGE
 2012-11-07 11:15:00 -08:00
Chris Wren
53d819687e am cf9ee4c5: Merge "Don\'t pop the IME for passwors at ScreenOn on tablets." into jb-mr1-lockscreen-dev 
* commit 'cf9ee4c55db750f86fdcb765c4f21c44bb4bc893':
  Don't pop the IME for passwors at ScreenOn on tablets.
 2012-11-07 11:14:56 -08:00
Brian Colonna
9885568eb7 am 6b4ab7f1: Merge "Centering FUL fixes b/7480608" into jb-mr1-lockscreen-dev 
* commit '6b4ab7f170ea54e5b99cf0635d3803a9407439d7':
  Centering FUL fixes b/7480608
 2012-11-07 11:14:53 -08:00
Michael Jurka
c70379347e am cabcc590: Merge "Allowing rotation while adding lockscreen widgets" into jb-mr1-lockscreen-dev 
* commit 'cabcc5900790daaa9ca4d080848c9b505c3de126':
  Allowing rotation while adding lockscreen widgets
 2012-11-07 11:14:45 -08:00
Adam Cohen
96c3f7e5f2 am 1361758f: Merge "Giving glow pad the brains to scale itself dynamically (issue 7449554)" into jb-mr1-lockscreen-dev 
* commit '1361758f90e3c247e2da953913ef424041d1c847':
  Giving glow pad the brains to scale itself dynamically (issue 7449554)
 2012-11-07 11:14:41 -08:00
Adam Powell
3c0a353a05 am 9799714f: Keyguard layout tweaking/reworking 
* commit '9799714f6c69efe50e21a6073b879140e5e792b7':
  Keyguard layout tweaking/reworking
 2012-11-07 11:14:38 -08:00
Daniel Sandler
f74cac4699 am 9edc48e2: Merge "Updated assets." into jb-mr1-lockscreen-dev 
* commit '9edc48e26354f6a7282e68851a6d9ba734c7ceb1':
  Updated assets.
 2012-11-07 11:14:34 -08:00
Michael Jurka
1aad5be916 am 835579e8: Merge "Removing sticky widgets in lockscreen" into jb-mr1-lockscreen-dev 
* commit '835579e8173700be78368827d5c042ac4f698e29':
  Removing sticky widgets in lockscreen
 2012-11-07 11:14:24 -08:00
Jim Miller
259e3121d3 am 51117262: Handle DevicePolicyManagement and safe mode when inflating widgets 
* commit '51117262c8fadb6d227d137e83ad66996b013141':
  Handle DevicePolicyManagement and safe mode when inflating widgets
 2012-11-07 11:14:14 -08:00
Jim Miller
fe7e94a094 am 088fb915: Merge "Add isSafeModeEnabled() API to WindowManagerService" into jb-mr1-lockscreen-dev 
* commit '088fb915f73584fbeaf05f5cbaa95b8a944b94cb':
  Add isSafeModeEnabled() API to WindowManagerService
 2012-11-07 11:13:48 -08:00
Adam Cohen
a7af02098a am 0e1608c0: Merge "Attempted fix for issue 7469415" into jb-mr1-lockscreen-dev 
* commit '0e1608c0277155c49f78a0f6980e5c5cb9afc0b8':
  Attempted fix for issue 7469415
 2012-11-07 11:13:34 -08:00
Daniel Sandler
8768278974 Fix docs to refer to the correct class. 
Bug: 6676920
Change-Id: Ib79635cb3ff464b4686268fcf64b99cacaa9e627
 2012-11-07 14:04:42 -05:00
Elliott Hughes
9197d170b7 am fec5f611: Merge "It\'s 2012. We\'re always WITH_JIT." 
* commit 'fec5f611fef4fc3b7afa5d7194f4f40d156157ac':
  It's 2012. We're always WITH_JIT.
 2012-11-07 10:48:26 -08:00
Kenny Root
3a084af2e9 Correct executable bit for source files 
Many media files and source code files were marked as executable in Git.
Remove those.

Also a shell script and python script were not marked as executable.

Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
 2012-11-07 10:27:31 -08:00
Elliott Hughes
fec5f611fe Merge "It's 2012. We're always WITH_JIT." 2012-11-07 09:57:16 -08:00
Baligh Uddin
f6a4a04cad Merge "Import translations. DO NOT MERGE" 2012-11-07 09:41:08 -08:00
Baligh Uddin
8dbf3b8df0 Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev 2012-11-07 09:39:39 -08:00
Baligh Uddin
20040dafbc Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-11-07 09:38:43 -08:00