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

80816 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
05187871c1 am 1806afb2: am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 
* commit '1806afb2c48eefea8a881fece8dc5233d403d649':
  Add a private method to retrieve the header list from PreferenceActivity
 2012-06-20 15:53:50 -07:00
Amith Yamasani
1806afb2c4 am 998a6836: Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 
* commit '998a68369fcf7928b6fa58d6312426f88a27a39e':
  Add a private method to retrieve the header list from PreferenceActivity
 2012-06-20 15:48:27 -07:00
Amith Yamasani
998a68369f Merge "Add a private method to retrieve the header list from PreferenceActivity" into jb-dev 2012-06-20 15:44:48 -07:00
Scott Main
006217fa23 am 90c2eea8: am 59ea115d: Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well 
* commit '90c2eea8d0fdad51412ff7fa97a55b7930dec3c9':
  Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
 2012-06-20 15:05:52 -07:00
Scott Main
90c2eea8d0 am 59ea115d: Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well 
* commit '59ea115def6ed7277f6f159e0670b5a37c3ca126':
  Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 docs: Remove side padding built into Design images to improve alignment. a few HTML adjustments for alignment as well
 2012-06-20 14:59:04 -07:00
Scott Main
59ea115def Cherrypick from ics-mr1 Change-Id: I2f63aef72962990afeb2bf236e0cce3bac3af738 
docs: Remove side padding built into Design images to improve alignment.
a few HTML adjustments for alignment as well

Change-Id: I432e25128a90b0376a2a469859b0ad49b035a2df
 2012-06-20 14:50:55 -07:00
Amith Yamasani
423d48bbba Add a private method to retrieve the header list from PreferenceActivity 
This is required by Settings app to be able to update the header list
if the accounts list changed.

Bug: 6685701
Change-Id: If27f83ec86fe1f3519a6e25de4e4fe4864133dc8
 2012-06-20 13:54:53 -07:00
Mathias Agopian
99babf48f6 am 8b389539: am 06c93386: Merge "Exit boot animation cleanly." into jb-dev 
* commit '8b3895392662640b84d3e2bbadb0bc53c456cea5':
  Exit boot animation cleanly.
 2012-06-20 13:40:03 -07:00
Mathias Agopian
8b38953926 am 06c93386: Merge "Exit boot animation cleanly." into jb-dev 
* commit '06c93386374de3812629908f21c057a8d60c4b12':
  Exit boot animation cleanly.
 2012-06-20 13:37:13 -07:00
Mathias Agopian
06c9338637 Merge "Exit boot animation cleanly." into jb-dev 2012-06-20 13:33:06 -07:00
Chris Wren
e46647d284 disable debug mode on ExpandHelper 
Change-Id: I97520643d754e29ea295d868cbbb79b76ef74f3a
 2012-06-20 13:21:06 -07:00
satok
ab72cc0f87 am 3a9ff158: am 56802678: Merge "Workaround: Never reset the default IME if the system is not ready" into jb-dev 
* commit '3a9ff158fe45b3ee986dfa5f3c56fa48f781a5a9':
  Workaround: Never reset the default IME if the system is not ready
 2012-06-20 13:06:46 -07:00
satok
3a9ff158fe am 56802678: Merge "Workaround: Never reset the default IME if the system is not ready" into jb-dev 
* commit '56802678a72157675382910e37857cf78e1cefcb':
  Workaround: Never reset the default IME if the system is not ready
 2012-06-20 13:03:14 -07:00
satok
56802678a7 Merge "Workaround: Never reset the default IME if the system is not ready" into jb-dev 2012-06-20 13:01:09 -07:00
Ying Wang
10ab43bd1c am 7ea49798: (-s ours) am edc34cf5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '7ea49798355955791fafbee8c3f5cc50313e46a8':
  Import translations. DO NOT MERGE
 2012-06-20 12:31:04 -07:00
Ying Wang
7ea4979835 am edc34cf5: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit 'edc34cf55482faa25b48e867bd51ecec74dbd0e8':
  Import translations. DO NOT MERGE
 2012-06-20 12:28:33 -07:00
Ying Wang
edc34cf554 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-06-20 12:26:14 -07:00
Ying Wang
83b148dfdc Merge "Import translations. DO NOT MERGE" 2012-06-20 12:25:58 -07:00
Ying Wang
7e439f873f Merge "Import translations. DO NOT MERGE" 2012-06-20 12:25:52 -07:00
Ying Wang
c801e3ed0b Import translations. DO NOT MERGE 
Change-Id: If56cf4c763d2994bfe838b5b9ebab92a585a135b
 2012-06-20 12:17:27 -07:00
Charles Chen
6ea5527157 am 80a3c3ea: am d0d3a850: Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 
* commit '80a3c3ea6f69df461c7e722c8e16362ce4bb60f3':
  Fixing gesture recognition configuration in TouchExplorer.
 2012-06-20 12:16:42 -07:00
Charles Chen
80a3c3ea6f am d0d3a850: Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 
* commit 'd0d3a850650ade52198e7836f87a0e27ad2d6b41':
  Fixing gesture recognition configuration in TouchExplorer.
 2012-06-20 12:14:08 -07:00
Charles Chen
d0d3a85065 Merge "Fixing gesture recognition configuration in TouchExplorer." into jb-dev 2012-06-20 12:12:07 -07:00
Dianne Hackborn
306211d792 am b0222bb1: am 0fa4d30b: Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 
* commit 'b0222bb19e8d850ccbd74c4f0832d73ae552df8d':
  Fix issue #6686339: 2 taps required to launch notification...
 2012-06-20 12:10:39 -07:00
Dianne Hackborn
ae5bd3a998 am cb1c45ed: am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 
* commit 'cb1c45ed80df368051368a478fa931d3333c99f6':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
 2012-06-20 12:10:36 -07:00
Dianne Hackborn
b0222bb19e am 0fa4d30b: Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 
* commit '0fa4d30b03c4307ca5d461aa4450b672b6850ea1':
  Fix issue #6686339: 2 taps required to launch notification...
 2012-06-20 12:08:03 -07:00
Dianne Hackborn
cb1c45ed80 am b6ce1f31: Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 
* commit 'b6ce1f311ce154af713ebc4f543fc2aaed446939':
  Fix issue #6675499: java.lang.RuntimeException: Unable to start...
 2012-06-20 12:08:00 -07:00
Ying Wang
a739382039 Import translations. DO NOT MERGE 
Change-Id: Ifda99210ad7f26a2907db12ce7c88c7b73e4ec65
 2012-06-20 12:07:10 -07:00
Dianne Hackborn
0fa4d30b03 Merge "Fix issue #6686339: 2 taps required to launch notification..." into jb-dev 2012-06-20 12:06:38 -07:00
Dianne Hackborn
b6ce1f311c Merge "Fix issue #6675499: java.lang.RuntimeException: Unable to start..." into jb-dev 2012-06-20 12:06:14 -07:00
Peter Ng
74cc83fe77 am 61e7b87e: am 2c24de30: Fixing typography typo and iconography typo 
* commit '61e7b87e8daa9518e8d5ba69165fc407282c156c':
  Fixing typography typo and iconography typo
 2012-06-20 12:02:05 -07:00
Peter Ng
61e7b87e8d am 2c24de30: Fixing typography typo and iconography typo 
* commit '2c24de30a73b59ca1fa93cf7bfb7aba90953a0dc':
  Fixing typography typo and iconography typo
 2012-06-20 11:59:36 -07:00
Ying Wang
ddaeed3615 Import translations. DO NOT MERGE 
Change-Id: If50ab67d8bc4570a07cb2e9dba0c22ed4f7d7592
 2012-06-20 11:58:21 -07:00
satok
4c0e7152e7 Workaround: Never reset the default IME if the system is not ready 
Bug: 6685037
Change-Id: Ifb311f85154beadd4787ec73669bedfdf1f5172d
 2012-06-21 02:22:24 +09:00
Peter Ng
2c24de30a7 Fixing typography typo and iconography typo 
Bug: 5836343
Bug: 5831156
Change-Id: I2801002a20645d1cbf7d548a1a7c280796457adb
 2012-06-20 09:33:39 -07:00
Chris Wren
8b007ed423 Merge "One-finger notificaiton open: pop the next item too." 2012-06-20 09:28:38 -07:00
Kenny Root
5293d0cb2e Merge "Packages for PackageManagerService tests" 2012-06-20 09:13:47 -07:00
Jean-Michel Trivi
6009dc014f am b92d2a13: am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit 'b92d2a13c4ab34862968f47191d2713de3701757':
  Remote volume handling in MediaRouter
 2012-06-20 09:12:59 -07:00
Jean-Michel Trivi
b92d2a13c4 am 18ddb6ce: Merge "Remote volume handling in MediaRouter" into jb-dev 
* commit '18ddb6ce6f3672a24a6f86ee4b28f5baa746bc20':
  Remote volume handling in MediaRouter
 2012-06-20 09:10:18 -07:00
Jean-Michel Trivi
18ddb6ce6f Merge "Remote volume handling in MediaRouter" into jb-dev 2012-06-20 09:07:59 -07:00
The Android Open Source Project
0fa755a7bb am eb47f9c8: Reconcile with jb-release 
* commit 'eb47f9c81dee7c277e77f77ff977ec5f1ded5bc1':
 2012-06-20 08:28:29 -07:00
The Android Open Source Project
eb47f9c81d Reconcile with jb-release 
Change-Id: I6743fa9d2193a3c89f14c6157ef0e783474b0477
 2012-06-20 08:25:40 -07:00
The Android Automerger
f90c0a8869 merge in jb-release history after reset to jb-dev 2012-06-20 07:02:31 -07:00
Luca Zanolin
2e134263f5 am 50ff53be: am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev 
* commit '50ff53be520c0fb272507d406286711e46601386':
  Clone the list of listeners before notifing any event.
 2012-06-20 02:37:36 -07:00
Luca Zanolin
50ff53be52 am 17c1425f: Merge "Clone the list of listeners before notifing any event." into jb-dev 
* commit '17c1425f5ab5c6f734a700d74b5bd8118f289cd5':
  Clone the list of listeners before notifing any event.
 2012-06-20 02:34:33 -07:00
Luca Zanolin
17c1425f5a Merge "Clone the list of listeners before notifing any event." into jb-dev 2012-06-20 02:32:12 -07:00
Adam Powell
00130f13f0 Fix build; un-pin attribute destined for API 17 or later to prevent 
further automerge antics.

Change-Id: I547dc0abd8db09e8aefc89123e4fb7f73eea712b
 2012-06-19 20:06:53 -07:00
Jean-Michel Trivi
1357012968 Remote volume handling in MediaRouter 
Extend MediaRouter.UserRouteInfo to enable setting playback
 information, which includes volume. When the user route instance
 has a RemoteControlClient, forward any playback information to it.
 Enable specifying a callback to be notified of volume events
 on the route.
Extend MediaRouter.RouteInfo to enable retrieving playback
 information.

Update RemoteControlClient javadoc to reflect which parts of the
 API are not intended to be made public.

Change-Id: I59d728eb61747af6c8c89d53f0faeb07940594c3
 2012-06-19 19:41:35 -07:00
Adam Powell
b10345898c am da828803: am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit 'da8288037cff76367c3088adaa174ddb27bf55c2':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:22:44 -07:00
Adam Powell
da8288037c am 2dde147b: Merge "Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter." into jb-dev 
* commit '2dde147b28684fc32f03ad748af8eb87d5408c7c':
  Add an XML attribute for controlling which route types a MediaRouteButton in a layout will alter.
 2012-06-19 19:20:05 -07:00