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

97812 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joe Fernandez
82703ea4e8 Merge "docs: SDK r21.0.1 Release Notes" into jb-mr1-dev 2012-12-13 12:10:58 -08:00
Scott Main
933cf8d3d2 am 2a87c9da: am c49ffcde: am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit '2a87c9da129d23930a4e5fc7c7a34d933129840d':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:40:14 -08:00
Scott Main
2a87c9da12 am c49ffcde: am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit 'c49ffcdee87d185c6857bdad94f7cf53f04f6a65':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:38:19 -08:00
Scott Main
c49ffcdee8 am f83ab33c: am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit 'f83ab33c57f22f040fdb6ae546a3aae39a1b2b4c':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:36:23 -08:00
Scott Main
f83ab33c57 am 095d6947: docs: explain that layout height/width must be used to override include layouts 
* commit '095d69474b8d9fbe2507f6015d0ef6821af31ae0':
  docs: explain that layout height/width must be used to override include layouts
 2012-12-13 11:34:14 -08:00
Scott Main
095d69474b docs: explain that layout height/width must be used to override include layouts 
Change-Id: I7ee63f2f05b2e9a8cd424dfb2e7c9bead9d5efc6
 2012-12-13 10:59:58 -08:00
Joe Fernandez
15776a22d5 docs: SDK r21.0.1 Release Notes 
Change-Id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3
 2012-12-13 10:59:32 -08:00
Nick Kralevich
abe998c5e0 Remove dead code. 
Android no longer supports a security manager.
System.getSecurityManager() always returns null.

Change-Id: Id44ae8e100da901f2e3054dab905376423a8ff5b
 2012-12-13 10:49:28 -08:00
Joe Fernandez
045563cf60 docs: NDK r8d Release Notes 
Change-Id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
 2012-12-13 10:37:57 -08:00
Przemyslaw Szczepaniak
b46533732c Set default language in new TTS clients. 
A recent change altered semantics of getLanguage call to return client
language instead of service language. This solved problems
with interferences between two clients using different lanaguages.

This change created a bug - new TTS client instance have no language set.
Since reading user preferences requires additional permissions I've
added new tts service method - getClientDefaultLanguage that will return
user preferences.

I've also added new client method, getDefaultLanguage, that allow easy
access to this data.

Bug: 7666482
Change-Id: Ieb7d2ba3a99d20c513add97f054874720a1cd82e
 2012-12-13 03:21:30 -08:00
Jeff Brown
d90a56fadc Merge "Track app and display wakelocks separately." 2012-12-12 16:49:30 -08:00
Jeff Brown
27f7a866f5 Track app and display wakelocks separately. 
Change the power manager to use two different kernel wakelocks
to distinguish between an application or the display keeping the
CPU alive.  This may help make the output of "dumpsys batteryinfo"
easier to interpret.

Bug: 7726759
Change-Id: Iaff96ad74030d00200617b459679ea16390a8da5
 2012-12-12 16:20:17 -08:00
Craig Mautner
6cf1a66348 Merge "Call adjustWallpaperWindowsLocked once per pass." 2012-12-12 15:35:57 -08:00
The Android Automerger
978d1e51ac merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-12-12 15:06:12 -08:00
Stephen Hines
a52b503b2e Merge "Compatibility lib changes for IP2." 2012-12-12 15:02:54 -08:00
Nick Kralevich
0490f02eb7 Merge "Remove unused code." 2012-12-12 12:43:36 -08:00
Nick Kralevich
ddb622e728 Merge "Add new protected broadcasts" 2012-12-12 12:41:13 -08:00
Fabrice Di Meglio
3509935919 Fix bug #7724071 ImageView drawable is not loaded correctly when changing Locale 
aapt is not generating the correct CONFIG_LAYOUTDIR bit when a Drawable has a
LTR and RTL version. It was generating instead the wrong CONFIG_SCREEN_LAYOUT bit.

This was linked to the fact that the layout direction bits are contained into the
screen layout bit.

So now make sure that we are generating the correct CONFIG_LAYOUTDIR bit.

Change-Id: If17c84d31e6c128721ed97ee6711660b131bf941
 2012-12-12 11:52:03 -08:00
Amith Yamasani
912f01865a am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '68c308607b01bafd31c91572a81f4563e2199260':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:46:41 -08:00
Amith Yamasani
68c308607b am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '73f24ae1d9992cf70cb05bc319d12478b2c49566':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:43:21 -08:00
Amith Yamasani
73f24ae1d9 am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '9a1473406f634ea541bd1643dc70d9aae8c10e77':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:41:14 -08:00
Amith Yamasani
9a1473406f Merge "Don't update global table when upgrading secondary users' database." into jb-mr1.1-dev 2012-12-12 11:39:18 -08:00
Baligh Uddin
ca059d6d1f Merge "Import translations. DO NOT MERGE" 2012-12-12 11:34:33 -08:00
Baligh Uddin
a60f5545ca am cd281b79: (-s ours) am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE 
* commit 'cd281b7929b208126ccc17c7cca4aeedf934b3ea':
  Import translations. DO NOT MERGE
 2012-12-12 11:28:12 -08:00
Baligh Uddin
cd281b7929 am 1858bfd1: am 90e41469: Import translations. DO NOT MERGE 
* commit '1858bfd1a5d951b8c14f81b11172dfed84f5d87f':
  Import translations. DO NOT MERGE
 2012-12-12 11:26:13 -08:00
Baligh Uddin
75e72013bc Import translations. DO NOT MERGE 
Change-Id: I2aacaa12b308eaa3813d6793a78ec24177bc88fc
Auto-generated-cl: translation import
 2012-12-12 11:24:31 -08:00
Baligh Uddin
f0a2ae27a7 am 47d2db68: (-s ours) am f1c6f1d3: Import translations. DO NOT MERGE 
* commit '47d2db689d52ead99799272b104cf6c8cd8a889a':
  Import translations. DO NOT MERGE
 2012-12-12 11:24:29 -08:00
Baligh Uddin
1858bfd1a5 am 90e41469: Import translations. DO NOT MERGE 
* commit '90e41469fe99e52de2144ed24d005a1b30e5f917':
  Import translations. DO NOT MERGE
 2012-12-12 11:24:00 -08:00
Baligh Uddin
47d2db689d am f1c6f1d3: Import translations. DO NOT MERGE 
* commit 'f1c6f1d3870707c4f76261219de0bb2968bf2d31':
  Import translations. DO NOT MERGE
 2012-12-12 11:22:04 -08:00
Baligh Uddin
90e41469fe Import translations. DO NOT MERGE 
Change-Id: I19d85dc7580e4a4e20a89bc3d56fe8a434d8f585
Auto-generated-cl: translation import
 2012-12-12 11:14:26 -08:00
Baligh Uddin
f1c6f1d387 Import translations. DO NOT MERGE 
Change-Id: I6079f968a77282ed15f6a46b05dd2318c1c39ba2
Auto-generated-cl: translation import
 2012-12-12 11:11:44 -08:00
Jeff Sharkey
0813894118 am 764bc0a7: am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts." 
* commit '764bc0a7ae9c623f18aceadda2d5d894b1bf4024':
  Remove unnecessary locking for screen broadcasts.
 2012-12-12 11:11:13 -08:00
Jeff Sharkey
764bc0a7ae am bf8de6a3: Merge "Remove unnecessary locking for screen broadcasts." 
* commit 'bf8de6a349e19b32a1577080a9d8bb7f92b2301f':
  Remove unnecessary locking for screen broadcasts.
 2012-12-12 11:06:36 -08:00
Jamie Gennis
7efad644c5 Merge "stop using a deprecated SurfaceTextureClient ctor" 2012-12-12 10:57:20 -08:00
Jeff Sharkey
bf8de6a349 Merge "Remove unnecessary locking for screen broadcasts." 2012-12-12 10:41:20 -08:00
Nick Kralevich
4d254266a4 Remove unused code. 
Change-Id: I6785cea91c0ab2c367645201fb8862dbf1a55773
 2012-12-12 10:38:40 -08:00
Robert Greenwalt
4274d3f6f3 Merge "Removing unused INITING state." 2012-12-12 10:14:18 -08:00
Craig Mautner
ae44659f30 Call adjustWallpaperWindowsLocked once per pass. 
Also refactor a few methods and improve logging.

Change-Id: Ic54a1ff99f6de732b31cda5c06d36e8de01a269c
 2012-12-12 10:09:19 -08:00
Amith Yamasani
2d43fabaf7 Don't update global table when upgrading secondary users' database. 
Bug: 7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
 2012-12-12 09:52:26 -08:00
Irfan Sheriff
fdb9138c40 Merge "Expose more details in broadcasts" 2012-12-12 09:29:13 -08:00
The Android Open Source Project
3c1ded1664 am e08791c8: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit 'e08791c8318216b7934742681edfab57b8147d78':
 2012-12-12 07:36:27 -08:00
The Android Open Source Project
e08791c831 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: I3041300565b33629c8d2609a75d384b731f292ce
 2012-12-12 07:34:03 -08:00
Irfan Sheriff
3a67e2515b Expose more details in broadcasts 
Expose details in broadcasts and do the necessary clean up alongside

Change-Id: I9011d51675a233aa3542f097c8a489c2095103b1
 2012-12-11 22:00:14 -08:00
Stephen Hines
f43ac732e1 Compatibility lib changes for IP2. 
Bug: 7419958
Change-Id: Ibd62c06b60875e17d232e27f1845ce0ffafff834
 2012-12-11 19:59:52 -08:00
Andrew Hsieh
eba8254c8c Fix typo 
Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS

Change-Id: I3d5525d7dacbf8f007e3230e1ca87b69245a96b1
 2012-12-12 11:27:44 +08:00
Adam Powell
2331b42328 am dc4beb48: am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
* commit 'dc4beb483eb14f1b56154125c67b780802756572':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
 2012-12-11 19:12:45 -08:00
Adam Powell
dc4beb483e am e7ec492f: Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
* commit 'e7ec492f13355888c90b3f08fbc66e49dda7ed24':
  Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter
 2012-12-11 19:10:45 -08:00
Adam Powell
90f4c5c9d4 am c6f05e93: am d22843a8: Merge "Fix regression in ListView click handling" 
* commit 'c6f05e93dc37db67addcd19ff87ba013ba817035':
  Fix regression in ListView click handling
 2012-12-11 18:04:23 -08:00
Adam Powell
c6f05e93dc am d22843a8: Merge "Fix regression in ListView click handling" 
* commit 'd22843a8a8d240fc09291b1b9505d62c1f0c0f8d':
  Fix regression in ListView click handling
 2012-12-11 18:02:30 -08:00
Adam Powell
e7ec492f13 Merge "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 2012-12-11 18:00:49 -08:00