Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,440 Commits 3 Branches 0 Tags
f4d58e5bdc8694b1d82b28872beb37ce2cf64595
Commit Graph

19672 Commits

Author SHA1 Message Date
Eino-Ville Talvala
f4d58e5bdc am d06fa51b: Merge "Make changing white-balance mode always disable AWB lock." 
* commit 'd06fa51b3ef8bf28c0c7ebdd82ef47f786e10fb8':
  Make changing white-balance mode always disable AWB lock.
 2011-08-19 12:43:34 -07:00
Eino-Ville Talvala
d06fa51b3e Merge "Make changing white-balance mode always disable AWB lock." 2011-08-19 12:42:06 -07:00
Adam Powell
dda20678c3 am b7d34e71: Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items" 
* commit 'b7d34e71726603514b2e405f9e3dcdf437e989c7':
  Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items
 2011-08-19 12:36:26 -07:00
Adam Powell
b7d34e7172 Merge "Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items" 2011-08-19 12:34:28 -07:00
Adam Powell
bfcdfaf919 Fix bug 5174755 - Adjust action bar overflow limits for ifRoom items 
Fix a bug where action menus were not updating after configuration
changes.

Change-Id: Iaeed7d924a7b8b40849fd8e1826ed1c8f4079c94
 2011-08-19 12:18:13 -07:00
Amith Yamasani
bad89a9655 am 7c670365: Merge "Dismiss the volume overlay dialog when user touches above the dialog as well." 
* commit '7c670365ae5abf102da94be78cc9c064fd9d35e4':
  Dismiss the volume overlay dialog when user touches above the dialog as well.
 2011-08-19 11:19:55 -07:00
Amith Yamasani
7c670365ae Merge "Dismiss the volume overlay dialog when user touches above the dialog as well." 2011-08-19 11:17:48 -07:00
Adam Powell
242e0dfe9d am 54f65538: Merge "Fix bug 5186341 - Double Action bar when displayOptions is 0" 
* commit '54f655389a1250aa6835259fa8c97446fd938d0c':
  Fix bug 5186341 - Double Action bar when displayOptions is 0
 2011-08-18 20:37:54 -07:00
Adam Powell
82f24e82e1 Fix bug 5186341 - Double Action bar when displayOptions is 0 
What does it mean??

Change-Id: I7978b8fb6877da6178f8db89ec085f1402acf743
 2011-08-18 20:16:51 -07:00
Adam Powell
6ad84e96bb am 2f548558: Merge "Fix bug 5186160 - ActionBar.hide() doesn\'t hide the split ActionBar if called before onResume()" 
* commit '2f5485587bfe99a56ab8d7b65ead3deb404d178e':
  Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()
 2011-08-18 18:11:45 -07:00
Adam Powell
2f5485587b Merge "Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if called before onResume()" 2011-08-18 18:10:03 -07:00
Dianne Hackborn
dccb1b0fc9 am 937ffc17: Merge "Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked" 
* commit '937ffc174c742c56d33f64c6f1129403445193fd':
  Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked
 2011-08-18 18:07:00 -07:00
Dianne Hackborn
937ffc174c Merge "Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked" 2011-08-18 18:05:19 -07:00
Amith Yamasani
baf6dbfa93 Dismiss the volume overlay dialog when user touches above the dialog as well. 
Bug: 5165168
Change-Id: Ib343c3b88371cb93f8241b1085d1a2f36a77b1ac
 2011-08-18 17:40:29 -07:00
Adam Powell
993a63abb9 Fix bug 5186160 - ActionBar.hide() doesn't hide the split ActionBar if 
called before onResume()

Change-Id: I2c21f2bfb3314426d9dfd3b874f593f375c7838a
 2011-08-18 16:35:53 -07:00
Adam Powell
05ee8244e8 am 931f0b8c: Merge "Fix bug 5099037 - No delete option when multiple videos are selected" 
* commit '931f0b8c07c6647790cf455f1efab88615532bd7':
  Fix bug 5099037 - No delete option when multiple videos are selected
 2011-08-18 16:27:12 -07:00
Adam Powell
931f0b8c07 Merge "Fix bug 5099037 - No delete option when multiple videos are selected" 2011-08-18 16:24:19 -07:00
Adam Powell
23f4cc0353 Fix bug 5099037 - No delete option when multiple videos are selected 
Fix some bugs related to how action item slots are allocated in menus.

Fix some padding/margins in ActivityChooserView.

Change-Id: I12096b0165daca902c5bc8e24c1e8d54a35e9557
 2011-08-18 16:19:31 -07:00
Dianne Hackborn
d99b293d5f Fix issue #5180553: permission RECEIVE_BOOT_COMPLETED is not checked 
Change-Id: I069673f2fbdf05e409c5e9ed99ccd1e15b4fe3ed
 2011-08-18 16:02:41 -07:00
Nicolas Roard
e60245d503 am fc8f2ca6: Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not." 
* commit 'fc8f2ca6216181e95e30ad96be842e0b12b3d46d':
  Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not.
 2011-08-18 15:47:37 -07:00
Nicolas Roard
fc8f2ca621 Merge "Modify nativeSetProperty to return a boolean indicating if we need to invalidate the content or not." 2011-08-18 15:45:27 -07:00
Jeff Sharkey
74e8ebb853 am 9a20fa54: Merge "Background data notification, API clean up." 
* commit '9a20fa54c9ba4bd19f2afd6e8cc6e9954e7cb739':
  Background data notification, API clean up.
 2011-08-18 15:03:51 -07:00
Jeff Sharkey
9a20fa54c9 Merge "Background data notification, API clean up." 2011-08-18 15:01:10 -07:00
Eino-Ville Talvala
16b67137b8 Make changing white-balance mode always disable AWB lock. 
Fixes previously unspecified behavior wrt changing white-balance mode
while AWB is locked.

Change-Id: Ib70597319010cc7e6c88b26cae534ceea4fb46ce
 2011-08-18 13:57:49 -07:00
Adam Powell
46852f4629 am 843c3545: Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave" 
* commit '843c3545d5f92c5d9dbf99f7a7366297ad9799d5':
  Fix bug 5183775 - Action bar custom layouts with default gravity misbehave
 2011-08-18 13:24:30 -07:00
Adam Powell
843c3545d5 Merge "Fix bug 5183775 - Action bar custom layouts with default gravity misbehave" 2011-08-18 13:21:56 -07:00
Chris Craik
e2db1b6140 am da2f8df4: Merge "Removed setExtendedTileBounds" 
* commit 'da2f8df48bed76a82ed6cad22731e5d5ee002723':
  Removed setExtendedTileBounds
 2011-08-18 12:04:58 -07:00
Jeff Sharkey
c58d0a2f91 am 11a8c027: Merge "Preferences padding and scrollbars to match spec." 
* commit '11a8c027e409cf01a2946be3dbd46ac806852849':
  Preferences padding and scrollbars to match spec.
 2011-08-18 12:04:51 -07:00
Adam Powell
7a2424d041 Fix bug 5183775 - Action bar custom layouts with default gravity misbehave 
Change-Id: I314822ed9617d2c1de55e1f3238f1ca8899393f3
 2011-08-18 11:59:27 -07:00
Nicolas Roard
872cf224f3 Modify nativeSetProperty to return a boolean indicating if we 
need to invalidate the content or not.

corresponding C++ CL: https://android-git.corp.google.com/g/#/c/129130/

bug:5167645
Change-Id: I48a3dd252e2a7ef24f3828e1e2955f86867423dd
 2011-08-18 11:53:04 -07:00
Chris Craik
da2f8df48b Merge "Removed setExtendedTileBounds" 2011-08-18 10:56:40 -07:00
Jeff Sharkey
11a8c027e4 Merge "Preferences padding and scrollbars to match spec." 2011-08-18 10:52:03 -07:00
Chris Craik
cb41847901 Removed setExtendedTileBounds 
bug:5178457
for real this time
Change-Id: I4f40206d66feb8ddf6fd844e9fe5cce2096317bc
 2011-08-18 10:24:16 -07:00
JP Abgrall
19899a7e16 am 0197d825: Merge "core/java NetworkManagement: Don\'t untag sockets willy-nilly" 
* commit '0197d825f15844e51b91a0006d411ecb06350641':
  core/java NetworkManagement: Don't untag sockets willy-nilly
 2011-08-18 10:00:10 -07:00
JP Abgrall
0197d825f1 Merge "core/java NetworkManagement: Don't untag sockets willy-nilly" 2011-08-18 09:58:32 -07:00
Mike Lockwood
40a6d3917e Merge "SystemServer: Add support for disabling AudioService and MountService" into ics-aah 2011-08-18 09:34:16 -07:00
Mike Lockwood
7dafec932f SystemServer: Add support for disabling AudioService and MountService 
Using the same convention in system_init.cpp, you can disable these
services by setting system properties:

	system_init.startaudioservice=0
	system_init.startmountservice=0

Change-Id: Ie6c0225bf6e204b0b5e3280b29c7d493d08b8a5c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-08-18 06:32:03 -07:00
Wu-cheng Li
fde00591c6 Merge "Add new camera focus mode FOCUS_MODE_CONTINUOUS_PICTURE." 2011-08-17 22:24:53 -07:00
Romain Guy
7fa6e42483 Merge "Invoke requestLayout() when drawables have different sizes. Bug #5142668" 2011-08-17 20:06:14 -07:00
Romain Guy
9e648c44de Invoke requestLayout() when drawables have different sizes. 
Bug #5142668

Change-Id: I0d3ae27984e69394e64b8aa0623bc3d6b22bc629
 2011-08-17 20:05:38 -07:00
Dianne Hackborn
c7e6c47952 Merge "Fix issue #5163456: logspam/tight loop in BatteryStatsImpl" 2011-08-17 19:18:50 -07:00
Dianne Hackborn
e8c88e6f76 Fix issue #5163456: logspam/tight loop in BatteryStatsImpl 
No longer use the old history code.

Change-Id: I878ffe16e0014453c46db6a4f7228a81468d8cb9
 2011-08-17 19:09:23 -07:00
Chet Haase
4abe2ac244 Merge "Fix potential null deref in ViewGroup when running transition" 2011-08-17 18:38:46 -07:00
Chet Haase
a8a44c68ee Merge "Fix NumberPicker text positioning." 2011-08-17 18:35:07 -07:00
Chet Haase
1abf7fa1d1 Fix potential null deref in ViewGroup when running transition 
Change-Id: I9075c4a05e19122592145468e220afa43faee540
 2011-08-17 18:31:56 -07:00
Chet Haase
eeafd4296b Fix NumberPicker text positioning. 
NumberPicker was making incorrect assumptions about how text was
positioned and centered inside of its controls. This fix changes
the logic of how the scroll wheel draws its text items based on where
the text is positioned inside the EditText that displays the text
by default. This should ensure that the text of the scroll wheel
exactly overlays the text in the EditText view.

Change-Id: I4a7694931f19042bd4142232612490c2ab912d11
 2011-08-17 18:26:56 -07:00
Jeff Sharkey
1666dc6041 Merge "Combine list of CharSequence with delimeter." 2011-08-17 18:12:07 -07:00
Adam Powell
2efd89f755 Merge "Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity" 2011-08-17 17:38:24 -07:00
Adam Powell
aad47fd78a Fix bug 5179524 - ActionBar custom view inflation doesn't catch layout_gravity 
Change-Id: Ice5fd9da268cff64fc14acca384b249c252db5c9
 2011-08-17 17:33:48 -07:00
Fabrice Di Meglio
3de510313a Merge "Fix bug #5175022 Easy mode in MeasuredText.setPara() is no more used" 2011-08-17 17:30:46 -07:00