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

81065 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
5af65850ea Merge "Eliminate jank by setting force hiding differently" 2012-06-25 11:43:43 -07:00
Eric Fischer
a346695a20 am 764d1368: (-s ours) am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '764d1368d6b137e0c99ce9e7b326dc7fe25aba05':
  Import translations. DO NOT MERGE
 2012-06-25 11:38:31 -07:00
Eric Fischer
764d1368d6 am c5fc8f5c: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'c5fc8f5c1b97665d6b8b0a9d18d737f9fd2460f4':
  Import translations. DO NOT MERGE
 2012-06-25 11:34:58 -07:00
Eric Fischer
a3b6554c31 Merge "Import translations. DO NOT MERGE" 2012-06-25 11:33:00 -07:00
Eric Fischer
c5fc8f5c1b Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-25 11:32:30 -07:00
Eric Fischer
6135e52e82 Import translations. DO NOT MERGE 
Change-Id: Ia19fe79fc797b8048b90a6d074b1117c2e362c8f
 2012-06-25 11:32:05 -07:00
Eric Fischer
d7e646d6d7 Import translations. DO NOT MERGE 
Change-Id: I829c0795e2bf76fe1e2315977aeab8d63d3ed76d
 2012-06-25 11:24:00 -07:00
Craig Mautner
f12100e025 Eliminate jank by setting force hiding differently 
Only force hide windows when the keyguard is animating in.

Fixes bug 6721572.

Change-Id: Iad7b8b811bcf0840726cbf6c6f279dabd08a3aba
 2012-06-25 11:13:24 -07:00
Scott Main
5e61f9275c am 2965b93d: am e40c4636: docs: move AIDL doc under Services in api guides. 
* commit '2965b93d5e3d4b8563352034ee7371f9b99ff225':
  docs: move AIDL doc under Services in api guides.
 2012-06-25 10:48:42 -07:00
Scott Main
2965b93d5e am e40c4636: docs: move AIDL doc under Services in api guides. 
* commit 'e40c4636d970c50f7719e7d5067963be93c25750':
  docs: move AIDL doc under Services in api guides.
 2012-06-25 10:45:50 -07:00
Scott Main
e40c4636d9 docs: move AIDL doc under Services in api guides. 
Change-Id: I525de97958e2093af15cce2b007ec022cb315a71
 2012-06-25 10:02:13 -07:00
Glenn Kasten
4f967c2fd7 Merge "Remove AudioRecord record_flags" 2012-06-25 08:35:56 -07:00
The Android Open Source Project
054c039d41 am 95dca885: Reconcile with jb-release 
* commit '95dca885cf5a88a4ee34a21e3bca4e152fff7f6c':
 2012-06-25 08:02:58 -07:00
The Android Open Source Project
95dca885cf Reconcile with jb-release 
Change-Id: I3dcf46b82ece74242207e8e3769a87dbe8f85a5f
 2012-06-25 07:57:16 -07:00
Adam Powell
c497bc69e9 am 3c419da6: am dbbfa702: Fix MediaRouter bugs 
* commit '3c419da632c7f332a50e5001331544cb8c919dce':
  Fix MediaRouter bugs
 2012-06-24 14:59:03 -07:00
Adam Powell
3c419da632 am dbbfa702: Fix MediaRouter bugs 
* commit 'dbbfa702a09f6d2d36dee1b552442d04a4673f89':
  Fix MediaRouter bugs
 2012-06-24 14:56:06 -07:00
Adam Powell
dbbfa702a0 Fix MediaRouter bugs 
Fix a bug where a newly added group had no supported types at the time
of callback dispatch, meaning that no registered callbacks would be
invoked.

Fix a bug where subscribed type flags were not updated properly when
re-adding a callback for new types.

Change-Id: I7d9f11b363ebdca692786cec1d432600946e5721
 2012-06-24 14:32:04 -07:00
The Android Automerger
1e9aef5d94 merge in jb-release history after reset to jb-dev 2012-06-23 23:22:21 -07:00
Scott Main
a571019856 am 1e546247: am 40a0376e: docs: remove unused id attribute from Button 
* commit '1e546247b5b583e772102044d09d8e3dc2ce6d47':
  docs: remove unused id attribute from Button
 2012-06-23 17:06:13 -07:00
Scott Main
1e546247b5 am 40a0376e: docs: remove unused id attribute from Button 
* commit '40a0376ea5ac597d8df04fd3e4ad8bde7ac7c9ec':
  docs: remove unused id attribute from Button
 2012-06-23 17:02:40 -07:00
Scott Main
40a0376ea5 docs: remove unused id attribute from Button 
Change-Id: Ia61c418972699d40757923fd69ea27b26eddaa05
 2012-06-23 16:42:33 -07:00
Scott Main
0584367b55 am 0c511988: am b0efc7fc: eat comment so it doesn\'t appear in docs 
* commit '0c511988065a1dac77dead1055a8ab482ff009cc':
  eat comment so it doesn't appear in docs
 2012-06-23 12:49:05 -07:00
Scott Main
0c51198806 am b0efc7fc: eat comment so it doesn\'t appear in docs 
* commit 'b0efc7fce7967b043dae8896e8f9bf4d11274cf4':
  eat comment so it doesn't appear in docs
 2012-06-23 12:46:23 -07:00
Scott Main
b0efc7fce7 eat comment so it doesn't appear in docs 
Change-Id: Id2b539fc80422edb32c86fa17ad888abbc48ba49
 2012-06-23 12:36:17 -07:00
Scott Main
6a59f44a1e am 39aa4bbb: am 067d64a9: docs: fix broken link 
* commit '39aa4bbb9847608c5ea7ef98ba75d13f19cc4321':
  docs: fix broken link
 2012-06-23 11:33:53 -07:00
Scott Main
39aa4bbb98 am 067d64a9: docs: fix broken link 
* commit '067d64a99a2ee90f250d81ee36d5a3efa056e5b5':
  docs: fix broken link
 2012-06-23 11:31:17 -07:00
Scott Main
067d64a99a docs: fix broken link 
Change-Id: Ia4ccab838e36b6e0e9298ed7222b5a581d3d5234
 2012-06-23 11:27:20 -07:00
Jean-Baptiste Queru
bd705ea55f am 695b2d08: am 5f77f82e: Merge "Another case of extra ">"" 
* commit '695b2d089ec4dcb2256383e7ee8dd7e2979e13b7':
  Another case of extra ">"
 2012-06-23 07:15:42 -07:00
Jean-Baptiste Queru
c516507404 am 6c1f2b13: am b8b47c22: Merge "Remove redundant ">"" 
* commit '6c1f2b136b2fc55ddd2df7db6b6e48a8665acc98':
  Remove redundant ">"
 2012-06-23 07:15:39 -07:00
Jean-Baptiste Queru
41e6e0c49f am c34188a9: resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
* commit 'c34188a95405526416325604386af4f48ba20918':
  Add the possibility to modify the View focus rect
 2012-06-23 07:13:25 -07:00
Jean-Baptiste Queru
695b2d089e am 5f77f82e: Merge "Another case of extra ">"" 
* commit '5f77f82e609b24504e026751228b399b8dc57ab5':
  Another case of extra ">"
 2012-06-23 07:12:19 -07:00
Jean-Baptiste Queru
6c1f2b136b am b8b47c22: Merge "Remove redundant ">"" 
* commit 'b8b47c22c8dc1f5facfbb4729511772630cc3aa6':
  Remove redundant ">"
 2012-06-23 07:12:16 -07:00
Jean-Baptiste Queru
c34188a954 resolved conflicts for merge of f8f76d52 to jb-dev-plus-aosp 
Change-Id: I83beeb45320de2c3fc3a00c2f5cd86a17ac1dc9f
 2012-06-23 07:08:59 -07:00
Jean-Baptiste Queru
5f77f82e60 Merge "Another case of extra ">"" 2012-06-23 05:59:11 -07:00
Jean-Baptiste Queru
b8b47c22c8 Merge "Remove redundant ">"" 2012-06-23 05:58:56 -07:00
Jean-Baptiste Queru
f8f76d52a7 Merge "Add the possibility to modify the View focus rect" 2012-06-23 05:52:53 -07:00
Scott Main
4786626b0f am 0e61a726: am 6f3e5e03: docs: remove ICS from developer hompage 
* commit '0e61a7268460392b706904c032cb6ae7f931692f':
  docs: remove ICS from developer hompage
 2012-06-23 05:39:32 -07:00
Scott Main
3c91c95e03 am 9b7596e1: am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev 
* commit '9b7596e1cc47ffd52cadfb079670c4d5ac206d7b':
  docs: add jelly bean to homepage
 2012-06-23 05:39:29 -07:00
Adam Powell
f681e74064 am 56fbd14f: am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '56fbd14f3d02220eb3b35b3d62750d12ae402c6e':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:39:26 -07:00
Adam Powell
0c26f97684 am 3b939b72: am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit '3b939b7242f9c4155f4d8b34cb474abc77c6417f':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:39:23 -07:00
Scott Main
11905d5974 am b9975454: am fa54ba47: Merge "docs: change class names for links to design docs" into jb-dev 
* commit 'b9975454ed01ba88aaa1b95b631e45e425982564':
  docs: change class names for links to design docs
 2012-06-23 05:39:20 -07:00
Scott Main
0e61a72684 am 6f3e5e03: docs: remove ICS from developer hompage 
* commit '6f3e5e03cf0affcf7d8761fe2ab58b8a1e91d177':
  docs: remove ICS from developer hompage
 2012-06-23 05:37:03 -07:00
Scott Main
9b7596e1cc am 4708d8f5: Merge "docs: add jelly bean to homepage" into jb-dev 
* commit '4708d8f54bc8908c158b8d6f591f9c132e572417':
  docs: add jelly bean to homepage
 2012-06-23 05:37:00 -07:00
Adam Powell
56fbd14f3d am 1b4ea7ef: Sanity check while updating volume in MediaRouteChooserDialog 
* commit '1b4ea7eff50545f4673ca01b664e5edccc784688':
  Sanity check while updating volume in MediaRouteChooserDialog
 2012-06-23 05:36:58 -07:00
Adam Powell
3b939b7242 am fd3fd482: Merge "Update route count properly when MediaRouteButton detects grouped/ungrouped events" into jb-dev 
* commit 'fd3fd482ab6ab67b687696f51fa67714bd36fa49':
  Update route count properly when MediaRouteButton detects grouped/ungrouped events
 2012-06-23 05:36:54 -07:00
Scott Main
b9975454ed am fa54ba47: Merge "docs: change class names for links to design docs" into jb-dev 
* commit 'fa54ba47f34a8d536636f823b8085b043b4fd2d6':
  docs: change class names for links to design docs
 2012-06-23 05:36:50 -07:00
Scott Main
6f3e5e03cf docs: remove ICS from developer hompage 
Change-Id: I6c2ca0f8e859a65f2de1d73198af9fd40d374f95
 2012-06-22 22:18:26 -07:00
Scott Main
4708d8f54b Merge "docs: add jelly bean to homepage" into jb-dev 2012-06-22 21:23:20 -07:00
Scott Main
32c1c5cedc docs: add jelly bean to homepage 
Change-Id: I9e94eca22b7255ee84afc5b5ba320368bdfe2200
 2012-06-22 21:21:35 -07:00
Adam Powell
1b4ea7eff5 Sanity check while updating volume in MediaRouteChooserDialog 
Bug 6720224

When a window dies it's possible to receive a lingering ACTION_CANCEL
event to the SeekBar for volume. Be sure that we don't try to mess
with something that's already gone by that point.

Change-Id: I4f6119718fc21204d9013d591bc984b785b698b4
 2012-06-22 20:41:31 -07:00