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

58404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
efc1b3b4d9 am 42930641: Merge "Fix issues 5158104 and 4981556 (fragment problems)" 
* commit '42930641792ecd23fee6b2913ba1e7cf24634f3d':
  Fix issues 5158104 and 4981556 (fragment problems)
 2011-08-29 18:42:29 -07:00
Dianne Hackborn
4293064179 Merge "Fix issues 5158104 and 4981556 (fragment problems)" 2011-08-29 18:40:21 -07:00
Jim Miller
3a34149c13 am 476769b4: Merge "Fix 5044158: Integrate music transport control into LockScreen" 
* commit '476769b42f38ebf943ea859d98faa94fdc38eec1':
  Fix 5044158: Integrate music transport control into LockScreen
 2011-08-29 18:32:42 -07:00
Jim Miller
476769b42f Merge "Fix 5044158: Integrate music transport control into LockScreen" 2011-08-29 18:30:44 -07:00
Jim Miller
1c18828d20 Fix 5044158: Integrate music transport control into LockScreen 
This integrates a new version of TransportControlView into LockScreen
and adds plumbing to handle new AudioService events to show/hide the view
and updates the required assets for all devices.

Updated to use new AudioManager API. Since the current API only supports
one RCD, the handler now lives in TransportControlView.

Change-Id: I220d4dd760bef35bd84209adc3c5829bf5bc9a2c
 2011-08-29 18:29:21 -07:00
Christopher Tate
5e72362245 am 37656214: Merge "Un-hide the new BackupAgent.onFullBackup() API" 
* commit '376562143436353bbd745d3cce413f649a09dda8':
  Un-hide the new BackupAgent.onFullBackup() API
 2011-08-29 18:13:50 -07:00
Christopher Tate
3765621434 Merge "Un-hide the new BackupAgent.onFullBackup() API" 2011-08-29 18:11:38 -07:00
Dianne Hackborn
6c285977a0 Fix issues 5158104 and 4981556 (fragment problems) 
5158104: com.android.contacts: java.lang.IllegalStateException:
Can not perform this action after onSaveInstanceState at
android.app.FragmentManagerImpl.checkStateLoss(FragmentManager.java:1201)

The ViewPager can just commit without worrying about a state loss,
since it can correctly reconstruct its state later.

4981556: Fragment.mImmediateActivity doesn't get restored on orientation change

I am giving up on this thing; I just don't see how it can actually
be correct.  So now instead of getting an exception about a dup
add/remove at point of the add/remove call, this will happen later when
processing the transaction.

Also add an API for controlling the visibility of menus, which ViewPager
can use to have the correct menus shows.  And add a method to get the
name of a back stack entry.

Change-Id: Idcba14cfa2a172545a7a2a2c466cb49ceb789619
 2011-08-29 17:58:17 -07:00
Irfan Sheriff
8a7e28ede6 am f99360bf: Merge "Initialize p2p settings" 
* commit 'f99360bf8f8bd3bd9dfd91fa0e91384eaaeebc89':
  Initialize p2p settings
 2011-08-29 17:38:33 -07:00
Irfan Sheriff
f99360bf8f Merge "Initialize p2p settings" 2011-08-29 17:36:50 -07:00
John Reck
ce9b2d9218 am 30cca602: Merge "Fix contentInvalidateAll NPE" 
* commit '30cca6020df6fede4043a9f6715be470d3132c57':
  Fix contentInvalidateAll NPE
 2011-08-29 17:16:14 -07:00
John Reck
30cca6020d Merge "Fix contentInvalidateAll NPE" 2011-08-29 17:14:11 -07:00
Matthew Xie
cae4ce1f6d am d56b3c95: Merge "Move Bluetooth remove service record handler to the app main thread" 
* commit 'd56b3c952469a63aa9d4fc860be24b80a4b0e3b6':
  Move Bluetooth remove service record handler to the app main thread
 2011-08-29 16:34:05 -07:00
Jim Miller
c1a9ce0b70 am f0eb7655: Merge "Fix 5044158: Reduce overall memory footprint of lockscreen" 
* commit 'f0eb7655ac897ca06034296f7674b73a65f0e8a9':
  Fix 5044158: Reduce overall memory footprint of lockscreen
 2011-08-29 16:33:51 -07:00
Daniel Lehmann
127ebfd8a0 am 82e0c6f3: Merge "Add the lookup_key column, which should have been in the previous CL" 
* commit '82e0c6f3dec5c7359166b9ff720f9fcc8c6801d7':
  Add the lookup_key column, which should have been in the previous CL
 2011-08-29 16:33:38 -07:00
Wink Saville
b8ded63007 am 03605fa8: Merge "Fix leak in SIM ready registrants" 
* commit '03605fa832ea42dedca00fc7798a6da6c8a6c8a3':
  Fix leak in SIM ready registrants
 2011-08-29 16:33:30 -07:00
James Dong
a273d4fe3f am 2a451021: Merge "The test application falsely reports that the test result even if the test failed." 
* commit '2a45102186a25877df04404d591171b2b2e85626':
  The test application falsely reports that the test result even if the test failed.
 2011-08-29 16:33:14 -07:00
Irfan Sheriff
f7ecb1aff4 am 335e40c0: Merge "Use seperate config file for p2p" 
* commit '335e40c0f1c3aec550e61fa159130527fda597b6':
  Use seperate config file for p2p
 2011-08-29 16:33:00 -07:00
Jason Simmons
b147e3e6e1 Merge "resolved conflicts for merge of 35c0bf31 to ics-aah" into ics-aah 2011-08-29 16:31:23 -07:00
Jake Hamby
4144a06025 Use the local timezone for CDMA SMS timestamps. 
3GPP2 uses the local timezone for timestamps in SMS messages.
Use the local timezone instead of UTC when decoding bearer data.

Bug: 5123883
Change-Id: Iec25bcbb7862f0794ead80b6923c815b68bdd2a5
 2011-08-29 16:28:27 -07:00
Matthew Xie
d56b3c9524 Merge "Move Bluetooth remove service record handler to the app main thread" 2011-08-29 16:27:54 -07:00
Matthew Xie
484867a8ed Move Bluetooth remove service record handler to the app main thread 
Move Bluetooth remove service record handler to the app main thread.
This removes the dependency of caller thread that constructs the
BluetoothAdapter singleton instance. The caller thread could stop while
BluetoothAdapter singleton exists but lose the handler context.
Make the BluetoothService.removeServiceRecord return quickly without
blocking on native call.
bug 4999443

Change-Id: I302534baa381f4aca8192e1e4a9ea21793b07ba6
 2011-08-29 16:24:50 -07:00
Jason Simmons
1b6bb1ed86 resolved conflicts for merge of 35c0bf31 to ics-aah 
Change-Id: If736c93821359a2f97a0670ad3be8ada5f398bd7
 2011-08-29 16:16:49 -07:00
Jeff Sharkey
961e304583 Introduce immediate CONNECTIVITY_ACTION variant. 
New broadcast that is dispatched immediately after connectivity
changes have been handled by ConnectivityService, bypassing any
applicable CONNECTIVITY_CHANGE_DELAY.

Also protect CONNECTIVITY_CHANGE broadcasts, since they should only
be sent by system.

Bug: 5198167
Change-Id: I75f1fb44b21da1879f0ab960bcaa481126d70fde
 2011-08-29 16:10:43 -07:00
Fabrice Di Meglio
aef455fd5b Fix bug #5197549 android.text.cts.StaticLayoutTest#testGetEllipsisCount fails on IRK49E mysid-userdebug 
- make the ellipsizing condition easier to read
- allow ellipsizing only and only if
	- not MARQUEE
	- single line
	- END only on the last visible line when multiple lines

Change-Id: I6b08e4a735ebc4875a208f0538d9cf937240316e
 2011-08-29 16:07:05 -07:00
Jim Miller
f0eb7655ac Merge "Fix 5044158: Reduce overall memory footprint of lockscreen" 2011-08-29 16:04:10 -07:00
Jim Miller
4ae8cb9e73 Fix 5044158: Reduce overall memory footprint of lockscreen 
On devices that do not require showing lock before unlock, we now only create
just the unlock screen.  In addition to simplifying the code, this also
prevents keeping around a potentially unusued lock screen and saves ~1MB
in the system process on devices with only a secure lockscreen.

Change-Id: I533f2692b44a7991d4850cecc874c76166e7ce71
 2011-08-29 16:02:24 -07:00
John Grossman
d7f614f831 Make the LocalClock HAL wrapper use a singleton HAL instance. 
Change the local clock helper wrapper to hold just a single copy of the local
time HAL instead of having each wrapper hold their own HAL instance.

Change-Id: Ibc365eccc78a98bd2ea6cf1c57a55a84b843bc2a
 2011-08-29 16:02:13 -07:00
Daniel Lehmann
82e0c6f3de Merge "Add the lookup_key column, which should have been in the previous CL" 2011-08-29 15:51:56 -07:00
Wink Saville
03605fa832 Merge "Fix leak in SIM ready registrants" 2011-08-29 15:46:45 -07:00
Jeff Sharkey
0eb3b6e779 am 51e77f1a: Merge "Make Paint.set() copy shadow config." 
* commit '51e77f1a52fe1ae56086a3c8e364bfc1c96eeaa4':
  Make Paint.set() copy shadow config.
 2011-08-29 15:39:35 -07:00
Chet Haase
0f561d618f am 32901b4f: Merge "Fixed bug with invalidation in top-level Views." 
* commit '32901b4fec5db9a137add68f0f38518636593668':
  Fixed bug with invalidation in top-level Views.
 2011-08-29 15:39:11 -07:00
Glenn Kasten
210b6e996a am b4bf90b4: Merge "Add C++ thread API androidGetThreadSchedulingGroup" 
* commit 'b4bf90b40e30096479a4d4cc9cf135e991ef1994':
  Add C++ thread API androidGetThreadSchedulingGroup
 2011-08-29 15:39:07 -07:00
Tsu Chiang Chuang
89355b4cfd Adding bandwidth enforcement test app. 
Change-Id: I6e3509aff056ad0008960b205b7489ee5f066521
 2011-08-29 15:30:22 -07:00
James Dong
2a45102186 Merge "The test application falsely reports that the test result even if the test failed." 2011-08-29 15:28:23 -07:00
Irfan Sheriff
335e40c0f1 Merge "Use seperate config file for p2p" 2011-08-29 15:22:58 -07:00
Robert Ly
aee8a900b9 am bce1667e: Merge "cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325" 
* commit 'bce1667e7ae69ff575e73e776040524fb5515c5f':
  cherrypick from hc-mr2 Change-Id: Iab16cc2be71d6f19569c3c2ea716121922ec8325
 2011-08-29 15:19:04 -07:00
Stephen Hines
fd70a447f7 am 660c7f60: Merge "Updated time/type docs for Renderscript." 
* commit '660c7f6053d29ecee8f9258a884bf29fb1f30427':
  Updated time/type docs for Renderscript.
 2011-08-29 15:18:59 -07:00
Irfan Sheriff
89bd2131be am ad4d2c99: Merge "Remove work around for driver state change" 
* commit 'ad4d2c99ed3a08a5090c38e9dd906df8fb894614':
  Remove work around for driver state change
 2011-08-29 15:18:54 -07:00
Jeff Brown
49a47f5446 am 8d3feb62: Merge "Add a "show touches" option for demos and presentations. Bug: 4569045" 
* commit '8d3feb6292ba7e87adeb4982e8cf27114a8ee2e4':
  Add a "show touches" option for demos and presentations. Bug: 4569045
 2011-08-29 15:18:46 -07:00
Jeff Brown
1802d12d9e am df7e2644: Merge "Prioritize INPUT_PROP_DIRECT first." 
* commit 'df7e2644992c5828be94980b4243ac9f1f48b177':
  Prioritize INPUT_PROP_DIRECT first.
 2011-08-29 15:18:42 -07:00
Andreas Huber
2a3baf53b8 am 499f3658: Merge "Return an error to the client instead of asserting if decoder instantiation fails" 
* commit '499f36581c63579f24c3d9bbf95c7f8677cd1191':
  Return an error to the client instead of asserting if decoder instantiation fails
 2011-08-29 15:18:26 -07:00
Jamie Gennis
931b706fbe am a258f0c8: Merge "Surface: move the SurfaceTexture ctor" 
* commit 'a258f0c8ffeb447aa8d3216ec276bc26b4f3f5d8':
  Surface: move the SurfaceTexture ctor
 2011-08-29 15:18:14 -07:00
Bill Gruber
9664c69695 am f455e9a3: Merge "Cherry pick from honeycomb-mr2 Change ID I7ded723152d7beface51b45b882d4ccf92981927 Doc fix: Hello World tutorial updates Bug: 5149925" 
* commit 'f455e9a3b3fa2d4680750e7b65692e35d2bf4023':
  Cherry pick from honeycomb-mr2 Change ID I7ded723152d7beface51b45b882d4ccf92981927 Doc fix: Hello World tutorial updates Bug: 5149925
 2011-08-29 15:17:55 -07:00
Gilles Debunne
acb89cfc85 am 474cac1c: Merge "Suggestions popup window is dismissed on tap outside." 
* commit '474cac1c212e1f02deaffe5512941af9cb2a760b':
  Suggestions popup window is dismissed on tap outside.
 2011-08-29 15:17:49 -07:00
John Reck
83ff786f72 am 082a9fa3: Merge "Tap highlight fix + small perf increase" 
* commit '082a9fa3438d343942851e538bb38b86ab1873b3':
  Tap highlight fix + small perf increase
 2011-08-29 15:17:41 -07:00
Adam Powell
c020c3f899 am 890be6b9: Merge "Fix bug 5217267 - Action bars and menu shortcuts" 
* commit '890be6b919ce0c65d018a2dc40a6a1d59bc2b14d':
  Fix bug 5217267 - Action bars and menu shortcuts
 2011-08-29 15:17:14 -07:00
Brandon Keely
557908d86a am 54717814: Merge "Massaging framework window transitions." 
* commit '5471781430ef51fbe649179c22b98975e64d2a5e':
  Massaging framework window transitions.
 2011-08-29 15:16:39 -07:00
Chet Haase
f6f53b1e69 am 890a631e: Merge "Made the Switch class public." 
* commit '890a631ede4f0d209b53d1924a545ed8d3b6f003':
  Made the Switch class public.
 2011-08-29 15:16:15 -07:00
Romain Guy
68acd2236d am f8c015d2: Merge "Italic should be italic and bold should be bold." 
* commit 'f8c015d2628d8ef3056698a3b6a052889ae15d01':
  Italic should be italic and bold should be bold.
 2011-08-29 15:16:03 -07:00