Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
206,109 Commits 3 Branches 0 Tags
a3ef629045efefa39e33e8fa2e87284c39a6e436
Commit Graph

4816 Commits

Author SHA1 Message Date
Jun Mukai
a3ef629045 Merge "Introduces mouse actions for popup menu." 2015-07-09 21:12:44 +00:00
Jorim Jaggi
61a3a523c7 am 46e30763: am 5175b3c9: am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev 
* commit '46e30763df273ea1ba6f102c8a8557b36ba5cc8a':
  Fix assist for hardware long-press
 2015-07-09 20:32:28 +00:00
Jorim Jaggi
46e30763df am 5175b3c9: am 9acf475c: am 35094376: am 3cc5c24b: Merge "Fix assist for hardware long-press" into mnc-dev 
* commit '5175b3c9923f5eaf5eafa01798966f8711ce9547':
  Fix assist for hardware long-press
 2015-07-09 20:16:30 +00:00
Jorim Jaggi
3cc5c24b83 Merge "Fix assist for hardware long-press" into mnc-dev 2015-07-09 19:19:05 +00:00
Adam Lesinski
2878e4e825 am 8e82c794: am 3e2b53ff: am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 
* commit '8e82c794bb944d4a15501854721a476db2dae470':
  BatteryStats: Fail gracefully on corrupt battery stats
 2015-07-09 02:31:48 +00:00
Adam Lesinski
8e82c794bb am 3e2b53ff: am 1ad61b33: am 1549adb4: am 7fb1655a: Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 
* commit '3e2b53ff6981b7ef857cb28c5b2ddb3bc71002b9':
  BatteryStats: Fail gracefully on corrupt battery stats
 2015-07-09 02:09:26 +00:00
Adam Lesinski
7fb1655a89 Merge "BatteryStats: Fail gracefully on corrupt battery stats" into mnc-dev 2015-07-09 01:15:15 +00:00
Adam Lesinski
9ae9cba020 BatteryStats: Fail gracefully on corrupt battery stats 
Bug:22328963
Change-Id: Id0b4c6334706e58483d5fdfd2c1137bfb821c409
 2015-07-08 17:35:42 -07:00
Jorim Jaggi
165ce066b7 Fix assist for hardware long-press 
Activating the assistant will now route through SysUI, so
we have the logic whether to start an activity or to start a voice
interaction session in one single place.

Bug: 22201770
Change-Id: I0f4699533aea2a1e595ee25a844434c82f548c01
 2015-07-08 22:26:24 +00:00
Jun Mukai
31f581c5a6 Introduces mouse actions for popup menu. 
- mouse hover moves the selected item in the menu. It moves
  the selection rectangle, and further up/down key or enter
  key will start from the hovered item.
- when the mouse exits from the entire popup window, the
  selection is canceled. Further up/down key will start from
  the first item.

To implement these behaviors, and consider about other keyboard
behaviors which is special to menus, I believe it justifies
to create another class for the menu popups rather than using
ListPopupWindow directly.

Bug: 19642104
Change-Id: I5e405c0491c67fdef9764898701119979ec13a9f
 2015-07-08 13:18:54 -07:00
Adam Powell
6147a9f272 am 2ed09409: am 940abed2: am 6f3f660c: am 24bf1226: am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 
* commit '2ed094090a36c00fce96bc288bc544fe28ae9fcf':
  Sort and limit ChooserActivity targets from ChooserTargetServices
 2015-07-08 02:03:42 +00:00
Dongwon Kang
0d74a94eb2 am 6ac3a485: am e94f5f55: am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 
* commit '6ac3a485440c5b6ee73b55d53863d299fd6308c7':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
 2015-07-08 02:02:49 +00:00
Adam Powell
2ed094090a am 940abed2: am 6f3f660c: am 24bf1226: am e9cbf415: Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 
* commit '940abed246f37454426f56c9cbb37e12ec4cdfb5':
  Sort and limit ChooserActivity targets from ChooserTargetServices
 2015-07-08 01:37:38 +00:00
Dongwon Kang
6ac3a48544 am e94f5f55: am 279864ca: am aaac72ac: am 0c582293: Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 
* commit 'e94f5f556f5a46cf6745ae642d245ca712e1f254':
  Revert "Use AlertDialog for MediaRouteControllerDialog"
 2015-07-08 01:36:36 +00:00
Adam Powell
e9cbf41561 Merge "Sort and limit ChooserActivity targets from ChooserTargetServices" into mnc-dev 2015-07-07 21:55:45 +00:00
Dongwon Kang
0c58229306 Merge "Revert "Use AlertDialog for MediaRouteControllerDialog"" into mnc-dev 2015-07-07 20:22:40 +00:00
Abodunrinwa Toki
c3a75a434c am 2487557a: am 10daed5e: am b9e46b9d: am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '2487557a168ca06eb4c889fe973de59dee03e199':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 17:45:35 +00:00
Abodunrinwa Toki
2487557a16 am 10daed5e: am b9e46b9d: am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev 
* commit '10daed5ebf3e176a4486721017055c0598740fdf':
  FloatingToolbar: Offset visible rect by the rootview's offset
 2015-07-07 17:33:52 +00:00
Abodunrinwa Toki
4603bd34ce Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into mnc-dev 2015-07-07 03:59:46 +00:00
Adam Lesinski
79f96c9d4c am 8f387fc0: am f036847f: am c6c21522: am a5bd0e3a: am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 
* commit '8f387fc09a578e7280bfd1d1247964a02d1d9350':
  BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
 2015-07-07 03:23:50 +00:00
Winson Chung
7d7ce90db8 am a9b08df9: am dc91eca6: am 45e1153d: am ef024af4: am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit 'a9b08df90e3a94e23d45d0d31092ed06157d13d5':
  Adding metrics to overview.
 2015-07-07 03:23:26 +00:00
Dongwon Kang
7980d10d7c Revert "Use AlertDialog for MediaRouteControllerDialog" 
This reverts commit 001d51496d.

Background: To just inherit AlertDialog, the content view should include
a title as we do in support library (AlertDialog uses NO_TITLE feature),
but up-streaming support library implementation to the framework at this
point might cause more issues. Verified that the narrow dialog issue
(b/22044600) does not happen in the framework implementation regardless of
whether it uses AlertDialog or not.

Bug: 22286869
Change-Id: Ic2554cc9e683beff29d1deee91945c1dace83ab1
 2015-07-06 20:09:03 -07:00
Adam Powell
a182e45c68 Sort and limit ChooserActivity targets from ChooserTargetServices 
Apply an automated decay factor if apps decide to claim all of their
targets are SUPER IMPORTANT. Apply the multiplier from the apps
themselves as well as a penalty for apps that come in late - let's see
how fast developers get their ChooserTargetServices to start!

Also fix a bug with ResolverDrawerLayout where dragging from the title
area wouldn't always work properly.

Bug 22302285

Change-Id: Ib6eb2b6fb92608790b2267c0f671c9ae59b2907e
 2015-07-06 18:39:34 -07:00
Adam Lesinski
8f387fc09a am f036847f: am c6c21522: am a5bd0e3a: am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 
* commit 'f036847f2fe0c217965b808f1608d7d0bd7fd573':
  BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
 2015-07-07 01:18:04 +00:00
Winson Chung
a9b08df90e am dc91eca6: am 45e1153d: am ef024af4: am 2924dc34: Merge "Adding metrics to overview." into mnc-dev 
* commit 'dc91eca6545ae1a9cae1e0336897e26ce313829c':
  Adding metrics to overview.
 2015-07-07 01:17:45 +00:00
Adam Lesinski
fe45b29a1c Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev 2015-07-07 00:32:24 +00:00
Adam Lesinski
f124aeaf53 am ebb92a3c: am 92726ca9: am 1fa6846b: am 948ac4fa: am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 
* commit 'ebb92a3c4001e943c68acbd3760cdb14eb091eee':
  BatteryStats: Fix issue with method parameter order...
 2015-07-07 00:31:08 +00:00
Winson Chung
5c9f4b90bf Adding metrics to overview. 
Bug: 21528167
Change-Id: Ice1ce892682aa4599b9a689b47af373780897548
 2015-07-06 15:52:21 -07:00
Adam Lesinski
61db88fc8b BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore 
Bug:22225933
Change-Id: I384a3c37ad45af981cca5fc3e92643da948d48d0
 2015-07-06 15:36:46 -07:00
Adam Lesinski
ebb92a3c40 am 92726ca9: am 1fa6846b: am 948ac4fa: am 1a257545: Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 
* commit '92726ca9cab7c87cfa249482c37451a87f0bfcd2':
  BatteryStats: Fix issue with method parameter order...
 2015-07-06 19:18:14 +00:00
Adam Lesinski
1a257545b2 Merge "BatteryStats: Fix issue with method parameter order..." into mnc-dev 2015-07-06 18:00:33 +00:00
Adam Lesinski
f7808b7cf0 BatteryStats: Fix issue with method parameter order... 
Argh, this explains some weird instances of negative power
given to Wakelock usage. Realtime and uptime were switched in the
parameter list, and since they're both longs, compiler was happy.

Bug:22295225
Change-Id: I6759504f2690baf66af567d8b1a6d0478bc22228
 2015-07-06 10:17:24 -07:00
Svet Ganov
90bfb06db8 am a9ede6c2: am e7cd9001: am 85be0c4e: Fix app ops aidl as it is also used from native. 
* commit 'a9ede6c261cf9b49eb763d75139966593119a8b8':
  Fix app ops aidl as it is also used from native.
 2015-07-06 12:59:00 +00:00
Narayan Kamath
1e813b1236 am bef809c4: am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework." 
* commit 'bef809c4ba9cbf4654faf2d6c1ebfbc0a38c56fe':
  Delete unused testing scripts and WithFramework.
 2015-07-06 12:58:43 +00:00
Rubin Xu
fd65ba9e2b am 0dfa0e70: am 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev 
* commit '0dfa0e70c710d21c166a6dae6a7c8f9ec4427f88':
  Remove ExternalMediaFormatActivity
 2015-07-06 12:57:55 +00:00
Svet Ganov
a9ede6c261 am e7cd9001: am 85be0c4e: Fix app ops aidl as it is also used from native. 
* commit 'e7cd90012d985b35bb1c93320b8e4afbf94e5f29':
  Fix app ops aidl as it is also used from native.
 2015-07-05 18:43:21 +00:00
Nicolas Prevot
92ebe9a289 am b06aece7: am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev 
* commit 'b06aece751cc86aa859005bbb8843c5ed6be7c6f':
  Fix the case where an intent bounces several times between users.
 2015-07-04 08:06:54 +00:00
Svet Ganov
e8ce8368fc am 55cd6f44: am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 
* commit '55cd6f44fd1e49164a999e948bb91a03a3b9daf6':
  Teach receivers, activities, providers, and services app ops.
 2015-07-04 07:28:18 +00:00
Dianne Hackborn
19b16eb453 am b857216f: am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 
* commit 'b857216f75bf18e702ead1e201cbbbc36fba39c6':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
 2015-07-04 07:27:38 +00:00
Narayan Kamath
bef809c4ba am 4da086ee: am 6bcdf90e: Merge "Delete unused testing scripts and WithFramework." 
* commit '4da086ee7f4eba64265b28cdc5df9f690d97a7ac':
  Delete unused testing scripts and WithFramework.
 2015-07-04 02:57:58 +00:00
Svet Ganov
85be0c4e21 Fix app ops aidl as it is also used from native. 
bug:22248271

Change-Id: Ic3f31d1ee4d27c1483c9d19929c19946d4c815c6
 2015-07-03 16:23:19 -07:00
Chris Wren
9fa3c56486 am 0002b3ba: am f1cc651b: am c58d1695: Merge changes from topic \'tron\' into mnc-dev 
* commit '0002b3bab2e96c3c54b286cbea6bada14c6a91ae':
  remove double count of panel open
  report notification load on panel reveal
 2015-07-03 05:36:06 +00:00
Chris Banes
a55bbdd6b1 am a50db6c6: am c9812040: am 2bc8485b: Merge "Fix memory leak in setActionProvider() - framework edition" into mnc-dev 
* commit 'a50db6c626f9f2ecc1e5c731e2f76fcd51fd0f4b':
  Fix memory leak in setActionProvider() - framework edition
 2015-07-03 05:35:10 +00:00
Rubin Xu
0dfa0e70c7 am 27f13d12: am b1f4cc64: Merge "Remove ExternalMediaFormatActivity" into mnc-dev 
* commit '27f13d125f9eb8053493086871fcb5470c786264':
  Remove ExternalMediaFormatActivity
 2015-07-02 16:46:57 +00:00
Rubin Xu
c85c639312 Remove ExternalMediaFormatActivity 
This activity is no longer used by any part of the framework.

Bug: 9433509
Change-Id: Iace394b7a11b75ed75b2eefc05990626a7e68ac2
 2015-07-02 16:53:57 +01:00
Nicolas Prevot
b06aece751 am d16f1252: am 60373e80: Merge "Fix the case where an intent bounces several times between users." into mnc-dev 
* commit 'd16f1252e1e7924a95388a5479d7bb179279f04c':
  Fix the case where an intent bounces several times between users.
 2015-07-02 10:52:25 +00:00
Narayan Kamath
c21dab9dcb Delete unused testing scripts and WithFramework. 
These scripts haven't worked in a long time now. run_core_test
uses VM options that aren't supported and WithFramework (which is
unmaintained) and run_junit.sh refers to an APK that doesn't
exist anymore.

If anyone wishes to run these tests individually, they can just
use vogar instead :
$ make vogar vogar.jar
$ vogar --mode=activity frameworks/base/tests/CoreTests/android/core/Sha1Test.java

This also allows us to delete the WithFramework class, which was
only referenced by these obsolete scripts.

bug: 22078684
Change-Id: I481f6721d51d50456421a1526c370b93aec9b351
 2015-07-02 11:41:52 +01:00
Nicolas Prevot
60373e8060 Merge "Fix the case where an intent bounces several times between users." into mnc-dev 2015-07-02 10:27:58 +00:00
Svet Ganov
55cd6f44fd am 6fe87a56: am 68ffcf88: Merge "Teach receivers, activities, providers, and services app ops." into mnc-dev 
* commit '6fe87a565be345c9455f610bbf26d5eaee593683':
  Teach receivers, activities, providers, and services app ops.
 2015-07-02 01:02:04 +00:00
Dianne Hackborn
b857216f75 am ab33137d: am 6cc53743: Merge "Fix issue #20672970: Notifications are not dismissed on hot word detection" into mnc-dev 
* commit 'ab33137d68fdb5615d9c6624276d648a0651b953':
  Fix issue #20672970: Notifications are not dismissed on hot word detection
 2015-07-02 01:01:27 +00:00