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

15407 Commits

Author SHA1 Message Date
Svet Ganov
db30ac84b6 Merge "Make read/write from/to XML persistent state more robust." 2015-04-22 20:44:20 +00:00
Svet Ganov
ba0821ed3b Make read/write from/to XML persistent state more robust. 
When writing critical state to XML an excpetion can lead to creating
a malformed XML that is later parsed and may put the device in a bad
state. Hence, on any error while writing we should bail out and drop
the partially write state on the floor.

Corollary, any error on parsing can lead to having a partially read
state that is not consistent which may lead to writing this bad state
back to disk. Hence, on any error while parsing we should bail as
our current state may be unrecoverable.

Change-Id: Ia050c16198cb583f8a51263ad2035dbb948052b8
 2015-04-22 13:42:54 -07:00
Steve McKay
a56104d74d Merge "Reduce code duplication between DocumentsActivity and StandaloneActivity." 2015-04-22 18:13:21 +00:00
Ben Kwa
4b1ebb4f4f Merge "Disable copying from Recents." 2015-04-22 17:46:19 +00:00
Ben Kwa
c5979d98cf Disable copying from Recents. 
Recents view contains a whole bunch of content aggregated from
potentially many different sources.  Dealing with all these in a single
copy operation can be complex, so for simplicity, copying from recents
view is disabled.

BUG=20487641

Change-Id: I6052e62ee0446da7741f13abfed97044e147dd7d
 2015-04-22 10:33:53 -07:00
Steve McKay
ef3e2cf35f Reduce code duplication between DocumentsActivity and StandaloneActivity. 
Ensure StandaloneActivity has toolbar management consistent w/ DocumentsActivity.
Introduce a separate SearchManager class since there seemed to be a sufficient body of logic and state to warrant the separation.

Change-Id: I87d9da40095c6de575b124005ca34a8c0b0b4b35
 2015-04-22 09:44:30 -07:00
Geoff Mendal
9487a28a78 Merge "Import translations. DO NOT MERGE" 2015-04-22 13:06:51 +00:00
Geoff Mendal
37b4c7989d Import translations. DO NOT MERGE 
Change-Id: I72c5378c90345a929c525db99e47abd0c67fdb2f
Auto-generated-cl: translation import
 2015-04-22 06:05:01 -07:00
Geoff Mendal
79be57ca3d Merge "Import translations. DO NOT MERGE" 2015-04-22 13:03:50 +00:00
Geoff Mendal
0c886bbb9b Import translations. DO NOT MERGE 
Change-Id: I971de964d782fbfd1b54a1fcb5d1366c7416f0e8
Auto-generated-cl: translation import
 2015-04-22 06:01:35 -07:00
Geoff Mendal
2782432b4e Merge "Import translations. DO NOT MERGE" 2015-04-22 12:48:54 +00:00
Geoff Mendal
7a80d99ac4 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:47:09 +00:00
Geoff Mendal
2ce10f0f85 Import translations. DO NOT MERGE 
Change-Id: Icab122bac2891ca4580116d2c357b7ac64d6baad
Auto-generated-cl: translation import
 2015-04-22 05:45:49 -07:00
Geoff Mendal
9e672e0d18 Import translations. DO NOT MERGE 
Change-Id: I67f51468d775874da33c28786b86c69e7f1459b1
Auto-generated-cl: translation import
 2015-04-22 05:42:32 -07:00
Geoff Mendal
0cdb63213e Merge "Import translations. DO NOT MERGE" 2015-04-22 12:40:00 +00:00
Geoff Mendal
fb13b1a25d Import translations. DO NOT MERGE 
Change-Id: Ic171492db55349ae11e8c83cee37f53c1bf1f349
Auto-generated-cl: translation import
 2015-04-22 05:39:05 -07:00
Geoff Mendal
1edd3aa997 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:32:13 +00:00
Geoff Mendal
b83bf8330f Import translations. DO NOT MERGE 
Change-Id: Ifd3267e13368e7c6deccb173e90b65c5c7a526f6
Auto-generated-cl: translation import
 2015-04-22 05:30:32 -07:00
Geoff Mendal
af11fc17b7 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:28:57 +00:00
Geoff Mendal
6fa9148e5e Import translations. DO NOT MERGE 
Change-Id: If4919373256f7d4e74072e4c34fcfbc36bad6825
Auto-generated-cl: translation import
 2015-04-22 05:27:09 -07:00
Geoff Mendal
910c5426fa Merge "Import translations. DO NOT MERGE" 2015-04-22 12:26:45 +00:00
Geoff Mendal
409d7b2449 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:25:30 +00:00
Geoff Mendal
4614991d85 Import translations. DO NOT MERGE 
Change-Id: Ib1c155c8eedd0773a5d973813665792e749dd458
Auto-generated-cl: translation import
 2015-04-22 05:24:05 -07:00
Geoff Mendal
79bd3bb8ef Merge "Import translations. DO NOT MERGE" 2015-04-22 12:24:05 +00:00
Geoff Mendal
e58224f266 Import translations. DO NOT MERGE 
Change-Id: I0893584e89cfc86caea9f5f5f43f8d7dd94873d8
Auto-generated-cl: translation import
 2015-04-22 05:20:51 -07:00
Geoff Mendal
964ced6423 Merge "Import translations. DO NOT MERGE" 2015-04-22 12:19:52 +00:00
Geoff Mendal
ad8bdc9fae Import translations. DO NOT MERGE 
Change-Id: I74dde9cd7fb513553a5da3614ff24724db011042
Auto-generated-cl: translation import
 2015-04-22 05:17:28 -07:00
Geoff Mendal
9ad72222be Import translations. DO NOT MERGE 
Change-Id: I12b2928b11ea4ed7111e7c36753192ac07fee8d4
Auto-generated-cl: translation import
 2015-04-22 05:14:12 -07:00
Geoff Mendal
b8e8746e23 Import translations. DO NOT MERGE 
Change-Id: Ibe34266cd7076ba077fae3f629eeda6c4bc583cf
Auto-generated-cl: translation import
 2015-04-22 05:10:53 -07:00
Ben Kwa
4d4af84c7e Merge "Implement some tests for com.android.documentsui.CopyService." 2015-04-21 22:54:45 +00:00
Ben Kwa
448dbbbf0e Implement some tests for com.android.documentsui.CopyService. 
- Add a unit test for CopyService.
- Make some changes to StubProvider to make it more configurable, for
  testing.

Change-Id: I3d726099feaf6b7a3fdd40bf2449f4ee3e848d77
 2015-04-21 15:39:12 -07:00
Adrian Roos
fb52c73fb5 Merge "Clear emergency dialer task on launch" 2015-04-21 19:47:43 +00:00
Adrian Roos
0ab5742cf7 Clear emergency dialer task on launch 
Bug: 20344056
Change-Id: Ic26f003acad3f9f91d772e5b4be8bd4b8aff5ec8
 2015-04-21 12:35:11 -07:00
Deepanshu Gupta
d981c0d4f0 Merge "Add resources to recyclerview dependency." 2015-04-21 18:31:46 +00:00
Deepanshu Gupta
6c04e5e916 Add resources to recyclerview dependency. 
Change-Id: I03c1dbacf8c83149de3ee01fe6d7dbb288d1948a
(cherry picked from commit 202cbbe45383b871129743d55179cf1c6429fffc)
 2015-04-21 11:21:38 -07:00
Jim Miller
93ea09a376 Merge "Make fingerprint enroll/authenticate haptic feedback part of framework." 2015-04-21 17:45:52 +00:00
Robin Lee
0fa9987b5b Merge "SecurityController: track VPN for all users" 2015-04-21 14:30:55 +00:00
Robin Lee
9cb1d5f641 SecurityController: track VPN for all users 
Fixes inconsistencies when switching users.

Bug: 17763561
Bug: 17506956
Bug: 18419023
Change-Id: I65988e6c45afd00a402d1e266922d5648fd12743
 2015-04-21 15:28:20 +01:00
Thiemo Nagel
fb6f8b4f63 Merge "Remove unsed failedAttemptWarning in reportFailedUnlockAttempt()." 2015-04-21 11:29:31 +00:00
Erik Kline
32830cc820 Listen for CONNECTIVITY_ACTION instead of _IMMEDIATE 
I missed this in yesterday's reaping of CONNECTIVITY_ACTION_IMMEDIATE.

Bug: 20013379
Change-Id: I6a7a0b76c1e2d183d9357ecf912ebb6dc0a5c08f
 2015-04-21 13:27:48 +09:00
Daichi Hirono
d00d70a6ce Merge "DocumentsUI: Save source file list into BaseActivity.State." 2015-04-21 03:56:21 +00:00
Jim Miller
af281ca0d3 Make fingerprint enroll/authenticate haptic feedback part of framework. 
Change-Id: Icc2e9ec4b30a6f3a21e3bbe8476efc56361d6944
 2015-04-20 19:04:21 -07:00
Jason Monk
f6707568c7 Merge "SysUI: Stop wifi scanning so much" 2015-04-21 00:02:58 +00:00
Selim Cinek
6a1c23bf19 Merge "Made StackScrollAlgorithm HUN logic only depend on children" 2015-04-20 22:23:01 +00:00
Selim Cinek
a4baaa3269 Made StackScrollAlgorithm HUN logic only depend on children 
A racecondition could trigger that the two states where not in sync
anymore. We now only rely on the ordering of the children.
Bug: 20421801

Change-Id: I3b607adb3b4b22f04f465d5e5e23f6e514c35ef9
 2015-04-20 14:27:54 -07:00
Jason Monk
0d6a1c445c SysUI: Stop wifi scanning so much 
Seems that QS to end up in a listening state while the phone is sleeping
so switch scanning to only happen while the detail panel is showing.

Bug: 20137092
Change-Id: Ib067531c8af75f9f93b10e087b6fc252b5e508fa
 2015-04-20 16:38:51 -04:00
Selim Cinek
84b8b066b4 Merge "Fixed a crash with HUN notifications" 2015-04-20 20:35:05 +00:00
Selim Cinek
2f6b3fb90f Fixed a crash with HUN notifications 
Bug: 20421801
Change-Id: Ifc4445e585d924388f0642379c5268b6bbfb2e99
 2015-04-20 13:04:47 -07:00
Thiemo Nagel
116387c632 Remove unsed failedAttemptWarning in reportFailedUnlockAttempt(). 
Change-Id: I6ca76f6ebe84e04f84161c7fc06d1e2443f7bbfe
 2015-04-20 16:50:38 +02:00
Geoff Mendal
ca02bc7ceb Merge "Import translations. DO NOT MERGE" 2015-04-20 13:08:03 +00:00