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

36000 Commits

Author SHA1 Message Date
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
Baligh Uddin
a239b46722 Import translations. DO NOT MERGE 
Change-Id: Id9f7e8c92b324085300ecd8816c735ef113edfde
Auto-generated-cl: translation import
 2012-10-01 13:28:00 -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
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
Jeff Sharkey
28b291fb89 Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 2012-10-01 13:08:21 -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
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
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
Jeff Brown
9370592e23 am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 
* commit '5d359a92658d01b0220f77eb294d6124848739bc':
  Remove clearUserActivityTimeout().
 2012-10-01 11:41:11 -07:00
Jeff Brown
5d359a9265 am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 
* commit '5e3dcf7210bed65d8f9aec40d9da078daf76dead':
  Remove clearUserActivityTimeout().
 2012-10-01 11:39:30 -07:00
Jeff Brown
5e3dcf7210 Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 2012-10-01 11:35:55 -07:00
Chet Haase
d2e74f3400 am 1dd00221: am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev 
* commit '1dd002214e9734aa862db9b7e7092aacd737e46d':
  Fix texture corruption
 2012-10-01 11:17:35 -07:00
Dianne Hackborn
cc381fc182 am 3645f2cc: am 55241249: am 2a30547a: Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 
* commit '3645f2ccde5ae22e26358d9670ecbc563d415045':
  Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...
 2012-10-01 11:17:31 -07:00
Adam Cohen
91736f8c7b am df1d4c44: am bc0b4313: am 2032a120: Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev 
* commit 'df1d4c44f7ae022c840d705d1a51642ea6a64804':
  Making runway lights appear for correct pages (issue 7232481)
 2012-10-01 11:17:23 -07:00
Adam Powell
2831c963b4 am 5f260236: am 135ce20c: am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev 
* commit '5f260236ed99a7e76ed1c65bd6e6dcf3b694e7d9':
  Fix UNSPECIFIED measurement in RelativeLayout
 2012-10-01 11:17:19 -07:00
Dianne Hackborn
d847b594e4 am eede0f6f: am b4bca666: am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev 
* commit 'eede0f6fe0957bf559a01d94a1b4f5444b3743b5':
  Update APIs to JB MR1 level 17.
 2012-10-01 11:17:08 -07:00
Adam Cohen
db3e07410c am c00a311b: am 6d9c3992: am 0a5bc222: Merge "Integrate keyguard paging hint" into jb-mr1-dev 
* commit 'c00a311b30f862f5705472e4b3d6bfb913420afa':
  Integrate keyguard paging hint
 2012-10-01 11:17:04 -07:00
Adam Cohen
0886acb868 am 2e16cf67: am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev 
* commit '2e16cf67c12b09271e46bed617d940971a2a296e':
  Getting rid of keyguard widget flag that isn't used
 2012-10-01 11:17:00 -07:00
Craig Mautner
000702e368 am 7b9a263b: am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev 
* commit '7b9a263b5022fbe8de031dfc7b9e9202d41199ff':
  Changing debug for b/7094175.
 2012-10-01 11:16:56 -07:00
Fabrice Di Meglio
51e1f8c2a0 am e05c1726: am 3332a701: am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit 'e05c17263827fa26e63f83a82cb024af6b62900c':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-10-01 11:16:47 -07:00
Romain Guy
725fc438a1 am d49faf39: am 25c8c198: am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev 
* commit 'd49faf39ec1eaff58d51e7f6458347ffd51e137c':
  Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
 2012-10-01 11:16:44 -07:00
Fabrice Di Meglio
639d09b466 am 840ea01f: am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '840ea01fcbafe5d6b3fc8d90dcb5d99a65fa0113':
  Fix bug #6427629 Clean up layout direction APIs
 2012-10-01 11:16:35 -07:00
Mike Cleron
e38d699c67 am 25bc59dd: am eb43858e: am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev 
* commit '25bc59dd08ac63c2bade0357a631aa10013e078c':
  Getting rid of blue outline in user switcher, instead brighten the user
 2012-10-01 11:16:23 -07:00
Jeff Brown
b42723b0d5 am 843b014a: am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev 
* commit '843b014aca849a80fe1b2193dc53228f7a8525bd':
  Get rid of preventScreenOn().
 2012-10-01 11:16:18 -07:00
Jatin Lodhia
4625c53a44 am 6c716972: am bf07c7a9: am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev 
* commit '6c7169722f943f3cc2c23ac6b7469f2e7dc2358f':
  Make the theme for choose account and choose account type dialogs same.
 2012-10-01 11:16:14 -07:00
Jim Miller
7a354f052f am 7b439a0e: am 7b4386c6: am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev 
* commit '7b439a0e1109e0c0a8bf0b3019c61b54cedce8fe':
  Clean up SIM PIN and PUK screens in keyguard.
 2012-10-01 11:16:09 -07:00
Dianne Hackborn
4f47f1cc0a am d6985428: am 66e92752: am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit 'd698542867b708f857ce33406249dbf99254086c':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-10-01 11:15:59 -07:00
Adam Powell
586439676f am 21a80ff4: am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 
* commit '21a80ff4d1a557d8e33f86a218d204c0093fefc7':
  Construct a task stack for picking a wifi network from notification
 2012-10-01 10:36:48 -07:00
Adam Powell
21a80ff4d1 am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 
* commit 'c56e5600501a5c376dc13e6a99fcec7782fc8718':
  Construct a task stack for picking a wifi network from notification
 2012-10-01 10:34:59 -07:00
Adam Powell
c56e560050 Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 2012-10-01 10:32:35 -07:00
John Spurlock
e58fc04f7c am db3b01a5: am ff70848e: Merge "Status bar: Keep disabled state per user." into jb-mr1-dev 
* commit 'db3b01a5bfbf5e190bf6116b71e27971c3b5816b':
  Status bar: Keep disabled state per user.
 2012-10-01 10:24:05 -07:00
Chet Haase
1dd002214e am bcdaf8cb: am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev 
* commit 'bcdaf8cb6d75d721507739504732e0e3dc7f437c':
  Fix texture corruption
 2012-10-01 10:16:25 -07:00
Dianne Hackborn
3645f2ccde am 55241249: am 2a30547a: Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 
* commit '552412496c00c04c9af353785936a89743677d49':
  Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...
 2012-10-01 10:16:22 -07:00
Adam Cohen
df1d4c44f7 am bc0b4313: am 2032a120: Merge "Making runway lights appear for correct pages (issue 7232481)" into jb-mr1-dev 
* commit 'bc0b4313a98b8584a939a5087689117d9ffd1966':
  Making runway lights appear for correct pages (issue 7232481)
 2012-10-01 10:16:10 -07:00
Adam Powell
5f260236ed am 135ce20c: am fb42be77: Merge "Fix UNSPECIFIED measurement in RelativeLayout" into jb-mr1-dev 
* commit '135ce20c12ef869028aa7d0182960f92840b7cfc':
  Fix UNSPECIFIED measurement in RelativeLayout
 2012-10-01 10:16:03 -07:00
Dianne Hackborn
eede0f6fe0 am b4bca666: am 2effc77c: Merge "Update APIs to JB MR1 level 17." into jb-mr1-dev 
* commit 'b4bca6661784ab8087e382765c2e0d53e98d651f':
  Update APIs to JB MR1 level 17.
 2012-10-01 10:15:27 -07:00
Adam Cohen
c00a311b30 am 6d9c3992: am 0a5bc222: Merge "Integrate keyguard paging hint" into jb-mr1-dev 
* commit '6d9c3992defced0c0f2779576a10957f7d42c7ff':
  Integrate keyguard paging hint
 2012-10-01 10:15:22 -07:00
Adam Cohen
2e16cf67c1 am e1430669: am b97a71e8: Merge "Getting rid of keyguard widget flag that isn\'t used" into jb-mr1-dev 
* commit 'e14306690096fc3a1ae78f411ba9a7b616224df7':
  Getting rid of keyguard widget flag that isn't used
 2012-10-01 10:15:17 -07:00
Craig Mautner
7b9a263b50 am 61d32c0d: am a6efc965: Merge "Changing debug for b/7094175." into jb-mr1-dev 
* commit '61d32c0d0f05a394129e03d774589b8d93f5f8fb':
  Changing debug for b/7094175.
 2012-10-01 10:15:05 -07:00
Fabrice Di Meglio
e05c172638 am 3332a701: am 10c84edc: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit '3332a701e1cd6453089d7b0c6501c7f37cb69327':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-10-01 10:14:47 -07:00
Romain Guy
d49faf39ec am 25c8c198: am 8ed6b6a9: Merge "Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930" into jb-mr1-dev 
* commit '25c8c198e6abc053fbba19145ed485e31dc5927e':
  Perform a long computation to catch bitmap sizes > 32 bits Bug #7257930
 2012-10-01 10:14:40 -07:00
Fabrice Di Meglio
840ea01fcb am 93cea34a: am f2e5cf48: Merge "Fix bug #6427629 Clean up layout direction APIs" into jb-mr1-dev 
* commit '93cea34a7f7834f42f921402415f7797b677e442':
  Fix bug #6427629 Clean up layout direction APIs
 2012-10-01 10:14:31 -07:00
Mike Cleron
25bc59dd08 am eb43858e: am a995b6e3: Merge "Getting rid of blue outline in user switcher, instead brighten the user" into jb-mr1-dev 
* commit 'eb43858ea041dcb61b2de94f8fa9d069be5fc93c':
  Getting rid of blue outline in user switcher, instead brighten the user
 2012-10-01 10:13:58 -07:00
Jeff Brown
843b014aca am 489c1e9f: am 7f813202: Merge "Get rid of preventScreenOn()." into jb-mr1-dev 
* commit '489c1e9f82250770004ec9080778546b040f6146':
  Get rid of preventScreenOn().
 2012-10-01 10:13:52 -07:00
Jatin Lodhia
6c7169722f am bf07c7a9: am 7c3586c5: Merge "Make the theme for choose account and choose account type dialogs same." into jb-mr1-dev 
* commit 'bf07c7a93f7d8ae2d67eecf98ad76e60212e161b':
  Make the theme for choose account and choose account type dialogs same.
 2012-10-01 10:13:47 -07:00