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

88582 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
The Android Open Source Project
9fcc8aed74 Reconcile with jb-mr1-release - do not merge 
Change-Id: Ib34310d4da36e31c2a89ea767a8bb126973bffeb
 2012-10-04 07:48:11 -07:00
The Android Automerger
cd54ca7dc3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-10-04 06:59:39 -07:00
Chris Wren
7ee2f9d90e am 02065846: am 6295ef32: Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev 
* commit '02065846fa7cceae0cdfe65cf88a6d7f7741f8d4':
  hide the redundant clock when the notification shade is open.
 2012-10-04 06:41:54 -07:00
Chris Wren
02065846fa am 6295ef32: Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev 
* commit '6295ef325102bed3d12e54020acb8728bc2976a0':
  hide the redundant clock when the notification shade is open.
 2012-10-04 06:39:28 -07:00
Chris Wren
6295ef3251 Merge "hide the redundant clock when the notification shade is open." into jb-mr1-dev 2012-10-04 06:37:11 -07:00
Satoshi Kataoka
580bb919ed am faf45d25: am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit 'faf45d2525bf64fa7f484cde9180c448fd0e0345':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:06:57 -07:00
Satoshi Kataoka
faf45d2525 am ebf7e285: Merge "Close the current input method when attached view doesn\'t have a handler" into jb-mr1-dev 
* commit 'ebf7e2851cab55348153fca299c52042b125924d':
  Close the current input method when attached view doesn't have a handler
 2012-10-03 21:05:12 -07:00
Satoshi Kataoka
ebf7e2851c Merge "Close the current input method when attached view doesn't have a handler" into jb-mr1-dev 2012-10-03 21:02:20 -07:00
Jim Miller
9b8c009510 am c2cb3c2f: am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev 
* commit 'c2cb3c2f3cc50a9d583b970cf85978ba36b97d63':
  Fix keyguard landscape layout on phones
 2012-10-03 20:34:07 -07:00
Jim Miller
c2cb3c2f3c am 5b14b969: Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev 
* commit '5b14b9698c288031fea6b40f0e1240c32ac83725':
  Fix keyguard landscape layout on phones
 2012-10-03 20:32:02 -07:00
Jim Miller
5b14b9698c Merge "Fix keyguard landscape layout on phones" into jb-mr1-dev 2012-10-03 20:30:10 -07:00
Svetoslav Ganov
98e998ce68 am 3b12d74e: am d211767f: Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev 
* commit '3b12d74e3eb87d003c2f01886456498fbe13f0af':
  Announce changes in keyguard message, e.g. bad unlock pattern.
 2012-10-03 20:26:09 -07:00
Svetoslav Ganov
3b12d74e3e am d211767f: Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev 
* commit 'd211767f9c8ca9801b3f0b6697c8968f40b79175':
  Announce changes in keyguard message, e.g. bad unlock pattern.
 2012-10-03 20:22:52 -07:00
Svetoslav Ganov
d211767f9c Merge "Announce changes in keyguard message, e.g. bad unlock pattern." into jb-mr1-dev 2012-10-03 20:21:19 -07:00
Dirk Dougherty
bc88e5f2f9 am b0ab91d9: am 09d1cb3f: am 486eb461: am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit 'b0ab91d97e6a82c42ea0ce92d952283887598e23':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:46:40 -07:00
Dirk Dougherty
b0ab91d97e am 09d1cb3f: am 486eb461: am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit '09d1cb3fb1f8ccaa6c0298b04cfb515f273b0c08':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:44:56 -07:00
Dirk Dougherty
09d1cb3fb1 am 486eb461: am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit '486eb4616e07d23a408a475adaf450b1bc2f9024':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:42:36 -07:00
Dirk Dougherty
486eb4616e am 5713b5bc: am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit '5713b5bc929962e8ddc559f3f3e73a925a0c3150':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:40:35 -07:00
Dirk Dougherty
5713b5bc92 am 99f5ff0a: Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 
* commit '99f5ff0abb361de352f374822d2edc1a9379ad0c':
  Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."
 2012-10-03 19:38:17 -07:00
Dirk Dougherty
99f5ff0abb Merge "Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories."" into jb-dev-docs 2012-10-03 19:37:01 -07:00
Dirk Dougherty
b4dc1c80a2 Revert "Doc change: Add core quality and tablet quality docs, tablet developer stories." 
This reverts commit c395f4a39cef3e0c2eaac8318b5e1723eac7d696

Change-Id: If74bdf2e567f60fc1af9e2c272531ef58e2cee41
 2012-10-03 19:36:08 -07:00
Christopher Tate
e827b3642f am e8e2f229: am 35dd7522: Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev 
* commit 'e8e2f2296a38058b7ea1a635e404b0eae5c5e46c':
  Rewrite raw insert()s and some raw query()s of moved-to-global keys
 2012-10-03 19:35:48 -07:00
Christopher Tate
e8e2f2296a am 35dd7522: Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev 
* commit '35dd752238d3ce3b83e78eb4b00a85ea3d067088':
  Rewrite raw insert()s and some raw query()s of moved-to-global keys
 2012-10-03 19:33:58 -07:00
Christopher Tate
35dd752238 Merge "Rewrite raw insert()s and some raw query()s of moved-to-global keys" into jb-mr1-dev 2012-10-03 19:31:40 -07:00
Christopher Tate
c221d2be7d Rewrite raw insert()s and some raw query()s of moved-to-global keys 
The Settings put*() APIs fix up references via the old namespaces,
but the raw insert() interface didn't.  Now it does.  Also, when
possible we fix up direct query() operations on the old namespace
to point to the correct one.  At present that is only done for
query() operations with Uris of the form

    content://secure/adb_enabled

There is no rewriting done on queries of the form

    content://secure WHERE name='adb_enabled'

since the app-supplied WHERE clause can be arbitrarily complex.

Bug 7267568

Change-Id: I5c8cecbea7f5b1da6247a53b1428d3effb0bbca5
 2012-10-03 19:20:51 -07:00
Svetoslav Ganov
1aa3f76b1f am 664af173: am a6cab32d: Merge "Events for window\'s content change should be dispatched only for the active window." into jb-mr1-dev 
* commit '664af173ef0cf199e947528d4b159e298ae06758':
  Events for window's content change should be dispatched  only for the active window.
 2012-10-03 19:04:34 -07:00
Svetoslav Ganov
664af173ef am a6cab32d: Merge "Events for window\'s content change should be dispatched only for the active window." into jb-mr1-dev 
* commit 'a6cab32d68692f69729195ac69b7f9e9c8d2001f':
  Events for window's content change should be dispatched  only for the active window.
 2012-10-03 19:03:05 -07:00
Svetoslav Ganov
a6cab32d68 Merge "Events for window's content change should be dispatched only for the active window." into jb-mr1-dev 2012-10-03 19:00:17 -07:00
Christopher Tate
5acd58a758 am d2426a91: am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 
* commit 'd2426a91f20dcff6a1845a94a7fa914c63d2de5b':
  Use myUserId() only in registerContentObserver()
 2012-10-03 18:59:54 -07:00
Christopher Tate
d2426a91f2 am 1a2fac3e: Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 
* commit '1a2fac3eeda031ac5f4c7d17c883d54af5661a66':
  Use myUserId() only in registerContentObserver()
 2012-10-03 18:57:23 -07:00
Christopher Tate
1a2fac3eed Merge "Use myUserId() only in registerContentObserver()" into jb-mr1-dev 2012-10-03 18:54:49 -07:00
Adam Powell
bc2ddd5192 am 057b2f12: am ac2fc163: Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev 
* commit '057b2f12a964ec2508ae8958240c908857eaebb6':
  Remove unneeded margin below action bar subtitles
 2012-10-03 18:54:40 -07:00
Adam Powell
057b2f12a9 am ac2fc163: Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev 
* commit 'ac2fc16373fb93f28c9335c27dff744194b28678':
  Remove unneeded margin below action bar subtitles
 2012-10-03 18:52:12 -07:00
Romain Guy
bf8d8e73e4 am 5971d03f: am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev 
* commit '5971d03f233c52d697e55ee83d8e514adac21527':
  Fix rendering artifacts on tiled renderers Bug #7275145
 2012-10-03 18:52:03 -07:00
Dianne Hackborn
85486bd33d am cd09cb8f: am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev 
* commit 'cd09cb8fb79442aa22018db9134ef1ef22059360':
  Fix issue #7267494, issue #7212347
 2012-10-03 18:50:18 -07:00
Adam Powell
ac2fc16373 Merge "Remove unneeded margin below action bar subtitles" into jb-mr1-dev 2012-10-03 18:50:10 -07:00
Romain Guy
5971d03f23 am f7ee2a03: Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev 
* commit 'f7ee2a03c1f930db4b20c04225f496ada97e646b':
  Fix rendering artifacts on tiled renderers Bug #7275145
 2012-10-03 18:49:30 -07:00
Jim Miller
ce3e948c5c Fix keyguard landscape layout on phones 
This particular layout didn't have layout_height specified, which
is undefined.  However, the undefined behavior seems to have changed
on the platform to one where this layout no longer works.  Not
specifying layout_height causes the security area view to be 0 pixels
wide, effectively ignoring layout_weight.

Fixes bug 7283261

Change-Id: I0e3d156e9b2d7ef1492dec9791f0e241e8cd7fe6
 2012-10-03 18:48:07 -07:00
Dianne Hackborn
cd09cb8fb7 am 6fb7fd3a: Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev 
* commit '6fb7fd3a0939413d8968fc0d404ed499d7f7dc52':
  Fix issue #7267494, issue #7212347
 2012-10-03 18:47:51 -07:00
Romain Guy
f7ee2a03c1 Merge "Fix rendering artifacts on tiled renderers Bug #7275145" into jb-mr1-dev 2012-10-03 18:47:35 -07:00
Dianne Hackborn
6fb7fd3a09 Merge "Fix issue #7267494, issue #7212347" into jb-mr1-dev 2012-10-03 18:45:37 -07:00
Svetoslav Ganov
58fd9f8d6a Events for window's content change should be dispatched only for the active window. 
1. Accessibility events for changes in the content of a given window, such as
   click, focus, etc. are dispatched to clients only if they come from the
   active window.

   Events for changes in the state of a window, such as window got input focus
   or a notification appeared, are always dispatched. The notification events
   do not contain source, so a client cannot introspect the notification area
   (unless the user explicitly touches it which generates hove events). The
   events for a window getting input focus change the active window so they
   have to be dispatched.

   Events that are a result of the user touching the screen, such as hover
   enter, first tocuh, etc. should always be dispatched.

bug:7282006

Change-Id: I96b79189f8571285175d9660a22394cc84f39559
 2012-10-03 18:33:30 -07:00
Adam Powell
17033bfa15 Remove unneeded margin below action bar subtitles 
This just throws off alignment when the natural centering of this
layout will take care of things.

Bug 6369593

Change-Id: If0993091e0d47011f3bf5dd0b5a1fa649471f8e6
 2012-10-03 18:31:08 -07:00
Justin Koh
11adf0ad31 am a521abef: Merge "Synthesizing D-pad event directly from motion events. Includes fling." into jb-mr1-aah-dev 
* commit 'a521abef83bc329931ef9b8230fe1ae9e1a87b3a':
  Synthesizing D-pad event directly from motion events.  Includes fling.
 2012-10-03 18:20:33 -07:00
Justin Koh
a521abef83 Merge "Synthesizing D-pad event directly from motion events. Includes fling." into jb-mr1-aah-dev 2012-10-03 18:17:06 -07:00
Romain Guy
dfab363807 Fix rendering artifacts on tiled renderers 
Bug #7275145

This change fixes ViewRoot and adds extra debug information. It does
not solve the problem entirely. Another CL will.

Change-Id: I7e604ba38aad7f421769783dcbd998d6905ab2d9
 2012-10-03 18:07:59 -07:00
Dianne Hackborn
c428aae642 Fix issue #7267494, issue #7212347 
7267494 Calendar is not syncing
Check for whether a content provider is dead before returning
it.  This is kind-of a band-aid, but probably the right thing
to do; I'm just not sure exactly the full details of why this
problem is happening.  Hopefully this "fixes" it, though I don't
have a way to repro to tell.

7212347 System power off dialog is only visible to user 0
Make it visible.  Also turn on some battery debugging stuff and
clean it up so we can just keep it.

Change-Id: I5add25bf2a763c8dfe1df23bc5c753a9ea5d157a
 2012-10-03 18:07:23 -07:00
Fabrice Di Meglio
b4a80baaff am 5e5169b0: am 33c36895: Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev 
* commit '5e5169b0d0d51e042a79ca32d2825fc5f4a25531':
  Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT
 2012-10-03 17:48:09 -07:00
Fabrice Di Meglio
5e5169b0d0 am 33c36895: Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev 
* commit '33c36895a294c7b731fd59017a7ea0f06ac2a356':
  Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT
 2012-10-03 17:45:16 -07:00
Fabrice Di Meglio
33c36895a2 Merge "Fix bug #7282594 EditText does not allow to move the cursor when typing RTL text and if gravity is set to LEFT" into jb-mr1-dev 2012-10-03 17:43:08 -07:00