Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
203,785 Commits 3 Branches 0 Tags
d99956ee08e5fcbc0202ba15d2df2bc57d49d767
Commit Graph

4850 Commits

Author SHA1 Message Date
Rubin Xu
ab446232be am ba5c0728: am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 
* commit 'ba5c07286f9980220bda4ed6e9e29f392669c05c':
  Use StorageManager.wipeAdoptableDisks to wipe external disks
 2015-06-26 23:13:01 +00:00
Rubin Xu
ba5c07286f am d1858a7d: am 0a202eac: Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 
* commit 'd1858a7d3e648f6c7382bba5bd3982a7ecc15257':
  Use StorageManager.wipeAdoptableDisks to wipe external disks
 2015-06-26 22:54:50 +00:00
Abodunrinwa Toki
efa37fc6eb am 5d7e2394: am 8e1cf18f: am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev 
* commit '5d7e2394d341222084c14229805b9c907486e606':
  Fix FloatingToolbar flicker in reaction to text cursor blink.
 2015-06-26 22:46:46 +00:00
Rubin Xu
0a202eac01 Merge "Use StorageManager.wipeAdoptableDisks to wipe external disks" into mnc-dev 2015-06-26 22:36:13 +00:00
Abodunrinwa Toki
5d7e2394d3 am 8e1cf18f: am 1fa8290d: Merge "Fix FloatingToolbar flicker in reaction to text cursor blink." into mnc-dev 
* commit '8e1cf18fe7e2cda17813cdc4a8131ef997331958':
  Fix FloatingToolbar flicker in reaction to text cursor blink.
 2015-06-26 22:33:41 +00:00
Abodunrinwa Toki
c107b0ecdc Fix FloatingToolbar flicker in reaction to text cursor blink. 
1. Reposition the toolbar on predraw only when positioning has changed.
2. Update the toolbar popup's position only if the content rect changed.
3. Fix FloatingToolbarPopup.cancelOverflowAnimations().
   The previous implementation wasn't actually cancelling the animation.

(1) is enough to fix the bug. But (2) and (3) fix issues in the
toolbar directly related to this bug.

Bug: 22039189
Change-Id: I84ec793d788f9402a1f8635e68e3344746f6af07
 2015-06-26 15:08:26 -07:00
Jeff Sharkey
aedb56fd18 Merge commit 'b02c73d5' into manualmerge 
Change-Id: I3ec37c9d45d685c2393087bdefa6ab512cc70062
 2015-06-26 09:32:09 -07:00
Jeff Sharkey
b02c73d582 am df6fd4c2: am d2c41457: Merge "Let\'s reinvent storage, yet again!" into mnc-dev 
* commit 'df6fd4c2631e06f3469eb77b2ffdff0d3cc04a68':
  Let's reinvent storage, yet again!
 2015-06-26 16:05:25 +00:00
Jeff Sharkey
d2c4145732 Merge "Let's reinvent storage, yet again!" into mnc-dev 2015-06-26 15:43:31 +00:00
Abodunrinwa Toki
d4cfe82048 am 9539f76c: am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev 
* commit '9539f76cba4359f4597e193d5eddf49614c5f629':
  Enforce FloatingToolbar themes.
 2015-06-26 15:20:58 +00:00
Abodunrinwa Toki
9539f76cba am b5d06f7a: am a2e0dc4d: Merge "Enforce FloatingToolbar themes." into mnc-dev 
* commit 'b5d06f7ab7bb19f39f74d8551c021a70568aaca5':
  Enforce FloatingToolbar themes.
 2015-06-26 15:09:53 +00:00
Rubin Xu
e8490f1d78 Use StorageManager.wipeAdoptableDisks to wipe external disks 
Retire FORMAT_AND_FACTORY_RESET which is more fragile.

Bug: 9433509
Change-Id: I158ee987274bb4db41d466de9f1e3c60ffc1d140
 2015-06-26 15:58:21 +01:00
Jeff Sharkey
9527b223a9 Let's reinvent storage, yet again! 
Now that we're treating storage as a runtime permission, we need to
grant read/write access without killing the app.  This is really
tricky, since we had been using GIDs for access control, and they're
set in stone once Zygote drops privileges.

The only thing left that can change dynamically is the filesystem
itself, so let's do that.  This means changing the FUSE daemon to
present itself as three different views:

/mnt/runtime_default/foo - view for apps with no access
/mnt/runtime_read/foo - view for apps with read access
/mnt/runtime_write/foo - view for apps with write access

There is still a single location for all the backing files, and
filesystem permissions are derived the same way for each view, but
the file modes are masked off differently for each mountpoint.

During Zygote fork, it wires up the appropriate storage access into
an isolated mount namespace based on the current app permissions.  When
the app is granted permissions dynamically at runtime, the system
asks vold to jump into the existing mount namespace and bind mount
the newly granted access model into place.

Bug: 21858077
Change-Id: I62fb25d126dd815aea699b33d580e3afb90f8fd2
 2015-06-25 22:25:48 -07:00
Abodunrinwa Toki
079f33bca0 Enforce FloatingToolbar themes. 
This ensures that theme attribute values that affect the look and
feel of the FloatingToolbar views are the ones specified in the
framework.
The aim is to avoid apps modifying the toolbar's look and feel in
unexpected ways by overriding Theme attributes.

Bug: 21957785

Change-Id: Idd472b4e8511f0a039cd07f98b1fd3ce93ae97fa
 2015-06-25 15:47:26 -07:00
Adam Powell
f4a4a4c844 am bf7cccdc: am a5e4db2e: am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit 'bf7cccdca1dfe43a9e1956c707615dad2271e6fd':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:48:26 +00:00
Adam Powell
bf7cccdca1 am a5e4db2e: am 91feb107: Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 
* commit 'a5e4db2e9025254b80f6c0c380d355e5e0f8234a':
  Fix ChooserActivity check for still-alive ChooserTargets
 2015-06-25 00:31:37 +00:00
Adam Powell
91feb107f2 Merge "Fix ChooserActivity check for still-alive ChooserTargets" into mnc-dev 2015-06-25 00:08:54 +00:00
Adam Powell
c412be6824 Fix ChooserActivity check for still-alive ChooserTargets 
Only prune ChooserTargets if the resolved activity source they came
from is still present after refreshing the list. Compare this directly
against the ComponentName rather than ResolveInfo.equals, as the
latter isn't implemented.

Bug 21953672

Change-Id: I6486bda85c19d7371167affe2a2b80a2668bd734
 2015-06-24 13:54:10 -07:00
Makoto Onuki
2b40e7076d am 9e2d1ed8: am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev 
* commit '9e2d1ed898b8e4a4971ddb511e221e3406bf797a':
  Actually wait for installd
 2015-06-24 20:02:07 +00:00
Makoto Onuki
9e2d1ed898 am b96bc804: am 0633ae74: Merge "Actually wait for installd" into mnc-dev 
* commit 'b96bc804169e13701fa249e0a3b3c08d3f2e9808':
  Actually wait for installd
 2015-06-24 19:48:19 +00:00
Makoto Onuki
0633ae7481 Merge "Actually wait for installd" into mnc-dev 2015-06-24 19:25:28 +00:00
Adam Lesinski
53b5f3e68d am fe91754e: am 098204fc: am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev 
* commit 'fe91754edd4b899cf238aae11fb186647fdd4ea2':
  Fix unit issue in Slog.wtf output
 2015-06-24 19:22:52 +00:00
Adam Lesinski
fe91754edd am 098204fc: am 67f17099: Merge "Fix unit issue in Slog.wtf output" into mnc-dev 
* commit '098204fca02c2f55ae374915f8bca48701601a29':
  Fix unit issue in Slog.wtf output
 2015-06-24 19:10:58 +00:00
Adam Lesinski
67f170993f Merge "Fix unit issue in Slog.wtf output" into mnc-dev 2015-06-24 18:45:54 +00:00
Adam Lesinski
7b3c7529c7 Fix unit issue in Slog.wtf output 
Bug:22063930
Change-Id: I02add66892eb32b1df7e845b8542beb928d2b3ca
 2015-06-24 11:42:49 -07:00
Makoto Onuki
c8a2cfed01 Actually wait for installd 
Bug 19337445

Change-Id: I70bdaa0ac3695ac9d03ba34fe9d35fe775a5300d
 2015-06-24 09:52:58 -07:00
Doris Liu
fd17d70100 am 99a7abb1: am 5d0dedd1: am 0ab73134: Merge "Add enter/exit animation for window provided CAB" into mnc-dev 
* commit '99a7abb1c3843b453883d52494952ce74799b4ac':
  Add enter/exit animation for window provided CAB
 2015-06-23 23:59:47 +00:00
Doris Liu
99a7abb1c3 am 5d0dedd1: am 0ab73134: Merge "Add enter/exit animation for window provided CAB" into mnc-dev 
* commit '5d0dedd1c3cddb39140c1136fce5c9ec78bed1a1':
  Add enter/exit animation for window provided CAB
 2015-06-23 23:46:15 +00:00
Doris Liu
0ab731340b Merge "Add enter/exit animation for window provided CAB" into mnc-dev 2015-06-23 23:20:02 +00:00
Doris Liu
169f87a04b Add enter/exit animation for window provided CAB 
Bug: 21886856
Change-Id: I6b20901c51ce7d74058f6ef866334f622a1fa3a4
 2015-06-23 16:11:07 -07:00
Jason Monk
7b9a1b45b6 am fd183561: am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev 
* commit 'fd183561e0f5d6fa2df8d13eda34cfc11f931ae3':
  Add metrics to brightness slider
 2015-06-23 21:31:16 +00:00
Jason Monk
fd183561e0 am 78b964c2: am 81b46360: Merge "Add metrics to brightness slider" into mnc-dev 
* commit '78b964c26ca3e5b1601773a762c8c6989069a8cf':
  Add metrics to brightness slider
 2015-06-23 21:07:14 +00:00
Jason Monk
97b87a9929 Add metrics to brightness slider 
Had to add a way for BrightnessController to know when its the end
of a touch, so that we don't spam the event logs with intermediate
values.

Added visibility to BrightnessDialog as this is what settings
launches.

Bug: 21528168
Change-Id: Ie214b4ddb0c9f9bbe8c4f182f9c59f229963ebc7
 2015-06-23 15:54:13 -04:00
Chris Wren
960bf082a4 am 8471e833: am 2ebdeeca: am ca7febf4: Merge "add rank to notification visibility log" into mnc-dev 
* commit '8471e833f61cfc9d373b957d97a9eeec2b779e78':
  add rank to notification visibility log
 2015-06-23 13:20:27 +00:00
Chris Wren
8471e833f6 am 2ebdeeca: am ca7febf4: Merge "add rank to notification visibility log" into mnc-dev 
* commit '2ebdeeca242212707eb4a691ca9d18a0fa60fec6':
  add rank to notification visibility log
 2015-06-23 13:05:43 +00:00
Chris Wren
ca7febf4b8 Merge "add rank to notification visibility log" into mnc-dev 2015-06-23 12:43:09 +00:00
Adam Powell
8baaf220e4 am 04333109: am f66c97b5: am 9f49dcda: Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 
* commit '04333109ce6ea332a9136fbdd69ca83b8f8e56e5':
  Add voice interaction support to ResolverActivity/ChooserActivity
 2015-06-23 05:38:28 +00:00
Christopher Tate
af6052f546 am 309499e0: am a116123f: am 6d2268a5: Merge "Back up / restore default app and intent filter verification state" into mnc-dev 
* commit '309499e0cd138d30d340460d6c99ecb8292717d1':
  Back up / restore default app and intent filter verification state
 2015-06-23 05:38:23 +00:00
Adam Powell
04333109ce am f66c97b5: am 9f49dcda: Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 
* commit 'f66c97b5cc88181a2979734a56746aa62a84fdb6':
  Add voice interaction support to ResolverActivity/ChooserActivity
 2015-06-23 03:20:40 +00:00
Christopher Tate
309499e0cd am a116123f: am 6d2268a5: Merge "Back up / restore default app and intent filter verification state" into mnc-dev 
* commit 'a116123fb1125737e0b4bceba418e822397921b0':
  Back up / restore default app and intent filter verification state
 2015-06-23 03:20:35 +00:00
Adam Powell
9f49dcda24 Merge "Add voice interaction support to ResolverActivity/ChooserActivity" into mnc-dev 2015-06-23 01:18:28 +00:00
Adam Powell
4c470d641c Add voice interaction support to ResolverActivity/ChooserActivity 
All options are sent to the VoiceInteractor once ChooserTargetServices
have reported in. We don't perform explicit progressive refinement or
filtering, but an explicit option picked will be invoked.

Also fix a lingering bug around being able to nested-fling the
resolver drawer closed.

Bug 21516866

Change-Id: I6b141f5fa87d74dccec9dcb88110630696e9c38e
 2015-06-22 18:11:10 -07:00
Christopher Tate
6d2268a576 Merge "Back up / restore default app and intent filter verification state" into mnc-dev 2015-06-23 01:02:12 +00:00
Christopher Tate
6038d15cbc Back up / restore default app and intent filter verification state 
For apps not present on device, the state inherited from the ancestral
device is applied when the app is ultimately installed.

Bug 20144515

Change-Id: Ie05b4f1751357fc62f14e259da174b8cf465e913
 2015-06-22 17:20:26 -07:00
Chris Wren
d1dbc92d67 add rank to notification visibility log 
Only sysui knows the true rank, since it can (and does) reorder things.
The visibility logs are down in the service because it has other bits of data.

Bug: 21395744
Change-Id: Ibf9479dc2306fb27fb5df3bf21e161478d36d587
 2015-06-22 16:30:17 -04:00
Jason Monk
19998a847c am 32621bea: am bfaff994: am 6283a125: Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 
* commit '32621bea2e4ed27b4737602f06620ec8efbcb084':
  ButtonBarLayout: Let allowStacking to be set through code
 2015-06-22 20:27:35 +00:00
Jason Monk
32621bea2e am bfaff994: am 6283a125: Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 
* commit 'bfaff994af8053f562046c4e07e5c88d0538d250':
  ButtonBarLayout: Let allowStacking to be set through code
 2015-06-22 20:15:08 +00:00
Jeff Brown
e689cca19c am 3a9f86a2: am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '3a9f86a2df00973b10754fa4011b8e8c32928685':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 20:01:41 +00:00
Jason Monk
6283a12579 Merge "ButtonBarLayout: Let allowStacking to be set through code" into mnc-dev 2015-06-22 19:53:01 +00:00
Jeff Brown
3a9f86a2df am 6903187a: am d63c721e: Merge "Repurpose doze wake lock stats for draw wake lock instead." into mnc-dev 
* commit '6903187a2f3b54ce40239071d6f3a8bafd396ea9':
  Repurpose doze wake lock stats for draw wake lock instead.
 2015-06-22 19:51:11 +00:00