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

163143 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Leon Scroggins III
01287549ad am 9a6143fa: Handle bad ninepatch data. 
* commit '9a6143fab7d93797e4b22a12b89e07c160e5c31d':
  Handle bad ninepatch data.
 2015-01-27 22:01:08 +00:00
Jeff Davidson
bae051f6bd Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 2015-01-27 21:57:06 +00:00
Christopher Tate
57792912ee Fix 'always' preferred app assignment 
In the case when some possible resolutions of a given intent are at
different priorities (typically when they're intended as fallbacks when
no "normal" handler for the intent exists) the check for "is this the
same set of possible handlers that we saw last time?" was broken.  We
now ignore resolver priority entirely in that check: match set comparison
should be orthogonal to prioritization within the set, and indeed the
priority is dealt with separately in any event.

Bug 19011225

Change-Id: I3c1658442cc88b1f4a5c5f2fe9f64472799e156c
 2015-01-27 13:52:17 -08:00
Tim Kilbourn
9626854543 Add a config for whether to start in touch mode. 
Bug: 18925810
Change-Id: Ic9b956cde380cffcad7ca229f1669692b1743e6d
 2015-01-27 13:51:58 -08:00
Ricardo Cervera
8ff85c5ecb am be3731f0: am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'be3731f028cf815d51e7c49b7415d7d1e8ac3639':
  docs: Transitions training class.
 2015-01-27 21:34:45 +00:00
Ricardo Cervera
be3731f028 am f5386a9a: am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit 'f5386a9a949297be1321cce7eed5d0975c7b64ad':
  docs: Transitions training class.
 2015-01-27 21:28:14 +00:00
Ricardo Cervera
f5386a9a94 am 8ec3eb4e: am de113066: docs: Transitions training class. 
* commit '8ec3eb4e7c38c3c368c62bc47805d802df15f2a8':
  docs: Transitions training class.
 2015-01-27 21:23:19 +00:00
Ricardo Cervera
8ec3eb4e7c am de113066: docs: Transitions training class. 
* commit 'de113066d80c3f19979eb531484af73f64640de9':
  docs: Transitions training class.
 2015-01-27 21:16:53 +00:00
Craig Mautner
604a9e280e am 5426e7ae: Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 
* commit '5426e7ae93e0e728e0e12bc98a02c957d464cfe0':
  Defer tap outside stack until multiwindows
 2015-01-27 20:54:42 +00:00
Craig Mautner
5426e7ae93 Merge "Defer tap outside stack until multiwindows" into lmp-mr1-dev 2015-01-27 20:48:55 +00:00
Craig Mautner
baf6bef001 Defer tap outside stack until multiwindows 
Taps outside of the stack boundary were causing the current app to
lose focus. This led to timeouts waiting for the app to respond.

Disabling the tap recognition keeps the focus from changing. It will
be reenabled for multiwindows.

Fixes bug 17721767.

Change-Id: Iad854b19979390e73b97239e489ad7ef82e03d47
 2015-01-27 11:44:59 -08:00
Ricardo Cervera
de113066d8 docs: Transitions training class. 
Change-Id: Ib41b42a890c44fdc001242bc356442ef9201b591
 2015-01-27 11:35:20 -08:00
Leon Scroggins III
9a6143fab7 Handle bad ninepatch data. 
Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
(cherry picked from commit a730ef3f77fc495bc90199b4d45efab26d609782)
 2015-01-27 19:04:57 +00:00
Leon Scroggins III
3523e4fcb3 am efe085ff: Merge "Handle bad ninepatch data." into lmp-mr1-dev 
* commit 'efe085ffbd97b6f9d1460a9642084a6d3be11797':
  Handle bad ninepatch data.
 2015-01-27 18:27:18 +00:00
Leon Scroggins III
efe085ffbd Merge "Handle bad ninepatch data." into lmp-mr1-dev 2015-01-27 18:22:42 +00:00
Matthew Xie
46c3304aed am 485813a0: Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 
* commit '485813a00cfd857fadab30c67cab985835857801':
  Delay the second message for 30ms more than the last message for a2dp
 2015-01-27 18:17:00 +00:00
Matthew Xie
485813a00c Merge "Delay the second message for 30ms more than the last message for a2dp" into lmp-mr1-dev 2015-01-27 18:13:40 +00:00
Leon Scroggins III
a730ef3f77 Handle bad ninepatch data. 
Changes proposed by Ben Hawkes of Google Project Zero.

NinePatchPeeker.cpp:
Instead of asserting, return false for bad data.

ResourceTypes.h:
Store ninepatch values as unsigned.

BUG:19151999
Change-Id: Ibe35e7569f632c6bb8a34a7701e26bb6ed547ec2
 2015-01-27 16:41:16 +00:00
George Mount
fff84a232a Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 
automerge: aa6945a

* commit 'aa6945ac7904611499ae4ad33799d1f1fe434d32':
  Activity Transition: fix quick back after enter.
 2015-01-27 15:15:38 +00:00
George Mount
aa6945ac79 Merge "Activity Transition: fix quick back after enter." into lmp-mr1-dev 2015-01-27 15:13:32 +00:00
Lorenzo Colitti
b84e0040d8 am 525588c5: Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 
* commit '525588c593794cf52d93665e9cf55f06abd3d1b7':
  Make NetworkMonitor less aggressive on broken networks.
 2015-01-27 11:46:31 +00:00
Lorenzo Colitti
525588c593 Merge "Make NetworkMonitor less aggressive on broken networks." into lmp-mr1-dev 2015-01-27 11:41:10 +00:00
Svetoslav
fcecdccc0f am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit '369f1ec6ea78637870f35822456628e7ae8caf95':
  Add a missing file to print spooler resources
 2015-01-27 04:26:55 +00:00
Svetoslav
55120a0f1a am 197adec3: Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 
* commit '197adec3656fc087d4aa56396e601bb8d04aa9fd':
  Accessibility: Ignore overlapping siblings when computing a click location
 2015-01-27 04:26:51 +00:00
Svetoslav
369f1ec6ea Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 2015-01-27 04:24:08 +00:00
Svetoslav
197adec365 Merge "Accessibility: Ignore overlapping siblings when computing a click location" into lmp-mr1-dev 2015-01-27 04:23:44 +00:00
Jose Lima
445768bddf am 3fd8a433: Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 
* commit '3fd8a433a918fc9c57b6d7ff12839a1e028d6dad':
  Allow disabling the Options Pannel feature for TVs
 2015-01-27 02:58:44 +00:00
Jose Lima
3fd8a433a9 Merge "Allow disabling the Options Pannel feature for TVs" into lmp-mr1-dev 2015-01-27 02:53:22 +00:00
Jeff Davidson
ccda996611 Use consistent logic for data icon overlays. 
Ensure that we always show the data icon in both Quick Settings and
the status bar, or in neither, but never one or the other.

The particular inconsistency this is intended to fix is that in some
circumstances, Wi-Fi may be connected, but the cell radio may be still
be used by certain apps, due to new multinetworking APIs in L. In this
case, we should always show the data icon; currently appears in the
status bar, but not Quick Settings, which was unconditionally dropping
the icon if any Wi-Fi connection was up.

Bug: 19112322
Change-Id: I9942f6b24081e061a72804ef47ad4fe719f32ec2
 2015-01-26 18:23:24 -08:00
Craig Mautner
603d30b1cf Merge "Stop logging service starts and stops." into lmp-mr1-dev 
automerge: 49880ee

* commit '49880eeb00c71a2287db65717fd8a7ff5e87279d':
  Stop logging service starts and stops.
 2015-01-27 01:41:15 +00:00
Wonsik Kim
b3c06e49c8 Merge "TIF: fix loud volume after input switch when volume is 0" into lmp-mr1-dev 
automerge: cd8a80c

* commit 'cd8a80c7077ee1ef14888e1a735b20c7119c1aac':
  TIF: fix loud volume after input switch when volume is 0
 2015-01-27 01:39:56 +00:00
Jose Lima
7a22fc62d3 Allow disabling the Options Pannel feature for TVs 
- Added a config entry in velues-television to disable the options panel
feature for TVs.
- Fixed parts of the code in PhoneWindow that assumed this feature is supposed
to always be available, which was causing exceptions when it was turned off.

Bug: 18780696
Change-Id: I923bd4b5019d634e5352a6e893005133edb475f6
 2015-01-26 17:39:49 -08:00
Craig Mautner
49880eeb00 Merge "Stop logging service starts and stops." into lmp-mr1-dev 2015-01-27 01:15:35 +00:00
Chris Craik
00c53d66dd am cdd8b7f8: Merge "Invalidate outline on padding update" into lmp-mr1-dev 
* commit 'cdd8b7f8199eb94ca133c8cebddf86adb0f9bb11':
  Invalidate outline on padding update
 2015-01-27 01:13:00 +00:00