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

91690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
fce1cc9a6c am f3820b13: am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev 
* commit 'f3820b139e7a79df959c977cb83324639652c11a':
  Removed symbol causing compile breakage.
 2012-10-31 16:31:25 -07:00
Baligh Uddin
f3820b139e am dd733251: Merge "Removed symbol causing compile breakage." into jb-mr1-dev 
* commit 'dd73325106c4d52c734647d65530e46eb70f4749':
  Removed symbol causing compile breakage.
 2012-10-31 16:27:53 -07:00
Baligh Uddin
dd73325106 Merge "Removed symbol causing compile breakage." into jb-mr1-dev 2012-10-31 15:28:44 -07:00
Baligh Uddin
809453344c am 63f43d56: am 6bd881bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '63f43d56198d8423f875d23e3bb2559b652d8d5a':
  Import translations. DO NOT MERGE
 2012-10-31 15:07:58 -07:00
Baligh Uddin
d8a5792ae7 Removed symbol causing compile breakage. 
Seems like this string was removed in
  https://googleplex-android-review.googlesource.com/#/c/247477

Change-Id: I2cc96143980d326cfdbc1db3b2a3c9766963ef03
 2012-10-31 15:05:47 -07:00
Baligh Uddin
63f43d5619 am 6bd881bd: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '6bd881bd328835f9b042d859cb496ed6f612c17b':
  Import translations. DO NOT MERGE
 2012-10-31 15:05:02 -07:00
Baligh Uddin
6bd881bd32 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-31 15:02:31 -07:00
Amith Yamasani
d02f231318 am 47ece2e5: am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev 
* commit '47ece2e53e50201a6f73fb7a554d856f3b4519c8':
  Relax permission requirements for posting notifications across users
 2012-10-31 13:11:50 -07:00
Baligh Uddin
196f1408eb am 53b029b6: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 
* commit '53b029b6201dbe754d478f3dfcbd4f1e5ee5b41e':
  Revert "Import translations. DO NOT MERGE"
 2012-10-31 13:11:50 -07:00
Amith Yamasani
47ece2e53e am 03f7ebfe: Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev 
* commit '03f7ebfeaadb3f03c9a9a6405276fb702ad11fe1':
  Relax permission requirements for posting notifications across users
 2012-10-31 13:09:42 -07:00
Amith Yamasani
03f7ebfeaa Merge "Relax permission requirements for posting notifications across users" into jb-mr1-dev 2012-10-31 13:06:56 -07:00
Jean-Baptiste Queru
9cd8675825 Merge "Fix build - Add back symbol that's still needed" into jb-mr1-dev-plus-aosp 2012-10-31 11:43:24 -07:00
Jean-Baptiste Queru
ab5202c3f1 Fix build - Add back symbol that's still needed 
Change-Id: Iee59db7950bd83a480baa0b63729b16563251ad9
 2012-10-31 11:35:48 -07:00
Baligh Uddin
53b029b620 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 2012-10-31 10:37:14 -07:00
Baligh Uddin
c061cef351 Revert "Import translations. DO NOT MERGE" 
Broken Build: 
frameworks/base/core/res/res/values/symbols.xml:558: error: Symbol 'keyguard_accessibility_widget_changed' declared with <java-symbol> not defined
make: *** [out/target/common/obj/APPS/framework-res_intermediates/package-export.apk] Error 1

This reverts commit 9ab7f479f9ca5f1e27aa09b5f6073d88b8e98f60

Change-Id: I448e20bb060ebfe5f351b5a3d906d9e7768252b1
 2012-10-31 10:35:37 -07:00
Baligh Uddin
9d0504fe6a am 74db3bb8: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '74db3bb81bd67429ecd7a8b7273c02c1cf51c055':
  Import translations. DO NOT MERGE
 2012-10-31 10:23:36 -07:00
Baligh Uddin
4137ff1c03 am 8339bf19: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '8339bf19ece1bbf2b4441e1e07d7fa8e331111d9':
  Import translations. DO NOT MERGE
 2012-10-31 10:23:35 -07:00
Baligh Uddin
74db3bb81b Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-31 10:20:16 -07:00
Baligh Uddin
8339bf19ec Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-31 10:11:17 -07:00
The Android Open Source Project
69376b74b5 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: Ic363e92df81b458869dc8c26ad02642886b0538a
 2012-10-31 09:16:38 -07:00
Dave Burke
b95bc6870a Fix ordering bug 
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
 2012-10-30 21:54:15 -07:00
Dave Burke
026c6254d7 am ee6e3354: am 86e1b966: Fix ordering bug 
* commit 'ee6e3354484233de65da431f0e2abbcd695d7dca':
  Fix ordering bug
 2012-10-30 21:53:16 -07:00
Dave Burke
ee6e335448 am 86e1b966: Fix ordering bug 
* commit '86e1b96666af3693ec1bf220272fbc90d73d3cde':
  Fix ordering bug
 2012-10-30 21:51:08 -07:00
Dave Burke
86e1b96666 Fix ordering bug 
Bug: 7445381
Change-Id: I585b8cdd528b05db0737eab815c4172760aece14
 2012-10-30 21:45:12 -07:00
The Android Automerger
02a5988f41 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-30 20:12:18 -07:00
Baligh Uddin
7fc99e8911 Import translations. DO NOT MERGE 
Change-Id: I01d1dafe9b0dc9d6fb4d90ff97fc39cbeca4f3f8
Auto-generated-cl: translation import
 2012-10-30 19:34:07 -07:00
Baligh Uddin
d66c41c56b Import translations. DO NOT MERGE 
Change-Id: I6df01942373d95ef42198afb69cf892fbdbec798
Auto-generated-cl: translation import
 2012-10-30 19:32:59 -07:00
Baligh Uddin
9ab7f479f9 Import translations. DO NOT MERGE 
Change-Id: I5a6cc89a0cdc7d6fa5be47c926e69555db4e9ba9
Auto-generated-cl: translation import
 2012-10-30 19:08:26 -07:00
Svetoslav Ganov
6c86c8efda am 1728e550: am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev 
* commit '1728e5509ee650eaebb53f42b47aa5e601819f1c':
  Fixing view accessibility classification for recents.
 2012-10-30 18:34:56 -07:00
Svetoslav Ganov
1728e5509e am 0bd6f96f: Merge "Fixing view accessibility classification for recents." into jb-mr1-dev 
* commit '0bd6f96ff0b5f29b08205518c4060f0d38a9cdcc':
  Fixing view accessibility classification for recents.
 2012-10-30 18:33:29 -07:00
Svetoslav Ganov
0bd6f96ff0 Merge "Fixing view accessibility classification for recents." into jb-mr1-dev 2012-10-30 18:30:45 -07:00
Ed Heyl
ec71d5d8e2 am 31dfff78: am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev 
* commit '31dfff783eeb9ac856bc2fbfa14e7af5190fd717':
  Fix content alpha
  Removed makeInvisible() function
  Making the reordering play nice with the 3D widget carousel
  Fixed misplacement of cancel(X) button for Face Unlock
  Fill in logic in WidgetPager to ignore music when reordering.
  Attempt to fix bug on devices where multi-user support is disabled.
  Implement correct music widget positioning in keyguard
  Render camera widget correctly after shell restart.
  Moving persistence calls to background.
  FUL uses square aspect ratio for all layouts fixes b/7426399
  Addressing a couple comments on previous CL
  Impose a height & width downward on challenge views.
  Fixing some regressions in tablet reordering/deleting.
  Disable lockscreen window anim when launching camera.
 2012-10-30 18:10:09 -07:00
Ed Heyl
31dfff783e am 5c12bc58: Merge remote-tracking branch \'goog/jb-mr1-lockscreen-dev\' into jb-mr1-dev 
* commit '5c12bc5851056f114893f3d381f9fc8785e2cdb0':
  Fix content alpha
  Removed makeInvisible() function
  Making the reordering play nice with the 3D widget carousel
  Fixed misplacement of cancel(X) button for Face Unlock
  Fill in logic in WidgetPager to ignore music when reordering.
  Attempt to fix bug on devices where multi-user support is disabled.
  Implement correct music widget positioning in keyguard
  Render camera widget correctly after shell restart.
  Moving persistence calls to background.
  FUL uses square aspect ratio for all layouts fixes b/7426399
  Addressing a couple comments on previous CL
  Impose a height & width downward on challenge views.
  Fixing some regressions in tablet reordering/deleting.
  Disable lockscreen window anim when launching camera.
 2012-10-30 18:07:43 -07:00
Ed Heyl
5c12bc5851 Merge remote-tracking branch 'goog/jb-mr1-lockscreen-dev' into jb-mr1-dev 2012-10-30 18:04:31 -07:00
Amith Yamasani
fbb8825b08 am 146378e7: am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev 
* commit '146378e7c27f6c0a5713ccd8dbe60c9398a75f37':
  QS uses nickname for multiuser and profile name for singleuser.
 2012-10-30 17:54:24 -07:00
Amith Yamasani
146378e7c2 am 20329dcb: Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev 
* commit '20329dcb37fffca1de3ded6b58341e87cc43c4a9':
  QS uses nickname for multiuser and profile name for singleuser.
 2012-10-30 17:51:30 -07:00
Adam Cohen
a371e5315e Merge "Fix content alpha" into jb-mr1-lockscreen-dev 2012-10-30 17:51:03 -07:00
Chet Haase
daae890dc0 am 63f80350: am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev 
* commit '63f80350dc8157cbd7ba9d7613cce5e1e88f0d87':
  WindowManager shouldn't layout non-visible windows
 2012-10-30 17:49:15 -07:00
Amith Yamasani
20329dcb37 Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev 2012-10-30 17:47:58 -07:00
Amith Yamasani
bd2f51c5f1 am e3d8774d: am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev 
* commit 'e3d8774d30a8e86803e9ee6e92c435326819337a':
  Don't clean up wallpaper map entry when stopping a user.
 2012-10-30 17:46:27 -07:00
Chet Haase
63f80350dc am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev 
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
  WindowManager shouldn't layout non-visible windows
 2012-10-30 17:45:57 -07:00
Chet Haase
2e6a65ca8f am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev 
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02':
  WindowManager shouldn't layout non-visible windows
 2012-10-30 17:45:55 -07:00
Amith Yamasani
77007ac6a4 am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev 
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.
 2012-10-30 17:44:05 -07:00
Amith Yamasani
e3d8774d30 am a07d047f: Merge "Don\'t clean up wallpaper map entry when stopping a user." into jb-mr1-dev 
* commit 'a07d047f34b28fdf7b3b342ceb31c8c982b24fd8':
  Don't clean up wallpaper map entry when stopping a user.
 2012-10-30 17:44:04 -07:00
Chet Haase
27f752eb1d Merge "WindowManager shouldn't layout non-visible windows" into jb-mr1-dev 2012-10-30 17:42:43 -07:00
Adam Cohen
ab8635d179 Fix content alpha 
Change-Id: I13e8ad73baf768976240c1c7c5a2cb05d5d62061
 2012-10-30 17:40:43 -07:00
Amith Yamasani
a07d047f34 Merge "Don't clean up wallpaper map entry when stopping a user." into jb-mr1-dev 2012-10-30 17:40:13 -07:00
Danielle Millett
a0a230abf3 Merge "Removed makeInvisible() function" into jb-mr1-lockscreen-dev 2012-10-30 17:33:55 -07:00
Brian Colonna
d76b320b73 Merge "Fixed misplacement of cancel(X) button for Face Unlock" into jb-mr1-lockscreen-dev 2012-10-30 17:32:36 -07:00
Danielle Millett
54d181db0e Removed makeInvisible() function 
This is now being done inside stopUI instead of its own separate
call since it needs to be done on the UI thread inside FaceLockService.

Change-Id: Iaf3a203f7f201ba4dde4c878f457e765f11e6c0e
 2012-10-30 20:18:44 -04:00