Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
204,326 Commits 3 Branches 0 Tags
77fa075e6d90ded2cdbfe50f8fb38c5738d7cbe1
Commit Graph

4751 Commits

Author SHA1 Message Date
Adam Lesinski
77fa075e6d am 57a32403: am 4718afcd: am 14b57010: Merge "BatteryStats: Record cpu power usage from /proc/uid_cputime" into mnc-dev 
* commit '57a324033bcb348a9c0d4d4774f7d5ebb4b56a41':
  BatteryStats: Record cpu power usage from /proc/uid_cputime
 2015-07-01 01:20:31 +00:00
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
72fca2ae9f am 78022801: am 29690e20: am 5906f587: Merge "Use non-greedy view to draw background in landscape time picker" into mnc-dev 
* commit '7802280162439c2205a09f61cd6d1a5bfa752d96':
  Use non-greedy view to draw background in landscape time picker
 2015-06-30 23:20:47 +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
873bf2c48f am 9986350d: am 36eadf9c: am 32ddd534: Merge "BatteryStats: Account for remaining OS wakelock time at the end of processing all apps" into mnc-dev 
* commit '9986350d66b6106cabe8c017455561f52a727f2c':
  BatteryStats: Account for remaining OS wakelock time at the end of processing all apps
 2015-06-30 21:54:33 +00: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
dd06e383ec am 8cc9473f: am 699d2f78: am 392527c4: Merge "add more power manager metrics" into mnc-dev 
* commit '8cc9473fff87c184068a3b773c45d1d4c6669fcc':
  add more power manager metrics
 2015-06-30 17:57:14 +00: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
9b1b7f9c23 am 0707edf1: am 0468a570: am e40d7a63: Merge "Fix Floating toolbar overflow width." into mnc-dev 
* commit '0707edf1a82fa99c61a87628be45ab0d78bbd717':
  Fix Floating toolbar overflow width.
 2015-06-30 17:37:25 +00:00
Abodunrinwa Toki
22f4864759 am 3e26dcb5: am 5239997d: am 685a1446: Merge "Fix floating toolbar flicker in ExtractEditText mode." into mnc-dev 
* commit '3e26dcb5506999529891892c5716afede85895a4':
  Fix floating toolbar flicker in ExtractEditText mode.
 2015-06-30 17:37:18 +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
28aad8efe6 am 67dfa491: 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 '67dfa49194cf91241ff791730bacb71e07530ef3':
  Bug: 21589105 Rescoping the SYSTEM_ALERT_WINDOW permission to an explicit toggle to be manually enabled in Settings.
 2015-06-30 10:12:46 +00: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
c8b2adf269 am c8deda50: am e564feba: am 4daf600e: Merge "Check system locale when picking up an initial SpellChecker." into mnc-dev 
* commit 'c8deda50fe39c408b0e0bdfe4fa2436d6d8cb1c5':
  Check system locale when picking up an initial SpellChecker.
 2015-06-29 21:34:15 +00: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
cf3a3e1272 am 1537e135: am 4faa4cbb: am a1b647c8: Merge "Always remeasure ListView scrap used to obtain minimum width" into mnc-dev 
* commit '1537e1358ea8446a1a512f1a15244355acda6d1a':
  Always remeasure ListView scrap used to obtain minimum width
 2015-06-29 20:17:49 +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
Xiyuan Xia
447b763ce0 Merge "Enforce LPU security checks are not called on the main thread" 2015-06-29 19:41:47 +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
3b6791d3a7 am 96c23baf: am 1d75e527: am 82b3f677: Merge "Use AlertDialog for MediaRouteControllerDialog" into mnc-dev 
* commit '96c23baff06d3a50995b510767f2a24882d64005':
  Use AlertDialog for MediaRouteControllerDialog
 2015-06-29 17:41:33 +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
Xiyuan Xia
aa26294de3 Enforce LPU security checks are not called on the main thread 
Bug: 20697812
Change-Id: I97c7ee0f05e4583b36062b7627aef695ab99204d
 2015-06-29 09:18:41 -07: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
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
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
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
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