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

87680 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
aa1805deea am 08876d19: Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 
* commit '08876d19923e04f1a654264a075f87ff73334469':
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
 2012-10-16 08:55:22 -07:00
Justin Ho
08876d1992 Merge "Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457" into jb-mr1-dev 2012-10-16 08:51:40 -07:00
Daniel Sandler
6d8b8e06cd am 18ea8f29: Merge "Flipping quick settings!" into jb-mr1-dev 
* commit '18ea8f29909e7e80a8c5dc63b86678d89b7e5664':
  Flipping quick settings!
 2012-10-16 07:45:39 -07:00
Daniel Sandler
18ea8f2990 Merge "Flipping quick settings!" into jb-mr1-dev 2012-10-16 07:42:48 -07:00
Daniel Sandler
101784e560 Flipping quick settings! 
Bug: 7348917 ╰(°□°╰)
Change-Id: I16923d6d920913a4bd0d78666587ac579ac18da5
 2012-10-16 02:34:09 -04:00
Daniel Sandler
36074eeccc am 1f075299: Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 
* commit '1f0752993ffd4339cdf0e7d69b96093503bd2e24':
  Allow any user to clear a notification targeted at USER_ALL.
 2012-10-15 22:25:20 -07:00
Daniel Sandler
1f0752993f Merge "Allow any user to clear a notification targeted at USER_ALL." into jb-mr1-dev 2012-10-15 22:23:29 -07:00
Craig Mautner
9018c0a96f am f6dbd61b: Merge "Always layout Keyguard on config change." into jb-mr1-dev 
* commit 'f6dbd61b108e586c1db3e61cbfc07d4d750027c0':
  Always layout Keyguard on config change.
 2012-10-15 22:09:05 -07:00
Craig Mautner
f6dbd61b10 Merge "Always layout Keyguard on config change." into jb-mr1-dev 2012-10-15 22:05:55 -07:00
Mathias Agopian
dcfe6ceef0 am 6868d6f3: Revert "Revert "Fix for bug 6050753."" 
* commit '6868d6f349610c15256471cc3d5fa708cbfd5f1d':
  Revert "Revert "Fix for bug 6050753.""
 2012-10-15 20:47:56 -07:00
Mathias Agopian
6868d6f349 Revert "Revert "Fix for bug 6050753."" 
Emergency revert -- fix reboot loop.

This reverts commit 8e63bcc63fd002231f8391af8982eeb235d096c8.

Change-Id: I4373b867d756de09cdf6aa0aba9e6ff8f47bcdbc
 2012-10-15 20:45:01 -07:00
Jamie Gennis
38041d6b3c am 809bb404: Merge "Flag window animation transactions as animations." into jb-mr1-dev 
* commit '809bb404da66498f1723279542d2a7d1f4512052':
  Flag window animation transactions as animations.
 2012-10-15 19:54:18 -07:00
Jamie Gennis
809bb404da Merge "Flag window animation transactions as animations." into jb-mr1-dev 2012-10-15 19:52:05 -07:00
Jamie Gennis
b6ce6e42cc Flag window animation transactions as animations. 
This change makes WindowManager use the new eAnimation flag when animating
windows.  This prevents some of the window updates from being combined with
updates from prior animation frames.

Bug: 7353840
Change-Id: I5a9f8fa2c1a2f5f08363a45cd9f28bb97cd77080
 2012-10-15 19:19:50 -07:00
Romain Guy
cb09dba0b8 am 69fbc3c0: Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 
* commit '69fbc3c089e3399ebd94cc3a7ba846f426a7b32d':
  Revert "Fix for bug 6050753."
 2012-10-15 18:47:46 -07:00
Romain Guy
8ab33df56b am edefaa25: Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev 
* commit 'edefaa25db7c9cd4facab258a0fd5913c6493bd0':
  Ensure we always request conformant OpenGL ES 2.0 contexts
 2012-10-15 18:47:42 -07:00
Romain Guy
4feddb27ef am dec26f20: Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev 
* commit 'dec26f2011a136868aebf50646b3cf3d27080008':
  Add missing layout_width/height Bug #7334849
 2012-10-15 18:47:38 -07:00
Romain Guy
69fbc3c089 Merge "Revert "Fix for bug 6050753."" into jb-mr1-dev 2012-10-15 18:45:03 -07:00
Romain Guy
edefaa25db Merge "Ensure we always request conformant OpenGL ES 2.0 contexts" into jb-mr1-dev 2012-10-15 18:43:59 -07:00
Romain Guy
dec26f2011 Merge "Add missing layout_width/height Bug #7334849" into jb-mr1-dev 2012-10-15 18:43:12 -07:00
Jeff Brown
d56d67020b am 0e082155: Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev 
* commit '0e082155ef2d7390d7befc139a788d3def94fecc':
  Stop dreaming if the battery not charging effectively.
 2012-10-15 18:43:08 -07:00
Jeff Brown
6593105cbc am 322de606: Merge "Cleanup some internal documentation." into jb-mr1-dev 
* commit '322de606574f45d1a4335b515369ce27c74d2b6b':
  Cleanup some internal documentation.
 2012-10-15 18:43:04 -07:00
Jeff Brown
0e082155ef Merge "Stop dreaming if the battery not charging effectively." into jb-mr1-dev 2012-10-15 18:41:11 -07:00
Jeff Brown
322de60657 Merge "Cleanup some internal documentation." into jb-mr1-dev 2012-10-15 18:40:05 -07:00
Jim Miller
bb2a020181 am 33987528: Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev 
* commit '339875283263dbbe3587388f94f603439e59af5f':
  Fix inoperative "Forgot pattern" button when face unlock enabled
 2012-10-15 18:39:19 -07:00
Jim Miller
3398752832 Merge "Fix inoperative "Forgot pattern" button when face unlock enabled" into jb-mr1-dev 2012-10-15 18:37:00 -07:00
Jeff Sharkey
77ce60a593 am 7789c9bb: Merge "Support pm clear as --user." into jb-mr1-dev 
* commit '7789c9bbfca079655e9285173d6175b94bc774b0':
  Support pm clear as --user.
 2012-10-15 18:29:51 -07:00
Raph Levien
b9e224ccb5 am 6f8c1bad: Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 
* commit '6f8c1bad8a7891f50eda2d3d14f774e28b8f8107':
  Fix for bug 7344916 text view flickers when you hit enter
 2012-10-15 18:25:13 -07:00
Jeff Sharkey
7789c9bbfc Merge "Support pm clear as --user." into jb-mr1-dev 2012-10-15 18:24:34 -07:00
Raph Levien
6f8c1bad8a Merge "Fix for bug 7344916 text view flickers when you hit enter" into jb-mr1-dev 2012-10-15 18:19:50 -07:00
Jim Miller
63f9b81795 Fix inoperative "Forgot pattern" button when face unlock enabled 
This fixes a bug where the forgot pattern button wasn't working because
the logic for face unlock was interfering with determining the proper
backup to use.

The fix:
- adds a new state to SecurityMode so we have an initial condition
we can check for.
- passes the current mode to SecurityModel.getBackupSecurityMode() so
it relies on the current state.
- prevents face unlock from invoking callbacks that change state
once we're no longer showing face unlock.

Fixes bug 7346989

Change-Id: I4e64515efbbad712f11c820e690b458f352bf46c
 2012-10-15 18:16:24 -07:00
Romain Guy
8efca54693 Ensure we always request conformant OpenGL ES 2.0 contexts 
Change-Id: I6b9d6f2dace02ad28baef6811007302b8e552a54
 2012-10-15 18:09:49 -07:00
Justin Ho
04fe8723e4 Update alarm sounds and tune some ringtones 
Bug: 7351672
Bug: 5502770
Bug: 7312457

Change-Id: Icb89cdbadc0e06b4a845b1cad16560f66d5b2bdd
 2012-10-15 17:40:57 -07:00
Jeff Brown
4eaba60fff am df409231: Merge "Update wifi display device name when renamed." into jb-mr1-dev 
* commit 'df409231a75c8b2ae976af66c0baec99b280aa33':
  Update wifi display device name when renamed.
 2012-10-15 17:23:39 -07:00
Raph Levien
f5c1a8798f Fix for bug 7344916 text view flickers when you hit enter 
The flickering was caused by trying to scroll to the cursor position
while the view was in an inconsistent state (text updated to change the
number of lines, but layout not done yet). This patch defers the actual
setting of the cursor until layout is done, when layout is pending.

Change-Id: I8ed3a402beb8058ac7a7f3935afeb946a23308ab
 2012-10-15 17:22:26 -07:00
Jeff Brown
df409231a7 Merge "Update wifi display device name when renamed." into jb-mr1-dev 2012-10-15 17:21:20 -07:00
Svetoslav Ganov
4a533efae3 am 25160a6f: Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev 
* commit '25160a6f35b2cf487be2b8cea8b87b750f0c1c97':
  Announce changes to the keyguard security message for accessibility.
 2012-10-15 17:17:50 -07:00
Svetoslav Ganov
25160a6f35 Merge "Announce changes to the keyguard security message for accessibility." into jb-mr1-dev 2012-10-15 17:15:44 -07:00
Jeff Brown
016ff14f12 Stop dreaming if the battery not charging effectively. 
If the user activity timeout expired and the battery appears
to be draining faster than it is charging then stop dreaming
and go to sleep.

Bug: 7312455
Change-Id: I1b9d89e5b2647c72c455d2792e3778a2fe6a4e34
 2012-10-15 16:56:20 -07:00
Romain Guy
42b0c70a31 Add missing layout_width/height 
Bug #7334849

Change-Id: Ie4bbe5905bec1d410b8b51e0194bb1c8c2b84680
 2012-10-15 16:47:16 -07:00
Jean-Michel Trivi
6bf846160c am 256ab9e9: Merge "Use device availability to start WFD audio routing" into jb-mr1-dev 
* commit '256ab9e9b9ccf4ea23e1fcd6e4a9029a8004747f':
  Use device availability to start WFD audio routing
 2012-10-15 16:28:00 -07:00
Jean-Michel Trivi
256ab9e9b9 Merge "Use device availability to start WFD audio routing" into jb-mr1-dev 2012-10-15 16:24:56 -07:00
Jeff Sharkey
a3e9ff7deb Support pm clear as --user. 
Bug: 7352703
Change-Id: I0e9cc4f2313e5424d234c3cb051004c0321d9dac
 2012-10-15 16:16:39 -07:00
Chris Craik
779ba3ad84 am 2aa50b6b: Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev 
* commit '2aa50b6b0fd5791504a6b6881cbe8bfc6ea70e30':
  HW Acceleration support for stroked arcs with BUTT caps
 2012-10-15 16:11:23 -07:00
Chris Craik
2aa50b6b0f Merge "HW Acceleration support for stroked arcs with BUTT caps" into jb-mr1-dev 2012-10-15 16:08:19 -07:00
Jeff Brown
ab887a09ad Cleanup some internal documentation. 
Bug: 7312455
Change-Id: Idefd71f2e9d1abe1b2671dac9702edf7f5fbc118
 2012-10-15 16:01:37 -07:00
Victoria Lease
aca6527ed6 am 3f840c8c: Merge "fix crashing apps" into jb-mr1-dev 
* commit '3f840c8c3c1c53f046f6d187b2d3c4120b8d8afe':
  fix crashing apps
 2012-10-15 15:52:53 -07:00
Victoria Lease
3f840c8c3c Merge "fix crashing apps" into jb-mr1-dev 2012-10-15 15:50:00 -07:00
alanv
f6d1afd141 Announce changes to the keyguard security message for accessibility. 
Bug: 7352702
Change-Id: I790d7be08b222ae3cb76459064802f587c3e6f30
 2012-10-15 15:37:44 -07:00
Jeff Brown
ee4f029ff4 Update wifi display device name when renamed. 
Bug: 7340725
Change-Id: Ia3835a37fa3800371920f863b82f992efe764664
 2012-10-15 15:31:59 -07:00