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

181134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Lima
bd769a15ab Fix crash caused by disabling the Options panel on TVs 
Address more cases where calls to getPanelState may cause a crash when the
options panel is disabled on a platform.

Bug: 19178531
Bug: 18780696
Change-Id: Ib72bb8483e636181788ed3919c4cb9e99a94b7b1
 2015-01-28 10:46:39 -08:00
xinhe
6620b4273e Sprint: MMS cannot be sent in the UK 
This is due to Sprint network at UK is actually GSM/UMTS. Thus we need GSM phone with CSIM to provide Nai too.

Bug:18241756
Change-Id: Icec10c88834151f5e35e38db93af36d7f40890fd
 2015-01-28 10:40:27 -08:00
Leon Scroggins III
4c6ace6fd6 am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 
* commit '3c9376a5a2cbcad5c6883dad1e938a7924a8dd4d':
 2015-01-28 18:32:20 +00:00
Chien-Yu Chen
25af2fc0cc Merge "CameraManager: add torch mode APIs for flashlight" 2015-01-28 18:24:47 +00:00
Leon Scroggins III
3c9376a5a2 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 
automerge: 5d7bd13

* commit '5d7bd13fc88d066d4c27a2459f3e3a58a1f4dec2':
 2015-01-28 18:23:47 +00:00
Bryce Lee
c0086ea950 am 263987f6: am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '263987f6268439af69fcfa66a278103e1efe1343':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 18:05:04 +00:00
John Spurlock
8cbfad3934 am 7fb346ec: am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit '7fb346ec209eac91b9673840e10b3c9040dbef3f':
  Default "pickup peforms proximity check" to false.
 2015-01-28 18:04:56 +00:00
Bryce Lee
263987f626 am 2a8ccd4b: am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '2a8ccd4b1f82086f6e38ec32ad084306400dcf93':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 17:58:41 +00:00
John Spurlock
7fb346ec20 am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit '4b41400b60d57f23b16702540b9d50f98aeeffb7':
  Default "pickup peforms proximity check" to false.
 2015-01-28 17:58:35 +00:00
Bryce Lee
2a8ccd4b1f am 1061652a: Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 
* commit '1061652a37e18683c994f9d4b872ecf990125a05':
  Revert "Make THEATER_MODE_ON setting a system api."
 2015-01-28 17:52:59 +00:00
John Spurlock
4b41400b60 am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit 'e2f4ab930fa4526cf989624356051b99008c23a6':
  Default "pickup peforms proximity check" to false.
 2015-01-28 17:52:48 +00:00
Bryce Lee
1061652a37 Merge "Revert "Make THEATER_MODE_ON setting a system api."" into lmp-mr1-dev 2015-01-28 17:50:39 +00:00
John Spurlock
e2f4ab930f Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 2015-01-28 17:48:13 +00:00
Bryce Lee
034dc3839f Revert "Make THEATER_MODE_ON setting a system api." 
This reverts commit 35dafda1b0357eb0f2eef766427a2b473967a918.

Change-Id: I76e72592791682e0dbee719fbd518962a1bdcd11
 2015-01-28 17:45:35 +00:00
Leon Scroggins III
5d7bd13fc8 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
automerge: 1e0d4b5

* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
 2015-01-28 17:39:52 +00:00
Bryce Lee
293465a75c am f2d5253b: am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'f2d5253bce5ef69cb6cb4da7697a228a47b55904':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:22:22 +00:00
Bryce Lee
f2d5253bce am fdb8dff5: am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'fdb8dff54cf9327089e5ee4d5bf461ef42020fcd':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:15:11 +00:00
Bryce Lee
fdb8dff54c am d8cb4040: Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 
* commit 'd8cb404035e8e133e310f5d811d44e3b0ecb8dcf':
  Make THEATER_MODE_ON setting a system api.
 2015-01-28 17:09:21 +00:00
Bryce Lee
d8cb404035 Merge "Make THEATER_MODE_ON setting a system api." into lmp-mr1-dev 2015-01-28 17:03:57 +00:00
Geoff Mendal
06a8a121b0 Merge "Import translations. DO NOT MERGE" 2015-01-28 15:51:39 +00:00
Geoff Mendal
f218141bc9 Import translations. DO NOT MERGE 
Change-Id: I908acd89310fd1f9e7a974043e00d97197fcff12
Auto-generated-cl: translation import
 2015-01-28 07:46:39 -08:00
Geoff Mendal
71122950bb am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE 
automerge: da02921  -s ours

* commit 'da029217c891e989a569f327487b3db7ea7b0d81':
  Import translations. DO NOT MERGE
 2015-01-28 15:38:46 +00:00
Geoff Mendal
da029217c8 am a4293a9b: (-s ours) am 7608492d: (-s ours) Import translations. DO NOT MERGE 
* commit 'a4293a9b91a41c80e3af255da3cee22f6cb974d9':
  Import translations. DO NOT MERGE
 2015-01-28 15:36:25 +00:00
Geoff Mendal
a4293a9b91 am 7608492d: (-s ours) Import translations. DO NOT MERGE 
* commit '7608492dea3e05e6c6ace5bceb17dceb512dbc6d':
  Import translations. DO NOT MERGE
 2015-01-28 15:26:16 +00:00
Geoff Mendal
4e04b1a068 Import translations. DO NOT MERGE 
Change-Id: Ia7c0dac57e019a08a6b7f0a327d03de327dcbac0
Auto-generated-cl: translation import
 2015-01-28 06:55:37 -08:00
Geoff Mendal
7608492dea Import translations. DO NOT MERGE 
Change-Id: I1c7abd76bf9a24b5e05058f17d1c64d9051b5f81
Auto-generated-cl: translation import
 2015-01-28 08:21:29 -06:00
Jinsuk Kim
c9914a22d8 CEC: Let <Active Source> from the active source work 
<Active Source> from the device which is already in active
source state is being ignored now, but it should work with an effect
of putting input view foreground in case it is hidden behind
home launcher overlay.

For better user experience, this change lets the command from
the active source takes effect to hide the overlay if present.

Bug: 19171319
Change-Id: I43d2646f2ad470b3636e82ff71ac83cf0031ef6c
 2015-01-28 16:37:17 +09:00
Joe Fernandez
47185e8c71 am 3961def5: am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee 
automerge: 617af27

* commit '617af27167d4d943043761414709e115e74c55fa':
  docs: plugin for gradle typo
 2015-01-28 04:33:59 +00:00
Leon Scroggins III
ebc9ee75f5 am ca4aee06: am 1fa564ef: am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 714b651 
automerge: beeec02

* commit 'beeec02225d16a28e4077704a78156169c041c59':
  Handle bad ninepatch data.
 2015-01-28 04:32:50 +00:00
Joe Fernandez
617af27167 am 3961def5: am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee 
* commit '3961def5a917eff8afcb50aa4c718bd9cd4351a5':
  docs: plugin for gradle typo
 2015-01-28 04:30:47 +00:00
Leon Scroggins III
beeec02225 am ca4aee06: am 1fa564ef: am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 714b651 
* commit 'ca4aee06ccf3bb92c4c1ad9c554186dbf5f9f095':
  Handle bad ninepatch data.
 2015-01-28 04:30:42 +00:00
Joe Fernandez
3961def5a9 am f8afd564: am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs automerge: 5421eee 
* commit 'f8afd564066f95dd724c9de499ee9acabf45787d':
  docs: plugin for gradle typo
 2015-01-28 04:21:13 +00:00
Leon Scroggins III
ca4aee06cc am 1fa564ef: am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 714b651 
* commit '1fa564ef54787287a3fdfe6ee97d4a0295f0d8c7':
  Handle bad ninepatch data.
 2015-01-28 04:21:09 +00:00
Joe Fernandez
f8afd56406 am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
automerge: 5421eee

* commit '5421eee195265d05c821814501aae1bf3f468661':
  docs: plugin for gradle typo
 2015-01-28 04:14:54 +00:00
Leon Scroggins III
1fa564ef54 am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
automerge: 714b651

* commit '714b6517dcca03a1a6496b33064d54a6b781914a':
  Handle bad ninepatch data.
 2015-01-28 04:13:25 +00:00
Craig Mautner
5d49712960 Merge "Remove TYPE_UNIVERSE_BACKGROUND from system" 2015-01-28 02:35:15 +00:00
Christopher Tate
5e0cd7768e am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
automerge: 134aedd

* commit '134aedd2c9bce194a5c826fe7a9a7389edd8bcad':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:49:56 +00:00
Christopher Tate
134aedd2c9 am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
* commit '46e657bdbc4323fcab14882f87ece86bc8838892':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:47:53 +00:00
Christopher Tate
715437763c am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev 
automerge: ff1876d

* commit 'ff1876d1fb8dfcaba61d3fc7de296d663a4e160e':
  Fix 'always' preferred app assignment
 2015-01-28 01:38:08 +00:00
Christopher Tate
46e657bdbc am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
* commit '26faa0be670484b3f32b9e4b07533c3fbef540f5':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:36:33 +00:00
Christopher Tate
ff1876d1fb am 0c607b97: am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev 
* commit '0c607b97f068ca486036a501052572e9207c0926':
  Fix 'always' preferred app assignment
 2015-01-28 01:35:58 +00:00
Christopher Tate
26faa0be67 Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 2015-01-28 01:23:49 +00:00
Christopher Tate
0c607b97f0 am f37b20e1: Merge "Fix \'always\' preferred app assignment" into lmp-mr1-dev 
* commit 'f37b20e1aa03fe662e7cef8e6aee2ded9ea5e514':
  Fix 'always' preferred app assignment
 2015-01-28 01:20:44 +00:00
Chris Craik
ef43819a7c Merge "Move scissor state to RenderState" 2015-01-28 01:14:47 +00:00
Christopher Tate
f37b20e1aa Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev 2015-01-28 01:14:12 +00:00
Chris Craik
65fe5eeb19 Move scissor state to RenderState 
Change-Id: I1227a3886fb24e4d9fad79fca469794f06cfb15e
 2015-01-27 17:12:39 -08:00
Alan Viverette
5f54ecbe47 Update system-current to fix build 
Change-Id: Ib8e092cf5097def96eebf85179e6daa683cd717e
 2015-01-27 17:01:04 -08:00
Chien-Yu Chen
c8c109b403 CameraManager: add torch mode APIs for flashlight 
Add torch mode APIs to support flashlight without opening any
camera devices.

Bug: 2682206
Change-Id: Ifb66c309f23fd7e9f124016e0d9c6b364d19acdd
 2015-01-27 16:55:16 -08:00
Tim Kilbourn
616c118f8e am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 
automerge: 0048355

* commit '00483559b3f5fbdb6bc28ac617fbc0eaea2aa503':
  Add a config for whether to start in touch mode.
 2015-01-28 00:29:28 +00:00
Jeff Davidson
b5217c1831 Merge "resolved conflicts for merge of b9470f3a to master" 2015-01-28 00:26:04 +00:00