Commit Graph

4692 Commits

Author SHA1 Message Date
Adam Lesinski
57a324033b am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev
* commit '4718afcd2e5d52638ba1c4f58b2db6aea01171de':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
2015-07-01 01:06:31 +00:00
Adam Lesinski
14b5701029 Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 2015-07-01 00:40:25 +00:00
Alan Viverette
7802280162 am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev
* commit '29690e2015748b367b4794b25a7bd34c0c03a1cb':
  Use non-greedy view to draw background in landscape time picker
2015-06-30 23:05:32 +00:00
Alan Viverette
aa69922ace Use non-greedy view to draw background in landscape time picker
Bug: 21933765
Change-Id: I95d608e9be166308e3a9b013a2c4c17cd4345046
2015-06-30 15:29:13 -07:00
Adam Lesinski
9986350d66 am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev
* commit '36eadf9c1d78b047d9e43bf28fe2de417cc1fce5':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
2015-06-30 21:40:24 +00:00
Adam Lesinski
32ddd53466 Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 2015-06-30 20:30:46 +00:00
Adam Lesinski
43f222f02f BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
Bug:18724932
Change-Id: I01cfd18acb3332ad35fd0d48d9c50bc37e5ccd08
2015-06-30 12:54:41 -07:00
Chris Wren
8cc9473fff am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev
* commit '699d2f787a8e9fbfcb819f2fb2aaba4c4eb48440':
  add more power manager metrics
2015-06-30 17:43:13 +00:00
Abodunrinwa Toki
0707edf1a8 am 0468a570: am e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev
* commit '0468a5700e2c0112d908fac3d791477192c91a81':
  Fix Floating toolbar overflow width.
2015-06-30 17:23:46 +00:00
Abodunrinwa Toki
3e26dcb550 am 5239997d: am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev
* commit '5239997d646cb3e5d146db3794e7015f35943fa1':
  Fix floating toolbar flicker in ExtractEditText mode.
2015-06-30 17:23:41 +00:00
Chris Wren
392527c4cc Merge "add more power manager metrics" into mnc-dev 2015-06-30 17:20:29 +00:00
Abodunrinwa Toki
e40d7a6326 Merge "Fix Floating toolbar overflow width." into mnc-dev 2015-06-30 16:56:23 +00:00
Abodunrinwa Toki
685a14468e Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev 2015-06-30 16:53:26 +00:00
Chris Wren
9bb290bcc3 add more power manager metrics
dream start/stop
dream duration
screen timeout setting

Bug: 21893298
Change-Id: I783f72953fc40c0d276a7845daa048e2fe0db78c
2015-06-30 10:10:24 -04:00
Billy Lau
67dfa49194 am e4c3fd72: am f62f4c94: Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev
* commit 'e4c3fd725ea8870756428a6580052a34fc676299':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
2015-06-30 09:56:15 +00:00
Billy Lau
f62f4c94a3 Merge "Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings." into mnc-dev 2015-06-30 09:05:34 +00:00
Abodunrinwa Toki
8747f37383 Fix Floating toolbar overflow width.
Also clean out unused methods.

Bug: 22186458
Change-Id: I5ef03cd7938630c0d607b6fecd540f2bd83bbb65
2015-06-29 21:17:22 -07:00
Abodunrinwa Toki
1b57653b50 Fix floating toolbar flicker in ExtractEditText mode.
Fixed by making sure to update visibility immediately after setting a
hide flag on the FloatingToolbarVisibilityHelper.

Bug: 22101632
Change-Id: Iea2d9786c14f6451da836e55f0d880025aa00ed2
2015-06-29 20:43:14 -07:00
Yohei Yukawa
c8deda50fe am e564feba: am 4daf600e: Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev
* commit 'e564feba53f71610afb3bc995497e853654fb2d6':
  Check system locale when picking up an initial SpellChecker.
2015-06-29 21:23:24 +00:00
Yohei Yukawa
4daf600ee0 Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 2015-06-29 20:42:54 +00:00
Alan Viverette
1537e1358e am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev
* commit '4faa4cbbca0c9027aa67063a2ad43f008628c5bb':
  Always remeasure ListView scrap used to obtain minimum width
2015-06-29 20:04:39 +00:00
Alan Viverette
a1b647c883 Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 2015-06-29 19:39:29 +00:00
Jae Seo
96c23baff0 am 1d75e527: am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev
* commit '1d75e5273e63de811363f22976ced24f629918ce':
  Use AlertDialog for MediaRouteControllerDialog
2015-06-29 17:25:16 +00:00
Jae Seo
82b3f67711 Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 2015-06-29 17:14:43 +00:00
Yohei Yukawa
174843afb6 Check system locale when picking up an initial SpellChecker.
Since Ia25e7b4f308778891929e31b8cbd741f6848cce4, the TSMS has
picked up the first found spell checker no matter regardless of
the system locale.

The primary goal of this CL is to introduce a low-risk fix for
the situation where two or more spell checker services are
pre-installed but they are well different from each other in
terms of supported languages.  Solving the problem in more
ambiguous and complicated situation is beyond the goal of
this CL.

With this CL, we still pick up the first found spell checker
but also require the spell checker supports a certain locale.
We will try several locales starting with the system locale
to some fallback locales until we find one appropriate spell
checker.  If no spell checker is picked up in this process,
we simply pick up the first one as we have done.

Examples about what locales will be checked are:

A. System locale: en_US
  1. en_US
  2. en_GB
  3. en

B. System locale: en
  1. en
  2. en_US
  3. en_GB

C. System locale: en_IN
  1. en_IN
  2. en_US
  3. en_GB
  4. en

D. System locale: ja_JP
  1. ja_JP
  2. ja
  3. en_US
  4. en_GB
  5. en

E. System locale: fil_PH
  1. fil_PH
  2. fil
  3. en_US
  4. en_GB
  5. en

F. System locale: th_TH_TH
  1. th_TH_TH
  2. th_TH
  3. th
  4. en_US
  5. en_GB
  6. en

Bug: 22042994
Change-Id: I094f1c33430f7904a1dac6167431d6df64a07212
2015-06-26 18:02:54 -07:00
Adam Lesinski
a7a4cccf7d BatteryStats: Record cpu power usage from /proc/uid_cputime
For now we are just recording the power usage and not using it
to calculate battery power usage or app blame. If it looks like
it is accurate, we'll adopt the values from the kernel instead of
estimating ourselves.

Bug:21498425
Change-Id: I6617e3c0ff279a65f4ff84472082f36fe4beb336
2015-06-26 17:45:43 -07: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
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
Jae Seo
001d51496d Use AlertDialog for MediaRouteControllerDialog
Bug: 19876497, Bug: 21795195, Bug: 22044600
Change-Id: I8ec3b17d026b2690edad4b5c4d61741e29b653db
2015-06-26 14:47:37 -07:00
Alan Viverette
2ea329290c Always remeasure ListView scrap used to obtain minimum width
Also turns off ViewPager debug, enabled the scroll indicator on the
DatePicker's year list, and updates the year label's TextView ID to
something more reasonable. Some code cleanup inside ListView.

Bug: 20110431
Change-Id: If1dba955094524d69cc297d7a567a182cef7f11d
2015-06-26 13:31:50 -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
Billy Lau
cbe540f946 Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle
to be manually enabled in Settings.

Raised the protection level of SYSTEM_ALERT_WINDOW from dangerous to
system|signature|appop. Added a new API in Settings for developers to invoke
the main configuration setting. Also added a new metrics in MetricsLogger.
Finally, also made changes to PhoneWindowManager to check the permission to draw
overlay properly.

Change-Id: I4a073e6f038b8b8d2fa5bd6ad60abda496be9701
2015-06-26 16:59:41 +01:00
Jeff Sharkey
d2c4145732 Merge "Let's reinvent storage, yet again!" into mnc-dev 2015-06-26 15:43:31 +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
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
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
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
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