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

88018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
8135814af2 am 9b6f05f8: am 749a9970: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev 
* commit '9b6f05f8df9a754f5240b610c556d7946aa7aad8':
  Fix bug #7259242 text is left justified with no padding
 2012-10-01 15:08:45 -07:00
Adam Powell
5d3c3e2a98 am 7b5a57c4: am 3f00ffbe: Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev 
* commit '7b5a57c414f3ec5693cb0ad4d9e4f1d3b1df3361':
  MediaRouter/Wifi Display improvements
 2012-10-01 15:08:41 -07:00
Victoria Lease
b57852ab87 am 80faaa35: am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev 
* commit '80faaa3558a6d21990ae6bcf24eb7f8015db710f':
  Avoid NPE in GpsLocationProvider
 2012-10-01 15:06:57 -07:00
Fabrice Di Meglio
9b6f05f8df am 749a9970: Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev 
* commit '749a997093751a5d2e5b71f0ae3ab5b7527b68bd':
  Fix bug #7259242 text is left justified with no padding
 2012-10-01 15:06:19 -07:00
Adam Powell
7b5a57c414 am 3f00ffbe: Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev 
* commit '3f00ffbe2b97f8acd9edcd683ed48cc65710e6f1':
  MediaRouter/Wifi Display improvements
 2012-10-01 15:04:37 -07:00
Fabrice Di Meglio
749a997093 Merge "Fix bug #7259242 text is left justified with no padding" into jb-mr1-dev 2012-10-01 15:04:03 -07:00
Victoria Lease
80faaa3558 am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev 
* commit '2961d111570d310b3ba504784e7cff651bc93207':
  Avoid NPE in GpsLocationProvider
 2012-10-01 15:02:34 -07:00
Adam Powell
3f00ffbe2b Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev 2012-10-01 15:01:25 -07:00
Victoria Lease
2961d11157 Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev 2012-10-01 14:59:57 -07:00
Craig Mautner
3840b27b5e am 190ca7dd: am 1f7a09b5: Merge "Only inform DisplayManager of visible content." into jb-mr1-dev 
* commit '190ca7ddad52ad78a0f313313ab744ed4c7848c8':
  Only inform DisplayManager of visible content.
 2012-10-01 14:27:53 -07:00
Craig Mautner
190ca7ddad am 1f7a09b5: Merge "Only inform DisplayManager of visible content." into jb-mr1-dev 
* commit '1f7a09b5df9f859781d9cfa0053fad44c72c2168':
  Only inform DisplayManager of visible content.
 2012-10-01 14:26:06 -07:00
Craig Mautner
84ee1941af am b6f60405: am ba30ac6a: Merge "Redraw static wallpapers when a redraw is needed." into jb-mr1-dev 
* commit 'b6f60405f12c8a4005e6b06c15943808a11b5bac':
  Redraw static wallpapers when a redraw is needed.
 2012-10-01 14:25:11 -07:00
Craig Mautner
1f7a09b5df Merge "Only inform DisplayManager of visible content." into jb-mr1-dev 2012-10-01 14:23:39 -07:00
Craig Mautner
b6f60405f1 am ba30ac6a: Merge "Redraw static wallpapers when a redraw is needed." into jb-mr1-dev 
* commit 'ba30ac6aa7bc4df030292c62c9f38fac0a65b79e':
  Redraw static wallpapers when a redraw is needed.
 2012-10-01 14:23:24 -07:00
Craig Mautner
ba30ac6aa7 Merge "Redraw static wallpapers when a redraw is needed." into jb-mr1-dev 2012-10-01 14:20:09 -07:00
Adam Powell
2ee6a2a832 MediaRouter/Wifi Display improvements 
* Don't select the default route on initialization in a process

* Add "connecting" state to MediaRouteButton

Bug 7258981
Bug 7262522

Change-Id: I5cd39b09843783b7e1e17620ca33193f0f3b8fca
 2012-10-01 14:05:32 -07:00
Craig Mautner
65d11b3eef Only inform DisplayManager of visible content. 
WindowManager was notifying DisplayManager of content if any window
existed on a display. Now the window must be visible and we must not
be showing a Dream or the Keyguard.

Bug: 7214060.
Change-Id: I9ce4a49aabfbac22ff1e39a837199ce35b9f7503
 2012-10-01 13:59:52 -07:00
Fabrice Di Meglio
ba45f4131c am c7942606: am 48315436: Merge "Fix light default theme" into jb-mr1-dev 
* commit 'c79426065efcbda7a6f8f7dd6297502b817c6a75':
  Fix light default theme
 2012-10-01 13:59:39 -07:00
Fabrice Di Meglio
c79426065e am 48315436: Merge "Fix light default theme" into jb-mr1-dev 
* commit '48315436eece69f4d047c2b14ac63e62f757b88c':
  Fix light default theme
 2012-10-01 13:57:36 -07:00
Fabrice Di Meglio
48315436ee Merge "Fix light default theme" into jb-mr1-dev 2012-10-01 13:55:15 -07:00
Fabrice Di Meglio
5fb54dada2 am b67dff06: am a004f28a: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit 'b67dff065cfea410fba26fef758ac103ac8c9930':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-10-01 13:45:10 -07:00
Fabrice Di Meglio
b67dff065c am a004f28a: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit 'a004f28aa4909add9d3b1070d437adafd6386c94':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-10-01 13:43:00 -07:00
Fabrice Di Meglio
a004f28aa4 Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 2012-10-01 13:39:09 -07:00
Jason Sams
b4cce25be0 am bc5a364b: am e65afdb1: Merge "Lighten grain and make live preview gpu friendly." into jb-mr1-dev 
* commit 'bc5a364b0ee8e8e207059201ef2b6f18086f90f8':
  Lighten grain and make live preview gpu friendly.
 2012-10-01 13:21:43 -07:00
Amith Yamasani
c424bc0ed7 am d60801f7: am a6af5fc1: Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev 
* commit 'd60801f7ae223ca507ab5cb8574e68cf9e55e35f':
  Fix layout margins for Preferences in dialogs
 2012-10-01 13:20:02 -07:00
Jason Sams
bc5a364b0e am e65afdb1: Merge "Lighten grain and make live preview gpu friendly." into jb-mr1-dev 
* commit 'e65afdb179c319b654ae2e77d34d6d5d09709966':
  Lighten grain and make live preview gpu friendly.
 2012-10-01 13:19:41 -07:00
Jason Sams
e65afdb179 Merge "Lighten grain and make live preview gpu friendly." into jb-mr1-dev 2012-10-01 13:18:04 -07:00
Amith Yamasani
d60801f7ae am a6af5fc1: Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev 
* commit 'a6af5fc12777e98a8486f6fd51ab19634831320a':
  Fix layout margins for Preferences in dialogs
 2012-10-01 13:18:03 -07:00
Amith Yamasani
a6af5fc127 Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev 2012-10-01 13:15:31 -07:00
Jeff Sharkey
1e7de794a5 am 9e3004ef: am 28b291fb: Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 
* commit '9e3004ef3bd20b053ad3f290775900ae356ec054':
  Move bluetooth priorities from Secure to Global.
 2012-10-01 13:13:25 -07:00
Fabrice Di Meglio
80766f1bdf Fix bug #7259242 text is left justified with no padding 
(padding is hard)

- set correct values to mUserPaddingLeftInitial / mUserPaddingRightInitial
- reset padding to initial values depending on layout direction

Change-Id: I5cfb941b4874eafbfcfb5e2926f5a3c80b4931d3
 2012-10-01 13:13:12 -07:00
Jeff Sharkey
9e3004ef3b am 28b291fb: Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 
* commit '28b291fb890332ca5f68ffa912a01c16ff6b7685':
  Move bluetooth priorities from Secure to Global.
 2012-10-01 13:11:30 -07:00
Amith Yamasani
b45ab722b7 am 30655e03: am b525c3cf: Merge "Fix broadcast to a specific user" into jb-mr1-dev 
* commit '30655e0339748cb670eb2fef0dc51dc3c83eee24':
  Fix broadcast to a specific user
 2012-10-01 13:10:07 -07:00
Amith Yamasani
6021eacb3d am ce3db01c: am 2036a94a: Merge "Fix cache deletion for secondary users" into jb-mr1-dev 
* commit 'ce3db01cc8a27e6ee642e9e2c4548b5a03dfde2a':
  Fix cache deletion for secondary users
 2012-10-01 13:10:04 -07:00
Jeff Sharkey
28b291fb89 Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 2012-10-01 13:08:21 -07:00
Dake Gu
b6cdfaaf44 am 8d8c13ec: Merge "Add aah metadata service to whitelist DO NOT MERGE" into jb-mr1-aah-dev 
* commit '8d8c13ec9b294a861b765bfde3349e7d49b13b30':
  Add aah metadata service to whitelist DO NOT MERGE
 2012-10-01 13:08:17 -07:00
Amith Yamasani
30655e0339 am b525c3cf: Merge "Fix broadcast to a specific user" into jb-mr1-dev 
* commit 'b525c3cfc7484c87fcf96b48447b2a220b25f519':
  Fix broadcast to a specific user
 2012-10-01 13:08:10 -07:00
Amith Yamasani
ce3db01cc8 am 2036a94a: Merge "Fix cache deletion for secondary users" into jb-mr1-dev 
* commit '2036a94a9004613644bdbdab1b10e476be3f0213':
  Fix cache deletion for secondary users
 2012-10-01 13:08:06 -07:00
Dake Gu
8d8c13ec9b Merge "Add aah metadata service to whitelist DO NOT MERGE" into jb-mr1-aah-dev 2012-10-01 13:06:25 -07:00
Amith Yamasani
b525c3cfc7 Merge "Fix broadcast to a specific user" into jb-mr1-dev 2012-10-01 13:05:28 -07:00
Amith Yamasani
2036a94a90 Merge "Fix cache deletion for secondary users" into jb-mr1-dev 2012-10-01 13:05:28 -07:00
Jeff Sharkey
0ac1028b0d Move bluetooth priorities from Secure to Global. 
Bug: 7231171
Change-Id: I836fdc2cfb8d67f984b4715559b9e92d0dc41c95
 2012-10-01 12:54:12 -07:00
Daniel Sandler
0835ce740c am 3993bb00: am 383b0f8f: Merge "Repair lights out mode." into jb-mr1-dev 
* commit '3993bb00312a9d51b3e770a559a5d18bb9000b43':
  Repair lights out mode.
 2012-10-01 12:47:59 -07:00
Daniel Sandler
3993bb0031 am 383b0f8f: Merge "Repair lights out mode." into jb-mr1-dev 
* commit '383b0f8f738df792050cc2f99f599e53718a3111':
  Repair lights out mode.
 2012-10-01 12:45:28 -07:00
Adam Powell
bbd18b0ae6 am 518c7bf6: am d0c439ba: Merge "Remove extra padding from alert dialog layouts in -xlarge" into jb-mr1-dev 
* commit '518c7bf62f2a67348bafa34c0b3e9c1742480307':
  Remove extra padding from alert dialog layouts in -xlarge
 2012-10-01 12:45:01 -07:00
Adam Powell
518c7bf62f am d0c439ba: Merge "Remove extra padding from alert dialog layouts in -xlarge" into jb-mr1-dev 
* commit 'd0c439ba7e7f246c96dfef4dbf2b11fb38358c6a':
  Remove extra padding from alert dialog layouts in -xlarge
 2012-10-01 12:42:47 -07:00
Dake Gu
710d705eae Add aah metadata service to whitelist DO NOT MERGE 
Temporary solution for b/7262633.  We are using binder service for IPC between
mediaserver and client app for sending synchronized beat tempo.  The change
will never be merged back to upstream.  Will replace it with a new IPC
mechanism later.

Change-Id: Ic06546a0085e401f49b65e0327247fcce1df681f
 2012-10-01 12:41:51 -07:00
Daniel Sandler
383b0f8f73 Merge "Repair lights out mode." into jb-mr1-dev 2012-10-01 12:41:31 -07:00
Adam Powell
d0c439ba7e Merge "Remove extra padding from alert dialog layouts in -xlarge" into jb-mr1-dev 2012-10-01 12:40:31 -07:00
Daniel Sandler
825b33073f Repair lights out mode. 
Broken by change I5662269b.

Bug: 7263523
Change-Id: Iae77d12c91443aecfed3e6461b5206208de4ddf7
 2012-10-01 15:27:57 -04:00