OSDN Git Service

android-x86/frameworks-base.git
11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 22 Apr 2013 20:00:11 +0000 (20:00 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 22 Apr 2013 19:58:28 +0000 (19:58 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Move idle handling from ActivityStack to Supervisor"
Craig Mautner [Mon, 22 Apr 2013 18:01:02 +0000 (18:01 +0000)]
Merge "Move idle handling from ActivityStack to Supervisor"

11 years agoMove idle handling from ActivityStack to Supervisor
Craig Mautner [Mon, 22 Apr 2013 17:55:53 +0000 (10:55 -0700)]
Move idle handling from ActivityStack to Supervisor

Along with mFinishingActivities, mStartingUsers and
mCancelledThumbnails.

Change-Id: Ia354225d72e694b7ac68b0869fcab903a3d06436

11 years agoMerge "Refactoring Activity Manager."
Craig Mautner [Mon, 22 Apr 2013 16:32:04 +0000 (16:32 +0000)]
Merge "Refactoring Activity Manager."

11 years agoRefactoring Activity Manager.
Craig Mautner [Mon, 22 Apr 2013 15:58:54 +0000 (08:58 -0700)]
Refactoring Activity Manager.

Mid-course corrections.

- Simplify ActivityStackSupervisor and ActivityStack constructors to
get passed parameters from ActivityManagerService.
- Store WindowManagerService referecne locally in
ActivityStackSupervisor and ActivityStack.
- Rename getTopStack to getFocusedStack in ActivityStackSupervisor
and ActivityManagerService.
- Move mWaitingActivityLaunched/reportActivityLaunchedLocked and
mWaitingActivityVisible/reportActivityVisibleLocked from ActivityStack
to ActivityStackSupervisor.
- Moved reportResumedActivity to ActivityStackSupervisor.
- Added a Handler to ActivityStackSupervisor. Will populate it on next
CL.

Change-Id: I1bbe5eb737c5cac6b896bc9748f329891e94d00f

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 15:55:44 +0000 (08:55 -0700)]
Import translations. DO NOT MERGE

Change-Id: Idaf684b05e56ffa3a1085fc1a5bbc141fbd55f86
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Apr 2013 15:45:25 +0000 (08:45 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia0c52e6aef99399156b84920f185d03b55f746b1
Auto-generated-cl: translation import

11 years agoam 076e1f4c: am abc2763e: Merge "KeyEvent: update comment"
Michael Wright [Sun, 21 Apr 2013 05:48:08 +0000 (22:48 -0700)]
am 076e1f4c: am abc2763e: Merge "KeyEvent: update comment"

* commit '076e1f4c560df7db54755b006acbea9b6eba0b76':
  KeyEvent: update comment

11 years agoam abc2763e: Merge "KeyEvent: update comment"
Michael Wright [Sun, 21 Apr 2013 05:43:56 +0000 (22:43 -0700)]
am abc2763e: Merge "KeyEvent: update comment"

* commit 'abc2763e4587c3326d160f25666e933cc6888884':
  KeyEvent: update comment

11 years agoMerge "KeyEvent: update comment"
Michael Wright [Sun, 21 Apr 2013 05:34:28 +0000 (05:34 +0000)]
Merge "KeyEvent: update comment"

11 years agoam 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren...
Chet Haase [Sun, 21 Apr 2013 04:37:23 +0000 (21:37 -0700)]
am 371d4ccc: am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev

* commit '371d4cccde56ec4d26e51f8e82ef68f196169a3d':
  Fix quickReject logic to account for setClipChildren() setting

11 years agoam 0b97c8cd: am 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am...
Dirk Dougherty [Sun, 21 Apr 2013 04:37:20 +0000 (21:37 -0700)]
am 0b97c8cd: am 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit '0b97c8cd0ff41a9c122cb83a1b0b33bd150cb7ff':
  Doc change: updates for tablet checklist.

11 years agoam bf67c6bb: am b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a...
Selim Gurun [Sun, 21 Apr 2013 04:37:18 +0000 (21:37 -0700)]
am bf67c6bb: am b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit 'bf67c6bbd94f6401344777daa6ef795ddd560218':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 20113c0b: am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am...
Selim Gurun [Sun, 21 Apr 2013 04:37:15 +0000 (21:37 -0700)]
am 20113c0b: am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '20113c0b4dc6f5d6bebaf3175bfc99ce89cc2388':
  Revert "Add a delimiter between scheme and host"

11 years agoam 0052e789: am 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d...
Geremy Condra [Sun, 21 Apr 2013 04:37:12 +0000 (21:37 -0700)]
am 0052e789: am 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '0052e7899fe60c7231bb4ae200904e17fac8804c':
  Add a delimiter between scheme and host

11 years agoam 4a84af89: am b322f994: Merge "Add new error code for Debug Context work." into...
Stephen Hines [Sun, 21 Apr 2013 04:37:10 +0000 (21:37 -0700)]
am 4a84af89: am b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev

* commit '4a84af896c830d6ef613d1baa607d472cf865073':
  Add new error code for Debug Context work.

11 years agoam e2155712: am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb...
Jeff Brown [Sun, 21 Apr 2013 04:37:07 +0000 (21:37 -0700)]
am e2155712: am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev

* commit 'e215571284006497cd917ade06cf2b9163564772':
  Revert all recent GLSurfaceView changes.

11 years agoam b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi ...
Fabrice Di Meglio [Sun, 21 Apr 2013 04:37:04 +0000 (21:37 -0700)]
am b241f60f: am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

* commit 'b241f60fe76677d106d472d4118d1e6959563331':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text

11 years agoam 0f70770b: am b5ec8c14: Change doc comment to match API change
Kenny Root [Sun, 21 Apr 2013 04:37:01 +0000 (21:37 -0700)]
am 0f70770b: am b5ec8c14: Change doc comment to match API change

* commit '0f70770be83b02c36262ad7e05ac5b2040de3fec':
  Change doc comment to match API change

11 years agoam 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for...
Christopher Tate [Sun, 21 Apr 2013 04:36:57 +0000 (21:36 -0700)]
am 353bd75b: am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev

* commit '353bd75bbab5904cc872364586acf7eb05b4e264':
  Provide SharedPreferences coherence guarantees for BackupAgent

11 years agoam 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans...
Victoria Lease [Sun, 21 Apr 2013 04:36:55 +0000 (21:36 -0700)]
am 7e170b63: am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev

* commit '7e170b632147da55f93864223419a9f7fa651410':
  do not attempt to parcel unknown ParcelableSpans

11 years agoam 5b00f558: am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should...
Dianne Hackborn [Sun, 21 Apr 2013 04:36:51 +0000 (21:36 -0700)]
am 5b00f558: am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev

* commit '5b00f5584a7894bb79f9ce369d88cea5d886ff22':
  Follow up on issue #8159072: Spinner widget should be RTL'ized

11 years agoam 70f30d21: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb...
Craig Mautner [Sun, 21 Apr 2013 04:36:49 +0000 (21:36 -0700)]
am 70f30d21: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev

* commit '70f30d217c49b12c209055230afec2ac412ae165':

11 years agoam 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting...
Chet Haase [Sun, 21 Apr 2013 04:34:59 +0000 (21:34 -0700)]
am 339ac854: Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev

* commit '339ac85483145972da010ad34cbcb29ed70cb822':
  Fix quickReject logic to account for setClipChildren() setting

11 years agoam 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am...
Dirk Dougherty [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am 16f654c9: am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit '16f654c963890e0ed134560a20f2a481ae4fc7d9':
  Doc change: updates for tablet checklist.

11 years agoam b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6...
Selim Gurun [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am b2d82bc0: am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit 'b2d82bc0ab0f201443a768e6a8b1636da370c690':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am...
Selim Gurun [Sun, 21 Apr 2013 04:34:55 +0000 (21:34 -0700)]
am 940718d8: am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '940718d8598e4b8da3009b46e8edba9d1dc6ed40':
  Revert "Add a delimiter between scheme and host"

11 years agoam 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a8...
Geremy Condra [Sun, 21 Apr 2013 04:34:54 +0000 (21:34 -0700)]
am 5f49fd86: am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '5f49fd866105cd8d5e7355d40d1268f4cc121ef7':
  Add a delimiter between scheme and host

11 years agoam b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev
Stephen Hines [Sun, 21 Apr 2013 04:34:54 +0000 (21:34 -0700)]
am b322f994: Merge "Add new error code for Debug Context work." into jb-mr2-dev

* commit 'b322f99476574546cad638ed8e2866ec106d51fc':
  Add new error code for Debug Context work.

11 years agoam a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
Jeff Brown [Sun, 21 Apr 2013 04:34:53 +0000 (21:34 -0700)]
am a937b8cb: Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev

* commit 'a937b8cb333d53cbbe8c0de7fb58854b77dcb3db':
  Revert all recent GLSurfaceView changes.

11 years agoam c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text...
Fabrice Di Meglio [Sun, 21 Apr 2013 04:34:53 +0000 (21:34 -0700)]
am c3d0a81a: Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

* commit 'c3d0a81a4a1809446bc1fa9abc9b5b74b01e676e':
  Fix bug #8656546 API REVIEW: android.text.bidi / android.text

11 years agoam b5ec8c14: Change doc comment to match API change
Kenny Root [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am b5ec8c14: Change doc comment to match API change

* commit 'b5ec8c145d467abbc6eaf3306a5f6725e348ceec':
  Change doc comment to match API change

11 years agoam 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent...
Christopher Tate [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am 18414c4d: Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev

* commit '18414c4db7a2cd7d7b872e4cd4583bc8b7a4fcc0':
  Provide SharedPreferences coherence guarantees for BackupAgent

11 years agoam bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
Victoria Lease [Sun, 21 Apr 2013 04:34:52 +0000 (21:34 -0700)]
am bcf3ec96: Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev

* commit 'bcf3ec96a46aacba58af62ed963ebf1c812c8179':
  do not attempt to parcel unknown ParcelableSpans

11 years agoam b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized...
Dianne Hackborn [Sun, 21 Apr 2013 04:34:51 +0000 (21:34 -0700)]
am b3bffa80: Merge "Follow up on issue #8159072: Spinner widget should be RTL\'ized" into jb-mr2-dev

* commit 'b3bffa8080c4b04285897d18f913cf6385b0e9e1':
  Follow up on issue #8159072: Spinner widget should be RTL'ized

11 years agoam c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
Craig Mautner [Sun, 21 Apr 2013 04:34:51 +0000 (21:34 -0700)]
am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev

* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
  Improve javadoc for rotationAnimation.

11 years agoMerge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev
Chet Haase [Sat, 20 Apr 2013 21:02:21 +0000 (21:02 +0000)]
Merge "Fix quickReject logic to account for setClipChildren() setting" into jb-mr2-dev

11 years agoam f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge...
Dirk Dougherty [Sat, 20 Apr 2013 19:11:49 +0000 (12:11 -0700)]
am f4f5757b: am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit 'f4f5757b68e3b0db10c77ac9fa81d6b4d7dd8435':
  Doc change: updates for tablet checklist.

11 years agoam 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change...
Dirk Dougherty [Sat, 20 Apr 2013 19:09:42 +0000 (12:09 -0700)]
am 014513ae: am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit '014513ae2974edd2e6102f618ca57423c543cb4f':
  Doc change: updates for tablet checklist.

11 years agoam 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for...
Dirk Dougherty [Sat, 20 Apr 2013 19:08:04 +0000 (12:08 -0700)]
am 00d20bd2: am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit '00d20bd293e75beb546ea446901cdead39180116':
  Doc change: updates for tablet checklist.

11 years agoam e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklis...
Dirk Dougherty [Sat, 20 Apr 2013 19:05:45 +0000 (12:05 -0700)]
am e0d5add7: am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit 'e0d5add782405fabe4d04b8eff00b565ea28a35f':
  Doc change: updates for tablet checklist.

11 years agoam 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into...
Dirk Dougherty [Sat, 20 Apr 2013 19:03:37 +0000 (12:03 -0700)]
am 3fd1a892: am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit '3fd1a8926ebfaaeccbaad86b7584fa534f725996':
  Doc change: updates for tablet checklist.

11 years agoam 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev
Dirk Dougherty [Sat, 20 Apr 2013 19:01:29 +0000 (12:01 -0700)]
am 94ca86e8: Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

* commit '94ca86e8a019225ff376e5683e87ee3a29713f05':
  Doc change: updates for tablet checklist.

11 years agoMerge "Doc change: updates for tablet checklist." into jb-mr1-dev
Dirk Dougherty [Sat, 20 Apr 2013 18:59:02 +0000 (18:59 +0000)]
Merge "Doc change: updates for tablet checklist." into jb-mr1-dev

11 years agoDoc change: updates for tablet checklist.
Dirk Dougherty [Tue, 16 Apr 2013 18:55:12 +0000 (11:55 -0700)]
Doc change: updates for tablet checklist.

Change-Id: I0339c0d3853467da435654940d0c55a31139b736

11 years agoMerge "Use correct stacks for testing changes."
Craig Mautner [Sat, 20 Apr 2013 17:38:58 +0000 (17:38 +0000)]
Merge "Use correct stacks for testing changes."

11 years agoUse correct stacks for testing changes.
Craig Mautner [Sat, 20 Apr 2013 17:34:33 +0000 (10:34 -0700)]
Use correct stacks for testing changes.

Fixes bug 8656057.

Change-Id: I88e48d28d240fced866a82bd3d49f8807300c0ad

11 years agoam 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0...
Selim Gurun [Sat, 20 Apr 2013 07:38:34 +0000 (00:38 -0700)]
am 8695b1af: (-s ours) am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '8695b1aff8b4ece642796ba7b2a5faa2b8a87d60':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am...
Selim Gurun [Sat, 20 Apr 2013 07:38:31 +0000 (00:38 -0700)]
am a6854579: am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit 'a68545796da33bd7fde616958e6abc7548d0a975':
  Revert "Add a delimiter between scheme and host"

11 years agoam 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am...
Selim Gurun [Sat, 20 Apr 2013 07:35:32 +0000 (00:35 -0700)]
am 5eebdb4a: am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '5eebdb4aa81f9e00e5f175bbebfec76cbde5b38d':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am...
Selim Gurun [Sat, 20 Apr 2013 07:35:29 +0000 (00:35 -0700)]
am fa1f7d21: am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit 'fa1f7d21e97b7225f1e7553abc0eebe06cc79367':
  Revert "Add a delimiter between scheme and host"

11 years agoam a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO...
Selim Gurun [Sat, 20 Apr 2013 07:32:27 +0000 (00:32 -0700)]
am a4653727: am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit 'a46537270ea4d519651157ab5503c02d4b43759d':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert...
Selim Gurun [Sat, 20 Apr 2013 07:32:24 +0000 (00:32 -0700)]
am 07c9c291: am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '07c9c2912d1c7e19336d575f40f42eb12626b322':
  Revert "Add a delimiter between scheme and host"

11 years agoam 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add...
Selim Gurun [Sat, 20 Apr 2013 07:28:40 +0000 (00:28 -0700)]
am 25e150a2: am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '25e150a2dd60a624ceecd5a5743a622fed32ef90':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimi...
Selim Gurun [Sat, 20 Apr 2013 07:28:37 +0000 (00:28 -0700)]
am a2b0b35e: am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit 'a2b0b35ed8f5c53866058f65ccf8c6e4aabef7af':
  Revert "Add a delimiter between scheme and host"

11 years agoam a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter...
Selim Gurun [Sat, 20 Apr 2013 07:25:09 +0000 (00:25 -0700)]
am a6ca0a6b: am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit 'a6ca0a6b2662e06cefcdbb5eb763e79f9b798018':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between...
Selim Gurun [Sat, 20 Apr 2013 07:25:06 +0000 (00:25 -0700)]
am 5fba3404: am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '5fba3404d3635fdd6bba9ba2fe7605851f07263f':
  Revert "Add a delimiter between scheme and host"

11 years agoam 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme...
Selim Gurun [Sat, 20 Apr 2013 07:22:04 +0000 (00:22 -0700)]
am 758dfa0c: am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '758dfa0c33c022ab3cdeb854ab507ad218d7fa3d':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and...
Selim Gurun [Sat, 20 Apr 2013 07:22:01 +0000 (00:22 -0700)]
am 3c4fa654: am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '3c4fa654801fcf51a92cefd62e28a020d39e08d0':
  Revert "Add a delimiter between scheme and host"

11 years agoam 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host
Selim Gurun [Sat, 20 Apr 2013 07:19:45 +0000 (00:19 -0700)]
am 9d47e7b6: am 7918cf4e: DO NOT MERGE Add a delimiter between scheme and host

* commit '9d47e7b6d40cc38fb1c638c991312a4217bfa333':
  DO NOT MERGE Add a delimiter between scheme and host

11 years agoam 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"
Selim Gurun [Sat, 20 Apr 2013 07:19:41 +0000 (00:19 -0700)]
am 679c8f68: am 38915fd4: Revert "Add a delimiter between scheme and host"

* commit '679c8f689f6799d143719bb8eb839e2640bf9d07':
  Revert "Add a delimiter between scheme and host"

11 years agoam 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a3...
Geremy Condra [Sat, 20 Apr 2013 06:59:00 +0000 (23:59 -0700)]
am 464be797: (-s ours) am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '464be7975fa8938d7ab427789faa5e222bc6ab2c':
  Add a delimiter between scheme and host

11 years agoam 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge...
Geremy Condra [Sat, 20 Apr 2013 06:19:20 +0000 (23:19 -0700)]
am 30504327: am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '30504327364a7ad641c09a227f7930b9fba91614':
  Add a delimiter between scheme and host

11 years agoam 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225d...
Geremy Condra [Sat, 20 Apr 2013 06:17:45 +0000 (23:17 -0700)]
am 62588d79: am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '62588d794602f6e42e8143169d8ef170589797a1':
  Add a delimiter between scheme and host

11 years agoam 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
Geremy Condra [Sat, 20 Apr 2013 06:14:38 +0000 (23:14 -0700)]
am 8f87c5d8: am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit '8f87c5d8d270bbc23738aea067b1bce2b7d08d02':
  Add a delimiter between scheme and host

11 years agoam ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
Geremy Condra [Sat, 20 Apr 2013 06:12:10 +0000 (23:12 -0700)]
am ed1e5a87: am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit 'ed1e5a8702b172298b25937b9feb0da08804d440':
  Add a delimiter between scheme and host

11 years agoMerge "Add new error code for Debug Context work." into jb-mr2-dev
Stephen Hines [Sat, 20 Apr 2013 04:48:18 +0000 (04:48 +0000)]
Merge "Add new error code for Debug Context work." into jb-mr2-dev

11 years agoam b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp
Geremy Condra [Sat, 20 Apr 2013 04:38:06 +0000 (21:38 -0700)]
am b7787a31: DO NOT MERGE Merge commit \'8225df00\' into bp

* commit 'b7787a317fc8bb163de04641a1423cd08324d4b8':
  Add a delimiter between scheme and host

11 years agoMerge "Revert all recent GLSurfaceView changes." into jb-mr2-dev
Jeff Brown [Sat, 20 Apr 2013 00:55:48 +0000 (00:55 +0000)]
Merge "Revert all recent GLSurfaceView changes." into jb-mr2-dev

11 years agoMerge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev
Fabrice Di Meglio [Sat, 20 Apr 2013 00:42:19 +0000 (00:42 +0000)]
Merge "Fix bug #8656546 API REVIEW: android.text.bidi / android.text" into jb-mr2-dev

11 years agoFix bug #8656546 API REVIEW: android.text.bidi / android.text
Fabrice Di Meglio [Fri, 19 Apr 2013 22:08:53 +0000 (15:08 -0700)]
Fix bug #8656546 API REVIEW: android.text.bidi / android.text

- clean BidiFormatter APIs

Change-Id: I8591ce3c3e8f2de4138698aa14ddb38b933de5e1

11 years agoRevert all recent GLSurfaceView changes.
Jeff Brown [Sat, 20 Apr 2013 00:13:33 +0000 (17:13 -0700)]
Revert all recent GLSurfaceView changes.

Several issues have been identified that will need to be
resolved carefully before we attempt to make similar changes.

1. Some applications make assumptions about the fact that all
   Runnables posted with queueEvent() will be executed before
   the next draw.  Because the Choreographer may post messages
   in the past (due at the frame time), these Runnables were
   not always running at the expected time.

2. Some applications apparently hijack the GLThread and try
   to run their own Looper on it.  This obviously won't work
   if we are already running one of our own.

We may need to add new rendering modes or target API checks
to provide an opportunity for applications to opt-in to the
changes in the future.

Bug: 8649804
Change-Id: I6289c3392a98cdbfaf28c7f4f7a8040f2138a3b4

11 years agoChange doc comment to match API change
Kenny Root [Fri, 19 Apr 2013 22:35:54 +0000 (15:35 -0700)]
Change doc comment to match API change

API change in f0d4777473f25847d67fc17fc082fada08cf678d didn't update a
comment to match which caused doc build failures.

Bug: 8603279
Change-Id: I475dc569747ae5d34b4267537370f18446386bb9

11 years agoMerge "Fix AOSP issue 9742: Documentation inconsistancy [sic] in AudioTrack"
Glenn Kasten [Fri, 19 Apr 2013 22:49:49 +0000 (22:49 +0000)]
Merge "Fix AOSP issue 9742: Documentation inconsistancy [sic] in AudioTrack"

11 years agoFix quickReject logic to account for setClipChildren() setting
Chet Haase [Fri, 19 Apr 2013 21:54:34 +0000 (14:54 -0700)]
Fix quickReject logic to account for setClipChildren() setting

The rendering code optimizes by rejecting drawing operations that
lie outside of the bounds of their views. This works in most
situations, but breaks down when containers have called
setClipChildren(false), because we reject drawing that is outside
of that container, but which should be drawn anyway.

Fix is to pass in the value of that flag to the DisplayList drawing
routines which take that flag into account when deciding whether
to quickReject any particular operation.

Issue #8659277 animation clipping

Change-Id: Ief568e4db01b533a97b3c5ea5ad777c03c0eea71

11 years agoMerge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev
Christopher Tate [Fri, 19 Apr 2013 22:34:01 +0000 (22:34 +0000)]
Merge "Provide SharedPreferences coherence guarantees for BackupAgent" into jb-mr2-dev

11 years agoMerge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev
Victoria Lease [Fri, 19 Apr 2013 22:33:42 +0000 (22:33 +0000)]
Merge "do not attempt to parcel unknown ParcelableSpans" into jb-mr2-dev

11 years agoMerge "Follow up on issue #8159072: Spinner widget should be RTL'ized" into jb-mr2-dev
Dianne Hackborn [Fri, 19 Apr 2013 22:18:12 +0000 (22:18 +0000)]
Merge "Follow up on issue #8159072: Spinner widget should be RTL'ized" into jb-mr2-dev

11 years agoFollow up on issue #8159072: Spinner widget should be RTL'ized
Dianne Hackborn [Fri, 19 Apr 2013 21:09:37 +0000 (14:09 -0700)]
Follow up on issue #8159072: Spinner widget should be RTL'ized

Only allow through changing direction configs for drawables.

Explicitly map layout direction values to an index in the
preload arrays.

Drawables that don't vary by configuration should go in to both
the rtl and ltr preloads.

Change-Id: Ib92dd11738082a795e02d1d4191adb54702d651c

11 years agoam 0cf469f2: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb...
Craig Mautner [Fri, 19 Apr 2013 21:38:47 +0000 (14:38 -0700)]
am 0cf469f2: am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev

* commit '0cf469f21a3df42c204d9569f3d5fe465331b59d':
  Improve javadoc for rotationAnimation.

11 years agoam 10786aa1: am a6a8ba84: Merge "Correct a small doc error"
Christopher Tate [Fri, 19 Apr 2013 21:38:42 +0000 (14:38 -0700)]
am 10786aa1: am a6a8ba84: Merge "Correct a small doc error"

* commit '10786aa1d64897f9d1160954d259c81364b10a43':
  Correct a small doc error

11 years agoam 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc...
Jeff Tinker [Fri, 19 Apr 2013 21:38:39 +0000 (14:38 -0700)]
am 408e6637: am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

* commit '408e663712b7f807ff1a0859c636e2dc4f53422c':
  Correct algorithm property name and clarify javadoc description of device unique id property.

11 years agoam 1b50e4ea: am ca2a6374: Merge "Environment should only warn when asked." into jb...
Jeff Sharkey [Fri, 19 Apr 2013 21:38:36 +0000 (14:38 -0700)]
am 1b50e4ea: am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev

* commit '1b50e4ead5463f4dcc03f9c5ed64963af0d4d9eb':
  Environment should only warn when asked.

11 years agoam c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev
Craig Mautner [Fri, 19 Apr 2013 21:32:44 +0000 (14:32 -0700)]
am c1876b25: Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev

* commit 'c1876b256cff17ebf33e32c5a0cdaaeb7d8be2ec':
  Improve javadoc for rotationAnimation.

11 years agoMerge "Improve javadoc for rotationAnimation." into jb-mr2-dev
Craig Mautner [Fri, 19 Apr 2013 21:30:20 +0000 (21:30 +0000)]
Merge "Improve javadoc for rotationAnimation." into jb-mr2-dev

11 years agoProvide SharedPreferences coherence guarantees for BackupAgent
Christopher Tate [Thu, 18 Apr 2013 23:57:43 +0000 (16:57 -0700)]
Provide SharedPreferences coherence guarantees for BackupAgent

SharedPreferences uses deferred writes internally, and the public
API doesn't allow apps to explicitly synchronize with this, so the
backup/restore implementation needs to take a little care to make
sure that the app process isn't killed before the deferred writes
land on disk.  This parallels the coherence guarantees around
SharedPreference that the Activity and Service lifecycles provide.

Bug 8659368

Change-Id: I853e54f9fb0d2d260dbe6e40d640959f998092df

11 years agoresolved conflicts for merge of 7b2ad857 to master
Winson Chung [Fri, 19 Apr 2013 21:25:58 +0000 (14:25 -0700)]
resolved conflicts for merge of 7b2ad857 to master

Change-Id: I72472e56b2303aa6ccabd784fadc7da4eabcb0e8

11 years agoMerge "Call updateUsageStats for all stacks."
Craig Mautner [Fri, 19 Apr 2013 21:00:54 +0000 (21:00 +0000)]
Merge "Call updateUsageStats for all stacks."

11 years agoam a6a8ba84: Merge "Correct a small doc error"
Christopher Tate [Fri, 19 Apr 2013 21:00:47 +0000 (14:00 -0700)]
am a6a8ba84: Merge "Correct a small doc error"

* commit 'a6a8ba844cc47ab4eea204115788f050811f9335':
  Correct a small doc error

11 years agoCall updateUsageStats for all stacks.
Craig Mautner [Fri, 19 Apr 2013 20:57:33 +0000 (13:57 -0700)]
Call updateUsageStats for all stacks.

Was only calling it for the frontmost stack. But if we are going to
or from the home activity then the pausing stack moves to the back.

Fixes bug 8666221.

Change-Id: I1d6d19b49da4aa23414303336fa266362ae5f4b1

11 years agodo not attempt to parcel unknown ParcelableSpans
Victoria Lease [Fri, 19 Apr 2013 20:12:15 +0000 (13:12 -0700)]
do not attempt to parcel unknown ParcelableSpans

Bug: 8639983
Change-Id: I27335f6e9d3a0671ecdd161fdbf765785ef8065d

11 years agoMerge "Correct a small doc error"
Christopher Tate [Fri, 19 Apr 2013 20:37:31 +0000 (20:37 +0000)]
Merge "Correct a small doc error"

11 years agoam 26a54eca: Merge "Correct algorithm property name and clarify javadoc description...
Jeff Tinker [Fri, 19 Apr 2013 20:35:40 +0000 (13:35 -0700)]
am 26a54eca: Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

* commit '26a54ecaa556f72086790caa133e5a8d31652d8a':
  Correct algorithm property name and clarify javadoc description of device unique id property.

11 years agoam ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 20:35:37 +0000 (13:35 -0700)]
am ca2a6374: Merge "Environment should only warn when asked." into jb-mr2-dev

* commit 'ca2a6374aadb95ca3f151d4bc2fdd3127f04e5e7':
  Environment should only warn when asked.

11 years agoCorrect a small doc error
Scott Kennedy [Fri, 19 Apr 2013 20:35:16 +0000 (13:35 -0700)]
Correct a small doc error

Change-Id: I2adcc169193452549e55ac10958f0e28216aeb15

11 years agoMerge "Correct algorithm property name and clarify javadoc description of device...
Jeff Tinker [Fri, 19 Apr 2013 20:32:35 +0000 (20:32 +0000)]
Merge "Correct algorithm property name and clarify javadoc description of device unique id property." into jb-mr2-dev

11 years agoMerge "Environment should only warn when asked." into jb-mr2-dev
Jeff Sharkey [Fri, 19 Apr 2013 20:32:25 +0000 (20:32 +0000)]
Merge "Environment should only warn when asked." into jb-mr2-dev

11 years agoam 12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget that...
Adam Cohen [Fri, 19 Apr 2013 20:30:05 +0000 (13:30 -0700)]
am 12a7f76c: Merge "Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)" into jb-mr2-dev

* commit '12a7f76c8687053d139d670631e7cef7031f8c48':
  Fix system server crash when uninstalling paid LS widget that has been added (issue 8647398)

11 years agoEnvironment should only warn when asked.
Jeff Sharkey [Fri, 19 Apr 2013 20:25:04 +0000 (13:25 -0700)]
Environment should only warn when asked.

Instead of warning on Process.SYSTEM_UID, which is also used by the
Settings app, change to have the parent process explicitly ask for
warnings.

Bug: 8667286
Change-Id: Ib26676694a4041ff4e6d3ffdcc14055b7eba13c7