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

83577 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve Block
ae6cb93477 am 1d15cb0b: am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev 
* commit '1d15cb0b37e4a5d0a7674da3fd321148d2cc1cd1':
  Clean up JavaDoc for CookieManager
 2012-08-15 05:06:29 -07:00
Steve Block
1d15cb0b37 am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev 
* commit '65dfac3bb5e1da2b4b84724cb7e39b47957ece4c':
  Clean up JavaDoc for CookieManager
 2012-08-15 04:56:56 -07:00
Steve Block
65dfac3bb5 Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev 2012-08-15 04:15:08 -07:00
Jeff Brown
e40e367ea9 am 02ccc14b: am f8d9e2fc: Merge "Make all messages in KeyguardViewMediator asynchronous." into jb-mr1-dev 
* commit '02ccc14bada432a695ffb1e33857482cc439d01c':
  Make all messages in KeyguardViewMediator asynchronous.
 2012-08-14 21:32:55 -07:00
Jeff Brown
02ccc14bad am f8d9e2fc: Merge "Make all messages in KeyguardViewMediator asynchronous." into jb-mr1-dev 
* commit 'f8d9e2fccdd9f2addeda852ad168eeb67a5f6626':
  Make all messages in KeyguardViewMediator asynchronous.
 2012-08-14 21:31:14 -07:00
Jeff Brown
f8d9e2fccd Merge "Make all messages in KeyguardViewMediator asynchronous." into jb-mr1-dev 2012-08-14 21:28:52 -07:00
Jeff Brown
109025d778 Make all messages in KeyguardViewMediator asynchronous. 
We don't want these messages to get blocked by UI traversals.

Added a convenience for creating Handlers that always send
asynchronous messages.

Change-Id: Id568e87fcb8b169e8c52c5fe1dc76a4a5771570b
 2012-08-14 20:44:44 -07:00
Dianne Hackborn
c4b584e8d6 am a8ec1f8d: am 595b6565: am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" 
* commit 'a8ec1f8d5b22a8dc71b5b8a30aa711846baac7f0':
  Keep keyguard from starting after finished call when screen is on
 2012-08-14 19:38:17 -07:00
Dianne Hackborn
a8ec1f8d5b am 595b6565: am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" 
* commit '595b6565dcac3af10983310dff6dcfb88b11f457':
  Keep keyguard from starting after finished call when screen is on
 2012-08-14 19:36:27 -07:00
Dianne Hackborn
595b6565dc am 977abbb8: am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" 
* commit '977abbb887cfaf7cd8a0d31235281fbdd639ac19':
  Keep keyguard from starting after finished call when screen is on
 2012-08-14 19:34:14 -07:00
Dianne Hackborn
977abbb887 am 48de12c5: Merge "Keep keyguard from starting after finished call when screen is on" 
* commit '48de12c5d1dc8d856724e8a1ec8288d9bfae40cd':
  Keep keyguard from starting after finished call when screen is on
 2012-08-14 19:31:55 -07:00
Dianne Hackborn
48de12c5d1 Merge "Keep keyguard from starting after finished call when screen is on" 2012-08-14 18:51:00 -07:00
Dianne Hackborn
0edc9710b3 am 5cdb2480: am abac0cd1: Merge "Add PendingIntent and IntentSender APIs to get user handle." into jb-mr1-dev 
* commit '5cdb2480cea21d3bf8862dfb82b13a9deb21813f':
  Add PendingIntent and IntentSender APIs to get user handle.
 2012-08-14 18:29:42 -07:00
Dianne Hackborn
5cdb2480ce am abac0cd1: Merge "Add PendingIntent and IntentSender APIs to get user handle." into jb-mr1-dev 
* commit 'abac0cd16105c60fdd6c5ce37116c972dc7431bb':
  Add PendingIntent and IntentSender APIs to get user handle.
 2012-08-14 18:27:21 -07:00
Dianne Hackborn
abac0cd161 Merge "Add PendingIntent and IntentSender APIs to get user handle." into jb-mr1-dev 2012-08-14 18:24:59 -07:00
Dianne Hackborn
c7501279ee Add PendingIntent and IntentSender APIs to get user handle. 
Also uid.

Change-Id: I0a328d0cc2bbc17dc0a49b7b8b8d515af80f1e15
 2012-08-14 18:05:05 -07:00
Dianne Hackborn
b314486cc9 am aeb35ff5: am 34743ac7: Merge "Add API to create new contexts with custom configurations." into jb-mr1-dev 
* commit 'aeb35ff52d573f4ab88b097852780dc75a0d3960':
  Add API to create new contexts with custom configurations.
 2012-08-14 17:37:16 -07:00
Dianne Hackborn
aeb35ff52d am 34743ac7: Merge "Add API to create new contexts with custom configurations." into jb-mr1-dev 
* commit '34743ac7d688a7ecf4daec84078fc7ec74a6dac9':
  Add API to create new contexts with custom configurations.
 2012-08-14 17:35:09 -07:00
Dianne Hackborn
34743ac7d6 Merge "Add API to create new contexts with custom configurations." into jb-mr1-dev 2012-08-14 17:33:01 -07:00
Dianne Hackborn
756220bd19 Add API to create new contexts with custom configurations. 
This allows you to, say, make a Context whose configuration
is set to a different density than the actual density of the device.

The main API is Context.createConfigurationContext().  There is
also a new API on ContextThemeWrapper that allows you to apply
an override context before its resources are retrieved, which
addresses some feature requests from developers to be able to
customize the context their app is running in.

Change-Id: I88364986660088521e24b567e2fda22fb7042819
 2012-08-14 16:51:38 -07:00
Amith Yamasani
2aff6927ff am c144d2ad: am 07d1b289: Merge "Launch ASSIST intent on the current user" into jb-mr1-dev 
* commit 'c144d2ad107a139390751f66fd9e17837a900d01':
  Launch ASSIST intent on the current user
 2012-08-14 16:39:03 -07:00
Amith Yamasani
c144d2ad10 am 07d1b289: Merge "Launch ASSIST intent on the current user" into jb-mr1-dev 
* commit '07d1b289041c67d42e1ad3fc9343833d8a781998':
  Launch ASSIST intent on the current user
 2012-08-14 16:37:02 -07:00
Amith Yamasani
07d1b28904 Merge "Launch ASSIST intent on the current user" into jb-mr1-dev 2012-08-14 16:34:48 -07:00
Scott Main
e0a21c27f9 am e768571e: am 22a65164: am d54bc800: am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelope 
* commit 'e768571e22308d67df053d94ac487cf45d1b9334':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:31:50 -07:00
Scott Main
e768571e22 am 22a65164: am d54bc800: am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using thi 
* commit '22a65164d241c55bc129ab652de2e2296152cb5d':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:29:47 -07:00
Scott Main
22a65164d2 am d54bc800: am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect al 
* commit 'd54bc8009f745a5f730fa013bb0084c502b18aa9':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:27:40 -07:00
Scott Main
d54bc8009f am 71c4fc81: Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to ch 
* commit '71c4fc818dae494f4acdb24bb6d1b899ddc5e07d':
  docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future.
 2012-08-14 14:26:14 -07:00
Jason Sams
c66e01b89b am 573a22a3: am 3c13dd80: Merge "Intrinsics test" into jb-mr1-dev 
* commit '573a22a31ed2417b03f76888f97d23f60dd74279':
  Intrinsics test
 2012-08-14 14:24:28 -07:00
Scott Main
71c4fc818d Merge "docs: change download URLs for design assets. These new URLs are dummies that are handled by a redirect rule for all /downloads/... paths, that points to http://commondatastorage.googleapis.com/androiddevelopers/ Using this redirect allows us to change the storage location of the download assets in the future." into jb-dev 2012-08-14 14:23:40 -07:00
Jason Sams
573a22a31e am 3c13dd80: Merge "Intrinsics test" into jb-mr1-dev 
* commit '3c13dd8090869f16624234b5a377ba7ad09afa9e':
  Intrinsics test
 2012-08-14 14:22:23 -07:00
Jason Sams
3c13dd8090 Merge "Intrinsics test" into jb-mr1-dev 2012-08-14 14:19:24 -07:00
Fabrice Di Meglio
a5f93f74df am e89ad6c2: am d63b9922: Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev 
* commit 'e89ad6c20fda6f2d5bf983dc32debfb7a177346e':
  Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed
 2012-08-14 14:08:20 -07:00
Fabrice Di Meglio
e89ad6c20f am d63b9922: Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev 
* commit 'd63b992210e40f5af7a7fa5b2c2b6b831c75d468':
  Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed
 2012-08-14 14:05:55 -07:00
Fabrice Di Meglio
d63b992210 Merge "Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed" into jb-mr1-dev 2012-08-14 14:03:51 -07:00
Fabrice Di Meglio
f3e64101bb Fix bug #6908329 TextUtils.ellipsize does not work properly when Locale is changed 
- load the ellipis resources on the fly to get the correct ones depending on the Locale

Change-Id: I42d591e3f5ed715c983f736f94a80143a3897f47
 2012-08-14 14:01:53 -07:00
Daniel Sandler
4f2a430a70 am e189e544: am 41f71dc8: Merge "Use a color resource to specify the dim behind panels." into jb-mr1-dev 
* commit 'e189e544bbe30789f13044d73a2d16eb5bb9cccf':
  Use a color resource to specify the dim behind panels.
 2012-08-14 13:28:30 -07:00
Daniel Sandler
e189e544bb am 41f71dc8: Merge "Use a color resource to specify the dim behind panels." into jb-mr1-dev 
* commit '41f71dc814e89546110c57b7ee73c87f31aaba4e':
  Use a color resource to specify the dim behind panels.
 2012-08-14 13:26:05 -07:00
Daniel Sandler
1cef71176a am a1512fe8: am 2846ea4e: Merge "Fix bug with swipe-to-dismiss." into jb-mr1-dev 
* commit 'a1512fe8c0b3b459cd4589ede74c855e392739a9':
  Fix bug with swipe-to-dismiss.
 2012-08-14 13:25:49 -07:00
Daniel Sandler
a1512fe8c0 am 2846ea4e: Merge "Fix bug with swipe-to-dismiss." into jb-mr1-dev 
* commit '2846ea4e79d1aae3a93689ce09eff6e217b28dac':
  Fix bug with swipe-to-dismiss.
 2012-08-14 13:23:26 -07:00
Daniel Sandler
41f71dc814 Merge "Use a color resource to specify the dim behind panels." into jb-mr1-dev 2012-08-14 13:22:53 -07:00
Daniel Sandler
2846ea4e79 Merge "Fix bug with swipe-to-dismiss." into jb-mr1-dev 2012-08-14 13:20:56 -07:00
Daniel Sandler
e7237fceb1 Fix bug with swipe-to-dismiss. 
(Clearing all notifications prevents notifications from
being subsequently swiped away.)

Change-Id: Ia15704c390d95f16675e2eea6040379099f44430
 2012-08-14 16:08:27 -04:00
Scott Main
045c6f4e64 am a640bb13: am a5d1dc9d: am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit 'a640bb13ed893afd0eaed2dbc7363118caf27209':
  docs: misc bug fixes from external issues
 2012-08-14 12:47:31 -07:00
Scott Main
a640bb13ed am a5d1dc9d: am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit 'a5d1dc9d0322d2c7b7d7f13816fd551a7042c2a3':
  docs: misc bug fixes from external issues
 2012-08-14 12:44:49 -07:00
Scott Main
a5d1dc9d03 am bd63fb87: am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit 'bd63fb875c49d69d5969df35ae159bd17cadb730':
  docs: misc bug fixes from external issues
 2012-08-14 12:42:12 -07:00
Scott Main
bd63fb875c am 6958c161: Merge "docs: misc bug fixes from external issues" into jb-dev 
* commit '6958c161a9f12aaa1db33bdc526040c3691638dc':
  docs: misc bug fixes from external issues
 2012-08-14 12:40:41 -07:00
Amith Yamasani
c1d07a4bd2 Launch ASSIST intent on the current user 
Lockscreen and statusbar now launch the intent on the current user.
Make sure that the intent resolution is made to the package manager
for the specific user, as the app could have been disabled for that
user or may have an alternative app installed.

Change-Id: I93b0f972d6c7e8880b146da83dc3d08a68fe7e51
 2012-08-14 12:39:29 -07:00
Scott Main
6958c161a9 Merge "docs: misc bug fixes from external issues" into jb-dev 2012-08-14 12:38:22 -07:00
Jason Sams
6ab97682fd Intrinsics test 
Change-Id: I1847ad0c9190100eb84f7e052dd9f3bff81dc447
 2012-08-14 12:06:00 -07:00
Baligh Uddin
568ff8ff6b Merge "Import translations. DO NOT MERGE" 2012-08-14 11:45:50 -07:00