Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,776 Commits 3 Branches 0 Tags
af2e9e36820696b3827e9c2ca6df23feed4bfe33
Commit Graph

26293 Commits

Author SHA1 Message Date
Adam Powell
af2e9e3682 am 5d3c3e2a: am 7b5a57c4: am 3f00ffbe: Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev 
* commit '5d3c3e2a98b98e99862fd524cbd491e4ee928e1a':
  MediaRouter/Wifi Display improvements
 2012-10-01 15:11:02 -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
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
Adam Powell
3f00ffbe2b Merge "MediaRouter/Wifi Display improvements" into jb-mr1-dev 2012-10-01 15:01:25 -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
Fabrice Di Meglio
b788c84251 am 5fb54dad: am b67dff06: am a004f28a: Merge "Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings" into jb-mr1-dev 
* commit '5fb54dada2d76266668deada1ea3d048304c5841':
  Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings
 2012-10-01 14:00:52 -07:00
Jeff Sharkey
b7f23fa07f am 1e7de794: am 9e3004ef: am 28b291fb: Merge "Move bluetooth priorities from Secure to Global." into jb-mr1-dev 
* commit '1e7de794a5afa3918698716b582299fb92c8f7f9':
  Move bluetooth priorities from Secure to Global.
 2012-10-01 13:48:46 -07:00
Jeff Brown
38d41fa44c am 9370592e: am 5d359a92: am 5e3dcf72: Merge "Remove clearUserActivityTimeout()." into jb-mr1-dev 
* commit '9370592e23cd3dd6dbf514fa21f4c17b76d60911':
  Remove clearUserActivityTimeout().
 2012-10-01 13:47:55 -07:00
Adam Powell
7a4e3898f1 am 58643967: am 21a80ff4: am c56e5600: Merge "Construct a task stack for picking a wifi network from notification" into jb-mr1-dev 
* commit '586439676fdec80d5e0c6151fc17bb52be5cc6b0':
  Construct a task stack for picking a wifi network from notification
 2012-10-01 13:47:32 -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
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
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
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 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
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
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
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
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 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
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
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
Dianne Hackborn
d698542867 am 66e92752: am 84215565: Merge "Fix issue #7255954: API Review: rename Dream to DreamService" into jb-mr1-dev 
* commit '66e92752260e4ef21e77a44379f3a6b8969b4d65':
  Fix issue #7255954: API Review: rename Dream to DreamService
 2012-10-01 10:13:25 -07:00
Tadashi G. Takaoka
22816c34da Fix DigitsKeyListener to be able to accept "+" sign 
Bug: 7255318
Change-Id: Id5a6c11ffc62cc79c1db0baaf8d184174691d034
 2012-10-01 15:48:27 +09:00
Adam Powell
d56b4d1db3 Construct a task stack for picking a wifi network from notification 
Bug 7001327

Change-Id: I5a79e6933cd33386cd0aa4df626f15902deedd67
 2012-09-30 18:30:42 -07:00
Jeff Brown
edce6a7978 Remove clearUserActivityTimeout(). 
This function is not implemented and not needed.

Bug: 7165399
Change-Id: Ib1c50fabad6292ccf670404ba70aeb1242c4614d
 2012-09-30 16:23:05 -07:00
Fabrice Di Meglio
b023a587ad Fix bug #7199562 UI mirroring for RTL locales (Arabic, Hebrew, Farsi): Play settings 
- add CheckedTextViewStyle with "viewStart" as default text alignment
- fix some typos

Change-Id: Ia8161c48faf579c89ba5ed49a436e4269178b8c1
 2012-09-30 16:20:52 -07:00
Chet Haase
bcdaf8cb6d am 62ea4363: Merge "Fix texture corruption" into jb-mr1-dev 
* commit '62ea4363362526d32b48f920601d3b4e27a117bb':
  Fix texture corruption
 2012-09-30 15:56:39 -07:00
Dianne Hackborn
552412496c am 2a30547a: Merge "Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest..." into jb-mr1-dev 
* commit '2a30547af44536f6b0e2f7020ac1a435c72afc84':
  Work on issue #6949468: android.dpi.cts.ConfigurationScreenLayoutTest...
 2012-09-30 15:55:02 -07:00