Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,668 Commits 3 Branches 0 Tags
485f6a60e0182767d57a5ab08d6438124a69439e
Commit Graph

173668 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jose Lima
485f6a60e0 am 4a40f7cc: Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev automerge: 1f81973 
* commit '4a40f7cc90d8f908527d2cfff32376ee51259250':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 21:27:33 +00:00
Leon Scroggins III
1334d5cfb4 am c7109115: am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6 
* commit 'c71091151636f8276c4d1bffc75b66f90a36c774':
 2015-01-28 21:27:15 +00:00
Jose Lima
4a40f7cc90 Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev 
automerge: 1f81973

* commit '1f81973e7d33f2a3f4b0a0e232854283f0f18030':
  Fix crash caused by disabling the Options panel on TVs
 2015-01-28 20:59:05 +00:00
Jose Lima
1f81973e7d Merge "Fix crash caused by disabling the Options panel on TVs" into lmp-mr1-dev 2015-01-28 20:55:52 +00:00
Leon Scroggins III
c710911516 am cefcd81b: am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 automerge: 4c6ace6 
* commit 'cefcd81bdb47ca3196fe487e684880d70ff8073c':
 2015-01-28 19:13:55 +00:00
Leon Scroggins III
cefcd81bdb am 3c9376a5: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. automerge: 1e0d4b5 automerge: 5d7bd13 
automerge: 4c6ace6

* commit '4c6ace6fd683133a2d36e4bf9cb48491055e8d5e':
 2015-01-28 19:09:08 +00:00
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
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
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
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 35dafda1b0.

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
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
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
7608492dea Import translations. DO NOT MERGE 
Change-Id: I1c7abd76bf9a24b5e05058f17d1c64d9051b5f81
Auto-generated-cl: translation import
 2015-01-28 08:21:29 -06: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
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
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
Christopher Tate
f37b20e1aa Merge "Fix 'always' preferred app assignment" into lmp-mr1-dev 2015-01-28 01:14:12 +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
Joe Fernandez
5421eee195 am c6326f44: am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
* commit 'c6326f44bf0634f58a7bf6f322b4b676352baeed':
  docs: plugin for gradle typo
 2015-01-27 23:09:12 +00:00
Joe Fernandez
c6326f44bf am 05defb99: Merge "docs: plugin for gradle typo" into lmp-docs 
* commit '05defb992eefb8a32742d64c06e8e8fd02dbf670':
  docs: plugin for gradle typo
 2015-01-27 23:03:49 +00:00
Leon Scroggins III
714b6517dc am cae216f8: am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit 'cae216f8dc3e1d752f2c353e488da07cadd95570':
  Handle bad ninepatch data.
 2015-01-27 23:02:57 +00:00
Joe Fernandez
05defb992e Merge "docs: plugin for gradle typo" into lmp-docs 2015-01-27 22:57:30 +00:00
Leon Scroggins III
cae216f8dc am 1e0d4b56: am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '1e0d4b5611f9a7134c9ab5fdb62b9385c5161c7c':
  Handle bad ninepatch data.
 2015-01-27 22:55:00 +00:00
Leon Scroggins III
1e0d4b5611 am 1dbbc204: am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '1dbbc2045ae16a4923b30c9576703d02a4363529':
  Handle bad ninepatch data.
 2015-01-27 22:48:29 +00:00
Leon Scroggins III
1dbbc2045a am 6106f6a4: am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '6106f6a490cb5816602e8e3ae84a5c653dda44d3':
  Handle bad ninepatch data.
 2015-01-27 22:42:03 +00:00
Leon Scroggins III
6106f6a490 am 93522968: am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '9352296810926eae663477526545a55e1b1f7a27':
  Handle bad ninepatch data.
 2015-01-27 22:31:47 +00:00
Leon Scroggins III
9352296810 am 01287549: am 9a6143fa: Handle bad ninepatch data. 
* commit '01287549ad415c51377683696eb37c362d43061a':
  Handle bad ninepatch data.
 2015-01-27 22:17:11 +00:00
Tim Kilbourn
00483559b3 am a8a4ce97: am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 
* commit 'a8a4ce97b3dd901d047a436943e9f80e0e8be820':
  Add a config for whether to start in touch mode.
 2015-01-27 22:15:42 +00:00
Tim Kilbourn
a8a4ce97b3 am 597bb696: Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 
* commit '597bb6968be56c1b8b0629ba89fec409084cc112':
  Add a config for whether to start in touch mode.
 2015-01-27 22:09:21 +00:00
Jeff Davidson
b9470f3a23 am 9490c597: am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit '9490c597460a2fcaaf0d510576f4f752b7a725ce':
  Use consistent logic for data icon overlays.
 2015-01-27 22:09:08 +00:00
Tim Kilbourn
597bb6968b Merge "Add a config for whether to start in touch mode." into lmp-mr1-dev 2015-01-27 22:03:50 +00:00
Jeff Davidson
9490c59746 am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit 'bae051f6bd8ae4f103d8067ed96accbced173664':
  Use consistent logic for data icon overlays.
 2015-01-27 22:03:24 +00:00