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

90192 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
f3c6825207 am 1d9cebee: am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev 
* commit '1d9cebee1451ad5845ea7f4e0f7ab7ff8bb48185':
  Dream when user activity times out while docked if appropriate.
 2012-10-18 00:14:56 -07:00
Jeff Brown
05d7709e77 am 5561baef: am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev 
* commit '5561baef8b111d0eeaf9c47e98f3a160d4cb8559':
  Add special mirroring modes for demonstration purposes.
 2012-10-18 00:14:52 -07:00
Jeff Brown
1d9cebee14 am 88c66cbb: Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev 
* commit '88c66cbb00a572ac8280f0e0ea38079d48ec59f3':
  Dream when user activity times out while docked if appropriate.
 2012-10-18 00:11:27 -07:00
Jeff Brown
5561baef8b am 586503d5: Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev 
* commit '586503d51fbcc622af62b43b25579ce2f299d68b':
  Add special mirroring modes for demonstration purposes.
 2012-10-18 00:09:49 -07:00
Jeff Brown
88c66cbb00 Merge "Dream when user activity times out while docked if appropriate." into jb-mr1-dev 2012-10-18 00:08:18 -07:00
Jeff Brown
586503d51f Merge "Add special mirroring modes for demonstration purposes." into jb-mr1-dev 2012-10-18 00:06:48 -07:00
Jeff Sharkey
9fb2695c3e am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev 
* commit '628025fd625934346c80ed4849f9e6495f3d1737':
  Defer more Account actions until user starting.
 2012-10-18 00:05:35 -07:00
Jeff Sharkey
628025fd62 am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev 
* commit 'bd4f2181077ab35a26bcca115c1337e78814bb9d':
  Defer more Account actions until user starting.
 2012-10-18 00:03:43 -07:00
Jeff Sharkey
bd4f218107 Merge "Defer more Account actions until user starting." into jb-mr1-dev 2012-10-18 00:00:41 -07:00
Baligh Uddin
645f7608f2 am c880ebb4: am 3e336bd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit 'c880ebb4360973062fd11eaea7107b274f28daa1':
  Import translations. DO NOT MERGE
 2012-10-17 22:29:34 -07:00
Baligh Uddin
9bbcac888e am 080fa753: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit '080fa75371e127ab2990645d59a260b8d39f992e':
  Import translations. DO NOT MERGE
 2012-10-17 22:29:33 -07:00
Baligh Uddin
c880ebb436 am 3e336bd6: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '3e336bd6467c3a518b408d6b79117ae507a3c41b':
  Import translations. DO NOT MERGE
 2012-10-17 22:26:29 -07:00
Baligh Uddin
3e336bd646 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-10-17 22:23:35 -07:00
Baligh Uddin
080fa75371 Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-17 22:19:21 -07:00
Craig Mautner
7b77db0378 am 450fc70f: am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev 
* commit '450fc70ff4900098523f59c766860bce29c693b7':
  Call requestFocus and ensure that screenOn is set.
 2012-10-17 20:30:33 -07:00
Jeff Brown
ec6aa59454 Dream when user activity times out while docked if appropriate. 
If the user has requested that dreams start when docked and a user
activity timeout occurs, then start dreaming assuming all of the
other usual conditions are appropriate for dreaming (the device is
powered, etc.).

Previously dreams only started when the device was initial docked
but not if the device fell asleep while remaining docked.

Bug: 7281240
Change-Id: I72c3f854fd1ae8e6615f4fa6e4c4ecd8de37c84b
 2012-10-17 20:30:25 -07:00
Craig Mautner
450fc70ff4 am c6ccb29b: Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev 
* commit 'c6ccb29b9a7d3d8aac37f4cd3bd5b5b134724996':
  Call requestFocus and ensure that screenOn is set.
 2012-10-17 20:28:32 -07:00
Craig Mautner
c6ccb29b9a Merge "Call requestFocus and ensure that screenOn is set." into jb-mr1-dev 2012-10-17 20:25:12 -07:00
Daniel Sandler
9657c5e2cd am fdebf0fd: am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev 
* commit 'fdebf0fda9169b848c1e8eaafbcf3c720a0dabc6':
  You can only use the 2-finger shortcut when opening the panel.
 2012-10-17 20:06:33 -07:00
Daniel Sandler
fdebf0fda9 am c1dc37cb: Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev 
* commit 'c1dc37cba785d990cabfd4e27edadd18975f8751':
  You can only use the 2-finger shortcut when opening the panel.
 2012-10-17 20:04:41 -07:00
Daniel Sandler
c1dc37cba7 Merge "You can only use the 2-finger shortcut when opening the panel." into jb-mr1-dev 2012-10-17 20:01:34 -07:00
Romain Guy
3786a9b97a am 07a9ebd1: am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev 
* commit '07a9ebd1a01bc2819a90ddc98263a24bd6459768':
  Take into account the texture layer's transform for clipping Bug #7370212
 2012-10-17 19:21:20 -07:00
Romain Guy
07a9ebd1a0 am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212" into jb-mr1-dev 
* commit 'b8460d153a1e6dfc6a02ab127d4b5b5e82386137':
  Take into account the texture layer's transform for clipping Bug #7370212
 2012-10-17 19:18:24 -07:00
Romain Guy
b8460d153a Merge "Take into account the texture layer's transform for clipping Bug #7370212" into jb-mr1-dev 2012-10-17 19:16:11 -07:00
Jeff Brown
6296d23003 am 56fa32bc: am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 
* commit '56fa32bcdfeb3e2d0096065347150fdbb7d86b22':
  Add a notification icon when connected to wireless display.
 2012-10-17 18:47:45 -07:00
Jeff Brown
56fa32bcdf am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 
* commit '23fa0320b88bd2141742d47eaf2626369cb03b22':
  Add a notification icon when connected to wireless display.
 2012-10-17 18:44:43 -07:00
Jeff Brown
23fa0320b8 Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev 2012-10-17 18:42:25 -07:00
Jeff Brown
27f1d674bf Add special mirroring modes for demonstration purposes. 
Assume rotation of HDMI display is portait.
$ adb shell setprop persist.demo.hdmirotation portrait

Don't lock rotation while HDMI is plugged in.
$ adb shell setprop persist.demo.hdmirotationlock false

Hide secondary displays from apps but continue mirroring to them.
$ adb shell setprop persist.demo.singledisplay true

Bug: 7326281
Change-Id: I8f9a3b0bc19821a3a01043b0f516806dac82ce53
 2012-10-17 18:41:31 -07:00
Baligh Uddin
917d8ac7fe Import translations. DO NOT MERGE 
Change-Id: I246d542b8032726b5ba49141f841cf23c208e7f7
Auto-generated-cl: translation import
 2012-10-17 18:38:36 -07:00
Baligh Uddin
5e997383ad Import translations. DO NOT MERGE 
Change-Id: Id28c1f2850ae312444163c119f0828259fb0b346
Auto-generated-cl: translation import
 2012-10-17 18:36:20 -07:00
Romain Guy
b2e2f24706 Take into account the texture layer's transform for clipping 
Bug #7370212

Change-Id: Ibdc3161306f54a1cfe66e08458f05ee01a13b1df
 2012-10-17 18:18:35 -07:00
Xavier Ducrohet
d5a68ad8b7 am 441f0672: am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-dev 
* commit '441f0672ed65feead06c4a05d7e6bf894ab2a982':
  Update layoutlib for jb mr1.
 2012-10-17 17:24:01 -07:00
Xavier Ducrohet
441f0672ed am 9c474738: Merge "Update layoutlib for jb mr1." into jb-mr1-dev 
* commit '9c474738a29f77359a461035855d6e9b3935ade1':
  Update layoutlib for jb mr1.
 2012-10-17 17:21:36 -07:00
Xavier Ducrohet
9c474738a2 Merge "Update layoutlib for jb mr1." into jb-mr1-dev 2012-10-17 17:18:19 -07:00
Xavier Ducrohet
891b703f7b Update layoutlib for jb mr1. 
Status bar displayed on all devices.
Update logic for displaying nav bar to whether or not
device has soft button.

Update navigation buttons to new look.
Remove battery and signal from navigation bar.

Change-Id: I8241d71269a17126218a3062ba727e379a8e6c25
 2012-10-17 17:15:31 -07:00
Justin Ho
22bd3726be am 76a01424: am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '76a0142477e3ebda381d717572b21b355c172c26':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:03:11 -07:00
Justin Ho
76a0142477 am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:00:37 -07:00
Justin Ho
0efebf0af4 am c35f7650: am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit 'c35f76508eed905e06954cf8955065909b2039a7':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 16:00:31 -07:00
Justin Ho
c35f76508e am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '4db3165793a837ffc8197184fbc13ef2217e3dfc':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 15:58:52 -07:00
Justin Ho
871a6d7d4f Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 15:55:15 -07:00
Justin Ho
4e360f0600 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit f49d835dfe1bd21920ff8a48cbdfb9c1fd632fd9

Change-Id: If0093f23d6458e53619220fbf0aa5f844ad2c790
 2012-10-17 15:54:20 -07:00
Justin Ho
4db3165793 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 2012-10-17 15:53:02 -07:00
Justin Ho
f49d835dfe This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
 2012-10-17 15:50:48 -07:00
Jeff Brown
a7f9c966bc Add a notification icon when connected to wireless display. 
Bug: 7350174
Change-Id: I18481e2a1445b0aa3340e5d9b02511394521e50e
 2012-10-17 15:50:06 -07:00
Craig Mautner
904732c457 Call requestFocus and ensure that screenOn is set. 
When maybeCreateKeyguardLocked was called from methods other than
show(), the requestFocus() call on the new KeyguardHostView was
never made.

At boot time the screen on notification was not propagated to
KeyguardViewManager because the showListener callback was null.
This passes on the notification but does not make the callback
if it is null.

Bug: 7299119 fixed.
Change-Id: Iaf058954473dc63fe4864ab1f435db4463b1110e
 2012-10-17 15:35:43 -07:00
Yu Shan Emily Lau
6aa774ec5c am b05706da: am 0f2d0147: Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev 
* commit 'b05706da3726791f429ce9744a83a3ded2bd4431':
  Append the test case name in the beginning of the test log.
 2012-10-17 15:11:47 -07:00
Yu Shan Emily Lau
b05706da37 am 0f2d0147: Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev 
* commit '0f2d0147a938e32424cf69f7df5e0da2fba02355':
  Append the test case name in the beginning of the test log.
 2012-10-17 15:09:26 -07:00
Yu Shan Emily Lau
0f2d0147a9 Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev 2012-10-17 15:06:57 -07:00
Jeff Sharkey
e4996bbd51 Defer more Account actions until user starting. 
Instead of explicitly scanning OWNER accounts, move to using the
"user starting" call path for consistency.

Bug: 7358086
Change-Id: Ied3289a074aafa48259d828db1d68804912589b3
 2012-10-17 15:05:52 -07:00
Chet Haase
b7379d3e48 am 68716710: am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 
* commit '6871671063262759c906e6a24829d37a91d3b278':
  Fix for previous commit on non-interesecting invalidations
 2012-10-17 14:58:22 -07:00