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

35951 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Scott Main
ab3d69f6d5 Merge "docs: update homepage for GB" into gingerbread 2010-11-05 15:02:39 -07:00
Jeff Brown
a79cd0b7fa Merge "Rename the locked meta key constants for clarity." 2010-11-05 15:01:43 -07:00
Vasu Nori
eb0699bacd Merge "fix broken build" 2010-11-05 14:49:37 -07:00
Vasu Nori
b642518e54 fix broken build 
Change-Id: If1e5639f48d5155e141bce4bf5deef9de5668c27
 2010-11-05 14:47:59 -07:00
Scott Main
0bd1685bc8 docs: update homepage for GB 
Change-Id: I0db90c0f42a47a62f2570f2ea835e38ab7fcd5b0
 2010-11-05 14:37:47 -07:00
Mike Lockwood
1a9be66e12 Merge "MediaScanner: Fix mismatch between internal and external file paths." 2010-11-05 14:32:33 -07:00
Mike Lockwood
250528e5b2 MediaScanner: Fix mismatch between internal and external file paths. 
Change-Id: If2fac90a466c4d63fc90f96e91733c9e9ca14680
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-11-05 17:31:03 -04:00
Gilles Debunne
70dee40dbf Merge "Revert "Rationalized the single/multiple line initialization in TextViews."" 2010-11-05 14:21:28 -07:00
Dianne Hackborn
c5b2e2d86a Merge "Fix issue #3163426: Screen corruption when using the watermark feature" 2010-11-05 14:06:59 -07:00
Jean-Baptiste Queru
3442611ee1 am 5580e44c: Merge "Support changing style parent in overlays" 
* commit '5580e44c250944f5cd011b2682eea5cc2de9706c':
  Support changing style parent in overlays
 2010-11-05 14:05:41 -07:00
Kenny Root
8806fc729b am 70fc04c8: Reorganize PackageManager dump to avoid NPE 
* commit '70fc04c84db8f99ac2ac60fd9719b91057aacc9b':
  Reorganize PackageManager dump to avoid NPE
 2010-11-05 13:58:20 -07:00
Robert Ly
a27fc901d8 am 47e43feb: Doc change: Proguard tool 
* commit '47e43febdd8ba83c333c9c98ca6a8c0bda421305':
  Doc change: Proguard tool
 2010-11-05 13:58:12 -07:00
Hiroshi Lockheimer
01128df3c4 am ce22d608: Merge "allow all 4 orientations" into gingerbread 
* commit 'ce22d608733953e367a590efd9c7656a68ffc24d':
  allow all 4 orientations
 2010-11-05 13:58:04 -07:00
Scott Main
3de641cbb9 am 4ebbfa8a: Merge "Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating." into gingerbread 
* commit '4ebbfa8a44da790eb13e7e88314bd0a648f8b891':
  Doc change: Updating and restructuring the NDK section for GB. Filenames for new NDK packages still need updating.
 2010-11-05 13:57:52 -07:00
Scott Main
4da6efc8a3 am 46151652: Merge "fix xlarge support in aapt for gingerbread" into gingerbread 
* commit '46151652b8dc562f4a3332e1d12fa799e3638ea8':
  fix xlarge support in aapt for gingerbread
 2010-11-05 13:57:41 -07:00
Scott Main
04856d99f8 am 6e88c84c: docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it\'s only for system apps bug: 3128020 
* commit '6e88c84cbe0a07cb8c7b9ea23d1434bcf2e2a457':
  docs: remove allowClearUserData from <application> manifest doc and clarify in javadocs that it's only for system apps bug: 3128020
 2010-11-05 13:57:31 -07:00
Gilles Debunne
f95449dc38 Revert "Rationalized the single/multiple line initialization in TextViews." 
This reverts commit 10644106b819acad4f88c3882d5688638951728c.

Conflicts:

	core/java/android/widget/TextView.java

Change-Id: I597314363f6ee06dbc475583ffe5dcc7eb543f88
 2010-11-05 13:54:25 -07:00
Dianne Hackborn
ed7bfbf6c8 Fix issue #3163426: Screen corruption when using the watermark feature 
Change-Id: I23f76f04fb52bb272eccbbcc55606c09404c6ca9
 2010-11-05 13:45:10 -07:00
Daniel Sandler
e8865178e5 Merge "Show date in system bar." 2010-11-05 13:32:33 -07:00
Daniel Sandler
3b476abca8 Show date in system bar. 
Bug: 2996123
Change-Id: If2f588defaa4c27bf6010e14c946c5ab2894e1db
 2010-11-05 16:31:03 -04:00
Jeff Brown
51e7fe7545 Rename the locked meta key constants for clarity. 
Also added some tests for LED setting.

Change-Id: I3fd86322afd07ae8de52d1ccbc2fae2c6d586641
 2010-11-05 13:27:35 -07:00
Dan Bornstein
06a42367ce am 10a43393: am 265acc50: am 05cc2d63: (-s ours) This class no longer exists. 
* commit '10a433937895bff0d84f439a20a36fff97651cfd':
  This class no longer exists.
 2010-11-05 13:12:53 -07:00
Dan Bornstein
ffdf487b6f am 73cd0c39: am 7dbeb24a: This class no longer exists. 
* commit '73cd0c39bb1289704df3f3266ecedd3ed561d48c':
  This class no longer exists.
 2010-11-05 13:12:48 -07:00
Jim Miller
04e0c49092 Merge "Fix 3165868: Fix stall in state machine logic in WaveView" 2010-11-05 13:07:45 -07:00
Jim Miller
ec6ac82a29 Fix 3165868: Fix stall in state machine logic in WaveView 
It was possible for the state machine to get stuck when
user interaction and animations both completed before success
was detected.  This fixes the problem by explicitly advancing
the state machine when an up event is detected.

Change-Id: I802e3f1bb35aeab7a0d6f64e85acaa6980b9d65a
 2010-11-05 13:05:27 -07:00
shared_user android-merger-prebuild
ce0d9253e5 Merge commit '5de6d7a162f7b207e48a9078b9d0fe2700044976' 2010-11-05 13:03:37 -07:00
Dianne Hackborn
2332a74c61 Merge "Adjust window animations to better match UX spec." 2010-11-05 12:52:19 -07:00
Vasu Nori
1a33a09ec2 Merge "Let cachefull-warning be under SQLiteDebug.DEBUG_SQL_CACHE flag" 2010-11-05 12:11:57 -07:00
Daniel Sandler
1af1121772 Merge "Restore user-accessible lights-out control." 2010-11-05 12:11:48 -07:00
Daniel Sandler
06e6630a46 Restore user-accessible lights-out control. 
Current system area gestures:

       tap - no-op (bug 3114340)
  swipe up - open system panel
swipe down - lights out
long press - lights out (bug 3134973)

The enter/exit animations have been tweaked to reinforce
this, particularly the swipe down for lights out. (Swiping
up to exit lights out will work, as will any kind of tap in
the lights-out "curtain".)

Change-Id: Ie027d7a0e86a402d06a8a368a5a43050a6bb9e58
 2010-11-05 15:04:35 -04:00
Adam Powell
fe4782393e Merge "Fix bug 3167945 - list selection mode should persist across rotations" 2010-11-05 19:03:24 +00:00
Kenny Root
70fc04c84d Reorganize PackageManager dump to avoid NPE 
versionCode and mVersionName were added recently but ps.pkg can be null
in some situations. Move them to where it will check before
dereferencing it.

Bug: 3152896
Change-Id: If992a1f29ac7b8f595f847b7743fd2374662bb6e
 2010-11-05 11:59:45 -07:00
Gil Dobjanschi
c006e8ef64 Added an export method without codec parameters. 
Change-Id: If0a1c34f2266c441cd16c46da5c07ab1a509314b
 2010-11-05 11:59:15 -07:00
Romain Guy
8160345205 Merge "Fix documentation HTML." 2010-11-05 18:58:21 +00:00
Vasu Nori
7301a23fb2 Let cachefull-warning be under SQLiteDebug.DEBUG_SQL_CACHE flag 
This warning doesn't really matter much. If a developer wants to
debug the cache usage, it can be done by turning on this flag.
adb bugreport also displays cachestats - which can be used as a debugging tool.

Change-Id: Ied173714d535c271133247ee4768f86d3be359cf
 2010-11-05 11:55:57 -07:00
Adam Powell
a0eeeac820 Fix bug 3167945 - list selection mode should persist across rotations 
Modal multi-choice mode action modes will now be restarted when
restoring instance state provided that the application has set a
multi-choice mode callback before instance state is restored. This
matches other list state restoration behavior with adapters.

Change-Id: I8e96e079faa3a086d3d4480d65b8c53a60f4c0ea
 2010-11-05 11:55:05 -07:00
Romain Guy
f989944c90 Fix documentation HTML. 
Change-Id: Ic5380867a4d77d0b4724ca3bde091ddea89fb20d
 2010-11-05 11:45:53 -07:00
Cary Clark
4debfcb3d4 Don't draw the selection pointer on long press. 
bug:3169375
Change-Id: I76cedf0951213c1ee869ccbaa97938f0c6385942
 2010-11-05 14:43:10 -04:00
Amith Yamasani
14aa0592e6 Merge "Adjust default screen timeout." 2010-11-05 18:26:27 +00:00
Amith Yamasani
0038931043 Adjust default screen timeout. 
Bug: 3165933
 2010-11-05 11:22:21 -07:00
James Dong
32af3a2f56 Merge "Use meta data in the media recording framework" 2010-11-05 18:18:30 +00:00
Vasu Nori
d145ca7669 Merge "address couple of review comments" 2010-11-05 18:12:04 +00:00
Vasu Nori
1cde3fbf8f address couple of review comments 
by reviewers on previous CLs

Change-Id: Ifc4529b367651f68fbb4117e449c70bfd9fae462
 2010-11-05 11:02:52 -07:00
Dianne Hackborn
8fe044a3a9 Adjust window animations to better match UX spec. 
This introduces new resources for interpolators that match the
types received from UX, and uses them appropriately in the animations.

Change-Id: I68c435ff1c8845c7854fa78f24e33157659b16d1
 2010-11-05 10:50:58 -07:00
Gloria Wang
91460d7f49 Merge "Add support for WV DRM" 2010-11-05 17:45:26 +00:00
Daniel Sandler
aac9e0df28 Merge "Rotation lock bugfix." 2010-11-05 17:41:35 +00:00
Gloria Wang
c2c22e7e20 Add support for WV DRM 
Change-Id: I0408c5e0a488f112a84337b21b0cd4613a4da461
 2010-11-05 10:33:58 -07:00
Robert Ly
47e43febdd Doc change: Proguard tool 
Change-Id: I98602bf61a971f00cbd41284b457bcb2c15ea441
 2010-11-05 10:14:26 -07:00
Tom O'Neill
28e3f10170 Remove inappropriate conversion of IOException to AssertionError 
An IOException is a recoverable condition, and AssertionError should be
used for non-recoverable conditions.

Fixes b/3169361

Change-Id: Ie71a537293e01ffb49c5f535412e2631e27c84c8
 2010-11-05 10:14:24 -07:00
Gilles Debunne
55ea91f217 Merge "Created missing assets by up/down scaling the one in other dpi" 2010-11-05 16:51:18 +00:00