39504 Commits

Author SHA1 Message Date
Dianne Hackborn
eb3517fb6c am 74ab5119: Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null." into honeycomb
* commit '74ab5119f8a9ba3a2a4ee6f2685c39973651d90a':
  DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-09 13:57:19 -08:00
Dianne Hackborn
a9d8a69a04 am 9aac2e2b: Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread
* commit '9aac2e2b9541c424ca02483631b08949f0e90c8c':
  Referencing of "r.record.name" is occured, when "r.record" is null.
2011-01-09 13:56:07 -08:00
Dianne Hackborn
74ab5119f8 Merge "DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null." into honeycomb 2011-01-09 13:55:56 -08:00
lge-aosp
ea278a945a DO NOT MERGE Referencing of "r.record.name" is occured, when "r.record" is null.
Change-Id: I0338c85b562a224d2c478112937fd62d2208e7aa
2011-01-09 13:54:53 -08:00
Dianne Hackborn
9aac2e2b95 Merge "Referencing of "r.record.name" is occured, when "r.record" is null." into gingerbread 2011-01-09 13:53:53 -08:00
Jason Sams
67e3d206ca Hide and delete some code that should not be public.
Change-Id: Ibe201c235fc81ef1fecb120d6049d6e56222462c
2011-01-09 13:49:31 -08:00
Jim Miller
c50dcea78c am e695bdde: Merge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]" into honeycomb
* commit 'e695bddefa9a8121e661d2c87ffe0585088a2ebf':
  Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]
2011-01-09 13:49:04 -08:00
Jim Miller
e695bddefa Merge "Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]" into honeycomb 2011-01-09 13:47:29 -08:00
Chris Tate
69f8d3c667 am bbff7ed4: DO NOT MERGE : Ensure that the first post-restore backup pass is correct
* commit 'bbff7ed44b353ff299b900a1ff50812a082206f0':
  DO NOT MERGE : Ensure that the first post-restore backup pass is correct
2011-01-09 13:31:23 -08:00
Dianne Hackborn
7c4f44f50f am febbf6e7: Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb
* commit 'febbf6e7f87900b479fbed31ab1e0486caeb281d':
  DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...
2011-01-09 13:26:36 -08:00
Adam Powell
53dd9f348b am 353634a1: Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb
* commit '353634a1aaf20c974cae390d7fd263ffc9dabe21':
  Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme.
2011-01-09 13:24:37 -08:00
Dianne Hackborn
febbf6e7f8 Merge "DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think..." into honeycomb 2011-01-09 13:24:17 -08:00
Jim Miller
b450a65c1c Fix 3330653: Update lockscreen layouts to match latest mocks [DO NOT MERGE]
This change list:

- simplifies the UI design to reduce the number of
on-screen items by combining Alarm status with the date line.

- updates many of the layout files to match closer to the
final design.

- Simplifies the logic for showing Status1 info. It's now
more predictable and robust.

- updates the layout for tablets

- contains a modified alpha to work well with different backgrounds
(Tested: white, gray, and dark backgrounds)

- updates the tablet icons to something closer to the final size.

Manual merge from Change-Id: Ifb349dfa778e9c91b0649c8d95229607be5af8e5

Change-Id: Ia2a9a2d285102d0208b3a7fcead58d6454d116ae
2011-01-09 13:24:00 -08:00
Adam Powell
353634a1aa Merge "Update progress/seek bar assets. Add indeterminate horizontal progress bars for holo theme." into honeycomb 2011-01-09 13:22:22 -08:00
Adam Powell
a50ff3847e Update progress/seek bar assets. Add indeterminate horizontal progress
bars for holo theme.

Change-Id: I86bb6af1e26727d18b24d5a5378cc9d1b431fc0e
2011-01-09 13:21:30 -08:00
Dianne Hackborn
1f22d2a31a DO NOT MERGE Fix issue #3333958: Package Manager can sometimes mistakenly think...
...an app is disabled!

Ouch.

Change-Id: I45dc2beef4e413fd447d905632901fadd924cb6e
2011-01-09 13:15:30 -08:00
Dianne Hackborn
cfe76038dc am 6d175c72: Merge "Merge commit \'690d20bb53ba2485f59d128b365eff991d5cc3e6\' into manualmerge" into honeycomb
* commit '6d175c727e0e671eb9a710b9d1fc8e9d646944e3':
  Fix issue # 3227963: SecurityException: Neither user 10023 nor...
2011-01-09 13:09:24 -08:00
Dianne Hackborn
6d175c727e Merge "Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge" into honeycomb 2011-01-09 13:07:15 -08:00
Chris Tate
9b1bd2c7d1 am 6ec91731: DO NOT MERGE : Permission fix: don\'t require BACKUP perm for self-restores
* commit '6ec91731cbf6ee1a9a914d341fab9567d1599018':
  DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
2011-01-09 13:04:01 -08:00
Chris Tate
bbff7ed44b DO NOT MERGE : Ensure that the first post-restore backup pass is correct
Some restore passes bring an ancestral dataset to the application, but
others instead act to bring an app back into sync with its own most-
recently-saved data.  In the latter case the state file written by the
app after the restore is a correct basis for generating future backup
deltas, but in the former case it is not.

The app should not be required to distinguish between these cases;
the framework has all the information necessary to handle the saved
state correctly following any flavor of restore operation.  This
patch makes the Backup Manager properly cause a full backup pass
following an ancestral-dataset restore.  After a current-set
restore the saved state file is an accurate description for
purposes of continued backup operations, so is preserved.

(Cherrypick from master to gingerbread)

Change-Id: I4bc4e8782a168ecc0795107a340bdbb35060730e
2011-01-09 13:01:45 -08:00
Chris Tate
6ec91731cb DO NOT MERGE : Permission fix: don't require BACKUP perm for self-restores
The public API is not supposed to require the BACKUP permission in order
for an application to restore its own last-known-good backup data.  However,
as currently implemented, BackupManager.requestRestore() [the public API
in question] depends on private Backup Manager methods that *do* enforce
that permission.  The net result is that the method cannot be successfully
used by third party applications: it will throw an exception if attempted.
This CL restructures the permission checking involved.

First, the underlying beginRestoreSession() operation can now be passed a
'null' transport name; if this is done, then the restore session is begun
on whatever the currently-active transport is.  Looking up the name of the
active transport is one of the permission-guarded actions that was required
with the initial implementation.

Second, a package name can now be passed to beginRestoreSession().  If
this is done, then the restore session can only be used to perform a
single-package restore of that one application.  The BACKUP permission is
not required if the caller is tying the restore to its own package name.

In combination, these changes permit BackupManager.requestRestore() to
function without the calling app needing to hold any special permission.
The no-permission case is intentionally quite narrow:  the caller must
hold the permission unless they both (a) pass 'null' for the transport
name, thereby accepting whatever the currently active transport is, and
(b) pass their own package name to restrict the restore session only
to their own app.

External bug http://code.google.com/p/android/issues/detail?id=10094
Internal bug 3197202

(Cherrypick from master to gingerbread)

Change-Id: Ie20b0bd2420345ce6eda178f854680b558f6372a
2011-01-09 12:49:47 -08:00
lge-aosp
c712204d91 Referencing of "r.record.name" is occured, when "r.record" is null.
Change-Id: I625e45923a7fd9f4ac8eb434ed07d452f8e1e0b6
2011-01-09 12:38:34 -08:00
Michael Chan
0a720eeb8b am ae34a7cd: Merge "b/3279789 Fixed NPE in CalendarUtils.onQueryComplete" into honeycomb
* commit 'ae34a7cd2d65fb89f1d4bffd6316d8b817a45da5':
  b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
2011-01-09 12:13:57 -08:00
Michael Chan
ae34a7cd2d Merge "b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete" into honeycomb 2011-01-09 12:12:26 -08:00
Michael Chan
aa5bb98120 b/3279789 Fixed NPE in CalendarUtils$TimeZoneUtils$AsyncTZHandler.onQueryComplete
Null cursor was returned from query

Change-Id: I76a7d710b0764f52ed6ced23792717feb7b6ae08
2011-01-09 12:11:02 -08:00
Amith Yamasani
2c4bb9921d am fe53015b: Merge "Update default for auto-brightness." into honeycomb
* commit 'fe53015b0bfe0a26fa62c056b02fdfe399cff904':
  Update default for auto-brightness.
2011-01-09 12:10:50 -08:00
Alex Sakhartchouk
f2105d7a74 am 6c191768: Merge "Adding comments to the renderscript program classes." into honeycomb
* commit '6c191768f112d17f926e9b3bf5ed581af7273cb8':
  Adding comments to the renderscript program classes.
2011-01-09 12:08:44 -08:00
Amith Yamasani
fe53015b0b Merge "Update default for auto-brightness." into honeycomb 2011-01-09 12:07:17 -08:00
Alex Sakhartchouk
6c191768f1 Merge "Adding comments to the renderscript program classes." into honeycomb 2011-01-09 12:07:00 -08:00
Dianne Hackborn
4f05220d10 Merge commit '690d20bb53ba2485f59d128b365eff991d5cc3e6' into manualmerge 2011-01-09 11:59:12 -08:00
Dianne Hackborn
412ebd6f9d am 433863b1: Fix issue #3333958: Package Manager can sometimes mistakenly think...
* commit '433863b1085248a8fdc9bcd0ac8501cc6a7b8ace':
  Fix issue #3333958: Package Manager can sometimes mistakenly think...
2011-01-09 11:49:59 -08:00
Dianne Hackborn
433863b108 Fix issue #3333958: Package Manager can sometimes mistakenly think...
...an app is disabled!

Ouch.

Change-Id: I5788c5f8edfe2a0d6f4f0f3359e1742f8ed8d98e
2011-01-09 11:46:27 -08:00
Dianne Hackborn
95db1cfc74 am cd23823d: Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread
* commit 'cd23823d4f533431c76baa104eb50b7803b3b391':
  Fix issue # 3227963: SecurityException: Neither user 10023 nor...
2011-01-09 11:44:17 -08:00
Dianne Hackborn
cd23823d4f Merge "Fix issue # 3227963: SecurityException: Neither user 10023 nor..." into gingerbread 2011-01-09 11:38:15 -08:00
Alex Sakhartchouk
df27202deb Adding comments to the renderscript program classes.
Change-Id: I989575951df1218c1e753dfa12193d560266bf11
2011-01-09 11:34:03 -08:00
Dmitri Plotnikov
5af299b26f am bdd8d17d: Merge "Fixed the waitForLoader method." into honeycomb
* commit 'bdd8d17d81c4ef41a2ae82c7f73ecff6b48f493e':
  Fixed the waitForLoader method.
2011-01-09 11:29:19 -08:00
Dmitri Plotnikov
bdd8d17d81 Merge "Fixed the waitForLoader method." into honeycomb 2011-01-09 11:27:25 -08:00
Xavier Ducrohet
6721adb67d am 894f0e4c: Merge "LayoutLib: add a few misc implementations." into honeycomb
* commit '894f0e4c68f68ae06d7bab504284517af63852c8':
  LayoutLib: add a few misc implementations.
2011-01-09 11:06:58 -08:00
Xavier Ducrohet
03e497e90b am 00407dd6: Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb
* commit '00407dd6d469fa8dea008132179d2828dea49c75':
  LayoutLib: finish Typeface and unload them in dispose.
2011-01-09 11:06:54 -08:00
Xavier Ducrohet
05e3ea1f1e am ac736d3a: Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb
* commit 'ac736d3a7915becda5d7366f440aab99972e6b64':
  LayoutLib: remove fade in/out transition on moveChild.
2011-01-09 11:06:51 -08:00
Dmitri Plotnikov
59d8edd09d Fixed the waitForLoader method.
The reason we need a separate latch is that
AsyncTask will post onPostExecute/onCancelled
_after_ executing mFuture.get().  The previous
implementation would only wait for mFuture.get()
to complete and not the entire task.

Change-Id: I96964591980965148eb09af38b5838bfa5d28277
2011-01-09 11:05:50 -08:00
Xavier Ducrohet
894f0e4c68 Merge "LayoutLib: add a few misc implementations." into honeycomb 2011-01-09 11:05:23 -08:00
Xavier Ducrohet
00407dd6d4 Merge "LayoutLib: finish Typeface and unload them in dispose." into honeycomb 2011-01-09 11:05:20 -08:00
Xavier Ducrohet
ac736d3a79 Merge "LayoutLib: remove fade in/out transition on moveChild." into honeycomb 2011-01-09 11:05:15 -08:00
Louis Huemiller
585cd4f78c Hardware Composer Commit Points Benchmark
Change-Id: Ie997d13559c0e4e9dc3babfe92ca1acacef2a549
2011-01-09 10:59:31 -08:00
Chet Haase
3ecf835e95 am 2954cd91: Add start/endTransition events for CHANGE transitions
* commit '2954cd91ab1fef14c8aed5173c160ce00558cd3a':
  Add start/endTransition events for CHANGE transitions
2011-01-09 10:16:09 -08:00
Chet Haase
2954cd91ab Add start/endTransition events for CHANGE transitions
There was already a mechanism for sending out events for LayoutTransition
when animations started or ended, but the implementation only sent out events
for the appearing/disappearing animations. This fix provides callbacks to
listeners for the CHANGE_APPEARING and CHANGE_DISAPPEARING transitions, too.

Change-Id: Icfb8cc1c20d2df3e4a817255e96c9d0e94c1d8c4
2011-01-09 09:43:39 -08:00
Kenny Root
a657f11397 am b0512c37: Merge "Fix check for required features" into honeycomb
* commit 'b0512c372587f366f0b0bd859b22a344a5d5a520':
  Fix check for required features
2011-01-09 07:16:50 -08:00
Kenny Root
b0512c3725 Merge "Fix check for required features" into honeycomb 2011-01-09 07:15:26 -08:00
Dianne Hackborn
5ef0a153f0 am 247fe74c: Implement issue # 3255887 could CursorLoader offer...
* commit '247fe74c934cb3fba85aae7e051a8044f460fb11':
  Implement issue # 3255887 could CursorLoader offer...
2011-01-08 18:27:24 -08:00