Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,999 Commits 3 Branches 0 Tags
d3326231dc3d334054fbeeacdf691965d1618a0c
Commit Graph

30999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Sakhartchouk
d3326231dc Merge "Shader changes to allow for more flexible constant binding." 2010-09-14 11:39:53 -07:00
Amith Yamasani
9322775014 Add a missing setOnCloseListener and a new setIconfied method. 
Keep track of the currently iconified state as well, if the app
wants to know.
 2010-09-14 10:55:10 -07:00
Maksymilian Osowski
023606abb6 Merge "Changed Summarizer to add header before printing the path in summary.txt and details.html" 2010-09-14 10:37:46 -07:00
Steve Block
8a2e55239a Merge "Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2" 2010-09-14 10:21:30 -07:00
Maksymilian Osowski
75aa0d3828 Changed Summarizer to add header before printing the path in summary.txt and details.html 
Change-Id: I6413e1871ede077793d49b7d4732f90d0aea352f
 2010-09-14 18:13:07 +01:00
Maksymilian Osowski
ac0b599fa7 Merge "Made the run_layout_tests.py script restart the apache2 server before it starts." 2010-09-14 10:04:23 -07:00
Vasu Nori
9a68713ca0 Merge "sql statement with syntax errors can leave database lock in bad state" 2010-09-14 10:04:13 -07:00
Alex Sakhartchouk
c984dd73c6 Shader changes to allow for more flexible constant binding. 
Change-Id: Ic66e6e2a371c6e3d5dce1b00f63acab8c09bd110
 2010-09-14 09:50:43 -07:00
Steve Block
757dcbb803 Implement LayoutTestController.setAppCacheMaximumSize() for DumpRenderTree2 
Change-Id: I7db486ccee1b9ebe84b89b98ba1a9b6e933d8f4e
 2010-09-14 16:59:17 +01:00
Steve Block
8a0db6f5ff Merge "Sort LayoutTestController methods alphabetically" 2010-09-14 08:25:26 -07:00
Maksymilian Osowski
2e36737669 Made the run_layout_tests.py script restart the apache2 server before it starts. 
Change-Id: Ic6b4e63d20a95daddd3dfde32d4168b235d7dd91
 2010-09-14 16:09:11 +01:00
Mike Lockwood
05f5a78df6 Merge changes I28b846a3,Ifd9b48cb 
* changes:
  MediaScanner: Fix problems with scanner non-file objects from the database
  MTP: Delete all files and subdirectories when deleting directories.
 2010-09-14 08:05:29 -07:00
Mike Lockwood
d7456c650e MediaScanner: Fix problems with scanner non-file objects from the database 
Abstract objects should not be garbage collected and directories should be
removed only if they no longer exist in the file system.

Change-Id: I28b846a39324a7c2968357917089cd4c1238a014
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-14 10:44:30 -04:00
Mike Lockwood
ccb6e96194 MTP: Delete all files and subdirectories when deleting directories. 
Children are now recursively deleted from the database and filesystem.

Change-Id: Ifd9b48cbc34b84b8f5073f2493dfe9735fae5492
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-14 10:37:27 -04:00
Steve Block
5de8b998f5 Sort LayoutTestController methods alphabetically 
This makes it easier to keep trac of which methods are implemented.
No functional changes.

Change-Id: I389ec5c0f7e77def6a479e387d1373b2b87f60c2
 2010-09-14 14:44:29 +01:00
Steve Block
540aada302 Merge "Add to DumpRenderTree2 the option to suppress showing results in the host browser" 2010-09-14 06:27:08 -07:00
Steve Block
d210fd26b2 Add to DumpRenderTree2 the option to suppress showing results in the host browser 
Change-Id: I78841ab5fad4e3ee0d5fe559489bf8cfd81abd23
 2010-09-14 14:24:59 +01:00
Maksymilian Osowski
59e46ef785 Merge "Gets rid of flickering when executing tests." 2010-09-14 06:24:08 -07:00
Maksymilian Osowski
a7e2ca9a1c Gets rid of flickering when executing tests. 
Achieves it by setting Executor background to white.

Change-Id: Id07c743114c6cce9e9446439136a5efd72857dc4
 2010-09-14 14:23:07 +01:00
Dianne Hackborn
a21e3da559 Fix issue #2967969: Crash rotating screen on "delete account" dialog 
- Have PreferenceActivity save and restore its header state.
- Keep track of the current header selection.
- When headers are updated, try to retain the current header selection.

Also fix issue #2995541: Cannot add new contact.  We were not allowing
fragment transactions in some cases.

Change-Id: I4aa4c703ed5f4ecf9f425cd7eeea4740c6360ce9
 2010-09-13 22:49:54 -07:00
Dianne Hackborn
ade9916d5c resolved conflicts for merge of 6421ae7e to master 
Change-Id: Ic8c4418f13a42fc1d3a44ad68e32b4e438b07f6f
 2010-09-13 21:41:57 -07:00
Dianne Hackborn
f86369ad0a am 527c0283: am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 
Merge commit '527c02838bed1188b9211752b4cf2fc0c03e8202'

* commit '527c02838bed1188b9211752b4cf2fc0c03e8202':
  Work on issue #2991868: A toast pops up informing users...
 2010-09-13 18:58:20 -07:00
Adam Powell
5f12084daa Merge "Fix bug 2995805 - splitMotionEvents behavior change" 2010-09-13 18:18:47 -07:00
Romain Guy
87a76578f7 Docs updates. 
Change-Id: Iff395e1c6d81a484a2c4ad6e88357c0134971b78
 2010-09-13 18:13:52 -07:00
Adam Powell
167bc821dd Fix bug 2995805 - splitMotionEvents behavior change 
Changed the new split motion events behavior to match the enshrined
behavior. A return value of false from a target's dispatchTouchEvent
will not prevent the target from receiving further events in the
gesture unless it is the initial ACTION_DOWN event.

Change-Id: Ied8d531dfec7009a4124ed670b1700753c3f9caa
 2010-09-13 18:11:08 -07:00
Romain Guy
e8c1c539ca Merge "Document the implementation of saveLayer()." 2010-09-13 18:04:18 -07:00
Romain Guy
1c740bce8a Document the implementation of saveLayer(). 
The implementation is simple but tricky. Leave explanations to my
future self so that I don't invent a time machine to come back to
now and slap my self.

This change also simplifies the way the GL blending function is
chosen when compositing a layer. It reuses existing OpenGLRenderer
APIs and is easier to understand.

Change-Id: I1b9cf8c5d51e09836d85b8cf157a1c284aa65c59
 2010-09-13 18:03:21 -07:00
Romain Guy
82e73f23c4 Merge "Forgot the return value..." 2010-09-13 17:32:58 -07:00
Romain Guy
81ab046a11 Forgot the return value... 
Change-Id: Iccf369a613c1cf83f3e948460c567291b084fad2
 2010-09-13 17:32:34 -07:00
Romain Guy
dee94fa957 Merge "Fix rendering issue with layers intersecting the clip rect." 2010-09-13 17:29:08 -07:00
Romain Guy
8411f336c7 Fix rendering issue with layers intersecting the clip rect. 
Change-Id: Icbe35194fa219ef13ce639d33631235f8d7df3d7
 2010-09-13 17:27:57 -07:00
Dianne Hackborn
6421ae7eff am 5251c800: Merge "Fix potential crash in sync." into gingerbread 
Merge commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d' into gingerbread-plus-aosp

* commit '5251c800c93c6f6fd473475c36b8ab3b360c1e4d':
  Fix potential crash in sync.
 2010-09-13 17:26:34 -07:00
Adam Powell
727d593d25 am 59a29f4a: (-s ours) am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 
Merge commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c'

* commit '59a29f4a6ca7f6e177509f4c86a8ab968faf4f2c':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
 2010-09-13 17:25:04 -07:00
Irfan Sheriff
5c8e3b5e49 am b62bc963: am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread 
Merge commit 'b62bc9632250f77d29baca54419442c8d3c965ef'

* commit 'b62bc9632250f77d29baca54419442c8d3c965ef':
  Fix statusbar display of wifi signalstrength
 2010-09-13 17:24:49 -07:00
Dianne Hackborn
5251c800c9 Merge "Fix potential crash in sync." into gingerbread 2010-09-13 17:21:04 -07:00
Dianne Hackborn
527c02838b am a0eb56ac: Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 
Merge commit 'a0eb56ac59751ab7fb060980e14edcacca439635' into gingerbread-plus-aosp

* commit 'a0eb56ac59751ab7fb060980e14edcacca439635':
  Work on issue #2991868: A toast pops up informing users...
 2010-09-13 17:17:19 -07:00
Dianne Hackborn
a0eb56ac59 Merge "Work on issue #2991868: A toast pops up informing users..." into gingerbread 2010-09-13 17:14:00 -07:00
Dianne Hackborn
50addddba5 Fix potential crash in sync. 
Change-Id: I523d8faa24b7ba57dcc09cbe91b5cb91d9f6f262
 2010-09-13 17:12:51 -07:00
Dianne Hackborn
8c5755aab5 Work on issue #2991868: A toast pops up informing users... 
...that Market took over the screen after signing into a Google account

Don't warn the user about a new activity coming up on an activity that
is finishing.

Change-Id: I573073139d42a485473d0c8a7df450c1a23c35c3
 2010-09-13 16:58:59 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master 
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
 2010-09-13 16:56:10 -07:00
Adam Powell
59a29f4a6c am b07c0789: Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 
Merge commit 'b07c078921fb917d33075a63d77fdf98221e2bac' into gingerbread-plus-aosp

* commit 'b07c078921fb917d33075a63d77fdf98221e2bac':
  DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue
 2010-09-13 16:11:55 -07:00
Adam Powell
b07c078921 Merge "DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue" into gingerbread 2010-09-13 16:09:51 -07:00
Adam Powell
57361ef001 DO NOT MERGE Fix bug 2995887 - overscroll effect initialization issue 
Change-Id: I03cc18616dec05eb9e0383dc02371366c70cc12b
 2010-09-13 16:08:35 -07:00
Irfan Sheriff
b62bc96322 am ab2ac887: Merge "Fix statusbar display of wifi signalstrength" into gingerbread 
Merge commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8' into gingerbread-plus-aosp

* commit 'ab2ac887751c41ddb34daa97ea4da07b08cc2ba8':
  Fix statusbar display of wifi signalstrength
 2010-09-13 16:08:12 -07:00
Irfan Sheriff
ab2ac88775 Merge "Fix statusbar display of wifi signalstrength" into gingerbread 2010-09-13 16:05:06 -07:00
Robert Greenwalt
fa974c5909 Fix statusbar display of wifi signalstrength 
When turning a 1d array into a 2d, be sure and adjust length-checks.
bug:2995809

Change-Id: I9ff53f75958ea7808eb9f44bc05497e86f1807a2
 2010-09-13 15:53:26 -07:00
Vasu Nori
d31211fd46 sql statement with syntax errors can leave database lock in bad state 
bug:2995940
Change-Id: I8571943cb278bbc622b04549478badb56e5f7573
 2010-09-13 15:47:49 -07:00
Jaikumar Ganesh
1510770165 Add missing return statement. 
Change-Id: Iee4ee8a62c5c85176c457bd674ac25acdf978ae9
 2010-09-13 15:24:01 -07:00
Jaikumar Ganesh
20c8f47330 resolved conflicts for merge of 0522f5e9 to master 
Change-Id: Ie0a7ece33dced1042948087053e49665f6235fc2
 2010-09-13 14:57:59 -07:00
Shimeng (Simon) Wang
b6b81f5f39 am 4de4f09e: (-s ours) am fbd26467: Merge "DO NOT MERGE" into gingerbread 
Merge commit '4de4f09e8ed95255c1077cfbbaf018877221455d'

* commit '4de4f09e8ed95255c1077cfbbaf018877221455d':
  DO NOT MERGE
 2010-09-13 14:43:16 -07:00