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

181067 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
Jeff Davidson
5c7daaf776 resolved conflicts for merge of b9470f3a to master 
Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad
 2015-01-27 16:24:32 -08:00
Alan Viverette
ca360e14af Merge "Fix fallout from merging e5743753 conflicts" 2015-01-28 00:22:03 +00:00
Alan Viverette
4c05c4c216 Fix fallout from merging e5743753 conflicts 
Change-Id: Iad16381bdf925a05e2ec609c3a5442c2a0354be9
 2015-01-27 16:21:25 -08:00
Alan Viverette
b032cd1f52 Merge "Expose View.OnScrollChangeListener interface" 2015-01-28 00:02:21 +00:00
Christopher Tate
14d0e1a4e1 Enforce backup encryption in the UI, not just in effect 
Encryption is required when using 'adb backup' on encrypted devices,
but the UI has not been enforcing this.  The failure mode is quite
confusing: the user can tap "back up my data" with no encryption
phrase supplied, and the confirmation activity disappears, but
the backup doesn't actually happen.

We now disallow confirming the backup unless a non-empty passphrase
has been entered into the UI.

In addition, tapping "do not back up my data" now finishes
the confirmation activity instead of just leaving it in a
confusing "dead" state.

Bug 19081192

Change-Id: I9ca69a08ff4322fe25129f9ca880b066c31525d0
 2015-01-27 15:58:36 -08:00
Ricardo Cervera
d05d91358d am 8ff85c5e: am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
automerge: 3c6cd62

* commit '3c6cd6273ce89598c10cc15aa2843a7f8301ff27':
  docs: Transitions training class.
 2015-01-27 23:44:52 +00:00
Craig Mautner
4baf8d9e9e am 604a9e28: am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
automerge: bf6af73

* commit 'bf6af73de6b24e53e9656da75b542d2f8caa77e6':
  Defer tap outside stack until multiwindows
 2015-01-27 23:43:26 +00:00
Jason Sams
bf58b6861e am 02236295: am 4dd0cf42: Merge "Initialize clipping structure" 
automerge: 45e6c8b

* commit '45e6c8b31253d864d55c9835c76180a9b3d5bd59':
  Initialize clipping structure
 2015-01-27 23:41:56 +00:00
Marco Nelissen
565bca4e19 am 3ea395dd: am 4e853598: Merge "Fix printf format" 
automerge: 2c2415a

* commit '2c2415a552b62016886af62419080ca7ac327871':
  Fix printf format
 2015-01-27 23:40:39 +00:00
Alan Viverette
f9d7eedc46 Expose View.OnScrollChangeListener interface 
Allows clients to observe changes to scrollX / scrollY.

Bug: 19098033
Change-Id: I070e61a9532fe1f6cb5437eab94f7fffc1b17e97
 2015-01-27 15:38:19 -08:00
Mike Lockwood
aadd020849 Merge "AndroidManifest.xml: Remove two obsolete protected broadcasts" 2015-01-27 23:35:46 +00:00
Leon Scroggins III
283ddb9d4f am 3523e4fc: am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev 
automerge: 8475144

* commit '847514499f5920d073f5cd402dd0d3bbd19ac2c1':
  Handle bad ninepatch data.
 2015-01-27 23:34:35 +00:00
Marco Nelissen
0a3f0b020e am 99985d98: am e74da38e: Merge "Make SoundPool use MediaCodec" 
automerge: 6e14c57

* commit '6e14c5705c5acf9d6036060252f257a084cd7578':
  Make SoundPool use MediaCodec
 2015-01-27 23:33:05 +00:00