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

5888 Commits

Author SHA1 Message Date
Jeff Brown
eaf3665861 am 709b9434: am bcbe9cf4: Merge "Add new Display API for secure video capabilities." into jb-mr1-dev 
* commit '709b943475e3395b580451911557f894480e3133':
  Add new Display API for secure video capabilities.
 2012-10-02 16:44:02 -07:00
Jeff Brown
bcbe9cf475 Merge "Add new Display API for secure video capabilities." into jb-mr1-dev 2012-10-02 16:39:08 -07:00
Jim Miller
8c4343378c am 90f7f565: am 970a494c: Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 
* commit '90f7f5657a67dc7a5caee42f44bcdd6d9b3da5b2':
  Attempt to fix missing transport control in keyguard
 2012-10-02 16:30:34 -07:00
Jim Miller
970a494ce1 Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-dev 2012-10-02 16:25:15 -07:00
Jeff Brown
77aebfdbae Add new Display API for secure video capabilities. 
Added a new API to determine whether the display supports
protected buffers so that an application can choose a different
content stream or change how it decodes the content so
that it will be viewable on the display.

At present, wifi display does not fully support protected
buffers although this may be enhanced in the future.

Bug: 6986623
Change-Id: If53a53d72b0ec92753cc4b29f99fcb131e00449b
 2012-10-02 16:25:10 -07:00
Robert Greenwalt
8bf6cbb958 am 94195fa6: am 98ec5660: Merge "Re-add default sms_short_codes." into jb-mr1-dev 
* commit '94195fa611331dd7ea771e1e24ca6d50caa0fb89':
  Re-add default sms_short_codes.
 2012-10-02 15:55:05 -07:00
Robert Greenwalt
98ec56604d Merge "Re-add default sms_short_codes." into jb-mr1-dev 2012-10-02 15:49:58 -07:00
Jim Miller
4e81bd4bcf Attempt to fix missing transport control in keyguard 
This attempts to fix a bug where the transport control would sometimes be
inoperative.  The problem is that we had two transport control layouts
on some devices because they were being declared in the layout file.

The fix is to only inflate the layout once when KeyguardHostView
is created.

Also removes redundant KeyguardStatusView.

Fixes bug 7254833

Change-Id: Iab84e8326ff745ee57be5177ab2561114c8dc6f0
 2012-10-02 14:41:34 -07:00
Adam Cohen
0114639dea am c546c40d: am bebefaac: Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev 
* commit 'c546c40da84a7576e3f5b2cc1441edf02b6d0df2':
  Fixing up keyguard widget pager layouts
 2012-10-02 11:33:50 -07:00
Adam Cohen
bebefaac17 Merge "Fixing up keyguard widget pager layouts" into jb-mr1-dev 2012-10-02 11:29:14 -07:00
Eric Laurent
3de070d5bd am aade5d14: am 57e62034: Merge "enable safe media volume according to country" into jb-mr1-dev 
* commit 'aade5d14da459a25f08f78b0cb1d15aa2ce7d566':
  enable safe media volume according to country
 2012-10-02 10:02:31 -07:00
Eric Laurent
d640bd325c enable safe media volume according to country 
Enable safe headphone volume feature for all countries that
do not opt otherwise in their mmc configuration.
Opt out for US.

Bug 7231029.

Change-Id: I2619d627508eb2cd1f73db9242e0cb5efa839a2a
 2012-10-02 08:46:26 -07:00
Svetoslav Ganov
1a17084c4d am ef89d33f: am 30ed33b1: Merge "Owner should not be announces as a user switch." into jb-mr1-dev 
* commit 'ef89d33f5bc90e3a0527ac91e00385f47937612c':
  Owner should not be announces as a user switch.
 2012-10-01 23:38:30 -07:00
Svetoslav Ganov
814615212f am a6404170: am 0a551d6b: Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev 
* commit 'a6404170784609bd1ed0771e612a7d30fec62624':
  Upading the strings for the global accessibility enabling gesture.
 2012-10-01 23:38:26 -07:00
Baligh Uddin
43d091b885 am 506a9224: Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 
* commit '506a922469ff9d3064d648592aa896ee62b3142b':
  Revert "Import translations. DO NOT MERGE"
 2012-10-01 23:33:14 -07:00
Adam Cohen
7ffa8c08f3 Fixing up keyguard widget pager layouts 
-> Related to issue 7232481 and issue 7261844

Change-Id: Ib3c15ed78d3473036820bb3061dcd1cd34a2bfc4
 2012-10-01 21:51:18 -07:00
Svetoslav Ganov
30ed33b141 Merge "Owner should not be announces as a user switch." into jb-mr1-dev 2012-10-01 21:19:11 -07:00
Svetoslav Ganov
0a551d6b36 Merge "Upading the strings for the global accessibility enabling gesture." into jb-mr1-dev 2012-10-01 21:19:11 -07:00
Baligh Uddin
506a922469 Merge "Revert "Import translations. DO NOT MERGE"" into jb-mr1-aah-dev 2012-10-01 21:09:08 -07:00
Baligh Uddin
bab210d597 Revert "Import translations. DO NOT MERGE" 
Broken build - sorry

This reverts commit a239b46722427ec7d37710c20917d97649b85127

Change-Id: Id74623459743790046573b2f018aee9a6b509886
 2012-10-01 21:02:56 -07:00
Svetoslav Ganov
59f07690c2 Owner should not be announces as a user switch. 
1. The accessibility layer announces user switches. Even though
   the initial switch to the owner on a singe user device is a
   valid use switch we should not announce it for accessibility.

bug:7264693

Change-Id: Idf022fab6b74c84b7a96bc4ed7c7fee2b83029a6
 2012-10-01 19:22:43 -07:00
Svetoslav Ganov
9a455fbe71 Upading the strings for the global accessibility enabling gesture. 
bug:7255486

Change-Id: I10b0e5a97518bbb442656c142bf2c822f897331b
 2012-10-01 18:45:21 -07:00
Baligh Uddin
448858dff3 am aae92acf: Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 
* commit 'aae92acf9c44a2ee27c0010e62e0703bda485fe8':
  Import translations. DO NOT MERGE
 2012-10-01 17:20:31 -07:00
Baligh Uddin
aae92acf9c Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev 2012-10-01 17:17:42 -07:00
Fabrice Di Meglio
36eeab6813 am 43f5815c: am 2b77c102: Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 
* commit '43f5815c488a674dc02384c2f0c708ca55ef55c5':
  Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)
 2012-10-01 16:59:23 -07:00
Fabrice Di Meglio
2b77c102d2 Merge "Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi)" into jb-mr1-dev 2012-10-01 16:52:37 -07:00
Craig Mautner
80944c5c92 am 397c8629: am b97d8764: Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev 
* commit '397c862913c2c50e54d18dee7766b0ac93971ae3':
  Switch from uevent model to /dev/input/event.
 2012-10-01 16:43:27 -07:00
Craig Mautner
b97d8764a0 Merge "Switch from uevent model to /dev/input/event." into jb-mr1-dev 2012-10-01 16:38:46 -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
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
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
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
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
a6af5fc127 Merge "Fix layout margins for Preferences in dialogs" into jb-mr1-dev 2012-10-01 13:15:31 -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 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
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
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
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
Jim Miller
7b439a0e11 am 7b4386c6: am 1ed143ea: Merge "Clean up SIM PIN and PUK screens in keyguard." into jb-mr1-dev 
* commit '7b4386c6177c874208f7f221787fca9079d2b7c4':
  Clean up SIM PIN and PUK screens in keyguard.
 2012-10-01 10:13:43 -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
Adam Powell
32a1e7642e Remove extra padding from alert dialog layouts in -xlarge 
Restore visual consistency with other device classes.

Bug 7259219

Change-Id: I1ffc88654e2fc9781fd59c6cecca6d5614ca0663
 2012-09-30 19:08:14 -07:00
Fabrice Di Meglio
534bc83f53 Fix bug #7132595 Settings - UI mirroring for RTL locales (Arabic, Hebrew, farsi) 
- add mirrored versions of Up image

Change-Id: Ib13d8f50afe83b58d3ccffeebe523c257cb2b34d
 2012-09-30 18:11:56 -07:00
Craig Mautner
2f39e9f833 Switch from uevent model to /dev/input/event. 
Headsets are now detected from calls coming in from the input switch
subsystem if a config.xml value is set to true.

Bug: 6548391.

Change-Id: I79259d2742e157b106a746474f32ffd1c171ddf3
 2012-09-30 18:07:45 -07:00