Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,441 Commits 3 Branches 0 Tags
88092fe1e2ea2e92bbc550786d324c996f10413e
Commit Graph

4568 Commits

Author SHA1 Message Date
Jorim Jaggi
529df4ffc8 am 112f328f: am 52a66ae4: Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 
* commit '112f328f2d6f5ca1ace4bdfbac3dd388018b48da':
  Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)
 2015-05-20 19:20:14 +00:00
Jorim Jaggi
52a66ae41c Merge "Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2)" into mnc-dev 2015-05-20 19:01:53 +00:00
Paul McLean
6548c73d65 am 4084a917: am 6f421764: Merge "Turning off logging in ALSA device connection routines." into mnc-dev 
* commit '4084a91725889a9364fda6d254ad31166bfe10c3':
  Turning off logging in ALSA device connection routines.
 2015-05-19 22:50:53 +00:00
Abodunrinwa Toki
4792e36654 am 3ce44e86: am 378939ad: Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev 
* commit '3ce44e867e79ea195825d85599c1db79fb11a8a5':
  Hide floating toolbar when selection is out of bounds.
 2015-05-19 22:49:23 +00:00
Abodunrinwa Toki
ac4bf450c3 am c9a08d24: am 737c6f16: Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev 
* commit 'c9a08d24042922e7d6212301cc2e5068a92a4f97':
  Fix wrong delay values for floatingtoolbar.hide/dismiss
 2015-05-19 22:49:09 +00:00
Dianne Hackborn
a7c407d7d4 am 1e338c0f: am 8e3f2954: Merge "Update power manager to track uid state like netstats." into mnc-dev 
* commit '1e338c0f3ba6366bec3ec4bf9034cb2135f16a7d':
  Update power manager to track uid state like netstats.
 2015-05-19 22:49:03 +00:00
Jorim Jaggi
10449c1d15 Follow up for I8050df3177b6d540829c3f0989a4e4b1381c87ec (1/2) 
Change-Id: I071282032b4c4d6e19b5093a25cc541b0e83ebb4
 2015-05-19 14:01:07 -07:00
Paul McLean
6f421764fe Merge "Turning off logging in ALSA device connection routines." into mnc-dev 2015-05-19 18:21:38 +00:00
Paul McLean
afe55a5ce9 Turning off logging in ALSA device connection routines. 
bug: 21298614
Change-Id: Ia88393698072af8f7c101382f180192646bf713e
 2015-05-19 10:32:13 -07:00
Abodunrinwa Toki
378939ad14 Merge "Hide floating toolbar when selection is out of bounds." into mnc-dev 2015-05-19 17:00:07 +00:00
Abodunrinwa Toki
737c6f16a5 Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev 2015-05-19 16:45:20 +00:00
Dianne Hackborn
8e3f29540d Merge "Update power manager to track uid state like netstats." into mnc-dev 2015-05-19 16:44:12 +00:00
Abodunrinwa Toki
4ce050bd83 Fix wrong delay values for floatingtoolbar.hide/dismiss 
Change-Id: Ie16b5f49babd0df0c70b188c9637e17c661e029c
 2015-05-19 17:36:55 +01:00
Xiyuan Xia
50d8d16ee4 am d02a287e: am 00d1fcf7: Merge "No input instead of disabling password entry" into mnc-dev 
* commit 'd02a287e431ce95eb2f14177ca528e3cf61ecbc6':
  No input instead of disabling password entry
 2015-05-19 16:30:59 +00:00
Xiyuan Xia
00d1fcf737 Merge "No input instead of disabling password entry" into mnc-dev 2015-05-19 16:06:06 +00:00
Xiyuan Xia
cead91974a No input instead of disabling password entry 
So that the keyboard does not come and go all the time.

Bug:21271425
Change-Id: I9ba2fa7034777885a6e53f135eca31fc89568e9d
 2015-05-19 09:04:43 -07:00
Abodunrinwa Toki
56546bd883 am 785c0a02: am 1f21d2a8: Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 
* commit '785c0a02c0016fc6c1981bd3e509948d1c1cb227':
  Hide floating toolbar when user interacts with screen.
 2015-05-19 14:28:57 +00:00
Abodunrinwa Toki
a8151e4ef7 Hide floating toolbar when selection is out of bounds. 
Bug: 20212141
Change-Id: I7844308e339ba9a5027c629da8090053011e019d
 2015-05-19 15:21:10 +01:00
Abodunrinwa Toki
1f21d2a8b1 Merge "Hide floating toolbar when user interacts with screen." into mnc-dev 2015-05-19 14:06:46 +00:00
Abodunrinwa Toki
fd3a3a1163 Hide floating toolbar when user interacts with screen. 
- Adds an ActionMode.snooze(int) API.
- Clients call this to hide the floating toolbar on DOWN touch event.
- This is called repeatedly as a snooze timeout will re-show the
  toolbar.
- ActionMode.snooze(0) will "wake" the toolbar, reshowing it.
- Clients call this to re-show the toolbar on UP touch event.
- This CL also adds code to hide the toolbar when the "content rect"
  is changing.

Bug: 20148125
Change-Id: If5a9a15f72c73cad8ca01a4328a58570b3e29f66
 2015-05-19 14:25:39 +01:00
Jorim Jaggi
0f9d315217 am 06ac707d: am c6767354: Merge "Add setting to disable assist data (1/2)" into mnc-dev 
* commit '06ac707daf039a08367fe9127767434a3e58f758': (30 commits)
  Add setting to disable assist data (1/2)
  Make all icon fields & extras sent to listeners backward-compatible.
  Revert "Fix IMMS#mInputShown state inconsistency."
  Fix bug with jobservice context giving wrong value
  camera2: Fix work-profile eviction handling.
  Fix missing break in Icon class
  Fix post dial for remote connections
  Fix build: udpate parser factory method
  Don't keep LayoutlibCallback reference.
  Adjust lockscreen style to spec
  [RenderScript] Add dummy getMinorID to maintain compatible with old RS compat lib.
  Change the location of Brandmaster statement file.
  Revert "Update IME focus when the active view is losing the focus."
  Revert "Icon support comes to Notification."
  Fix icon-related crash.
  Don't display the "no Internet access" prompt on captive portals.
  Rewriting should fail when any paths are null.
  Ignore abandon after install relinquished.
  Fix build - Revert "Revert "Use default constructor to get anti-aliasing""
  Fix crash in setup wizard
  ...
 2015-05-19 05:02:29 +00:00
Jorim Jaggi
c6767354c5 Merge "Add setting to disable assist data (1/2)" into mnc-dev 2015-05-19 04:40:15 +00:00
Jorim Jaggi
9d91083034 Add setting to disable assist data (1/2) 
Bug: 20944446
Change-Id: I8050df3177b6d540829c3f0989a4e4b1381c87ec
 2015-05-18 21:39:05 -07:00
Adam Powell
ac6122c042 am 5418cde8: am f9a0d44d: Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 
* commit '5418cde8aac5f239bfab2056767e42a5e2aeb270':
  Migrate uses of config_windowIsRound to Configuration.isScreenRound
 2015-05-19 01:24:18 +00:00
Dianne Hackborn
d23e0d6901 Update power manager to track uid state like netstats. 
To follow the correct semantics for when restricts due to
device idle can be applied, power manager need to know about
uid process states like net policy so that it can allow
wake locks from apps that are in the foreground.

Since this is being added to a second place, I reworked things
so that the activity manager now keeps track of per-uid process
states and allows apps to register to listen to those, rather
than having to track lower-level process states and transform
them into an overall uid state.  Both net policy and power
manager use this new facility.

Change-Id: I77359164c40d0f36fe1ef296dd9f9c3062431148
 2015-05-18 18:13:41 -07:00
Adam Powell
f9a0d44d2e Merge "Migrate uses of config_windowIsRound to Configuration.isScreenRound" into mnc-dev 2015-05-19 01:10:55 +00:00
Stefan Kuhne
332914448a am c1523029: am a2968ad5: Merge "Revert "Backup/restore recents task list"" into mnc-dev 
* commit 'c15230299f9c9130af74712be5f866a50196f286':
  Revert "Backup/restore recents task list"
 2015-05-19 00:05:15 +00:00
Adam Powell
01f280d376 Migrate uses of config_windowIsRound to Configuration.isScreenRound 
Move existing code that previously relied on config_windowIsRound to
use the new Configuration.isScreenRound() method. Also move the system
property override for emulators over to the initial setup of a Display
so that the configuration property is consistent with existing
expectations.

Remove config_windowIsRound from symbols.xml. The symbol now only
exists as a default value redirect for overlays already configured to
supply this value.

Change-Id: I24e6564030a6051c3ac7262868983b43e13eee65
 2015-05-18 16:07:42 -07:00
Stefan Kuhne
e88d1e5926 Revert "Backup/restore recents task list" 
Reverts commits 92dd1abef4,
18795a2299, and
ac6a3a5e9d which make-up
changes required for backing-up and restoring recent
tasks from one device to another.

The implementation had too many unresolved issues including
the ordering of the restored recent tasks which was depending
on when the task package is installed on the new device that
puts the restored recents list out of order compared to the
old device.

Bug: 15986349
Bug: 19014377
Bug: 20763296

Change-Id: I06fd35a43036ef0b7260cf4db9c42890df63b95d
 2015-05-18 16:00:15 -07:00
Abodunrinwa Toki
dd6191f1a9 am 202d94c2: am 1b422a95: Merge "Hide the floating toolbar faster." into mnc-dev 
* commit '202d94c2e1ae7b15025076027a453b1a7d6fd2f1':
  Hide the floating toolbar faster.
 2015-05-18 17:31:26 +00:00
Abodunrinwa Toki
1408a59f1e am 7b85ce09: am 86817200: Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev 
* commit '7b85ce093b371a7d78c378a06880e22d1c08829a':
  Support min/max height for FloatingToolbar overflow.
 2015-05-18 17:18:43 +00:00
Abodunrinwa Toki
1b422a95f7 Merge "Hide the floating toolbar faster." into mnc-dev 2015-05-18 17:12:20 +00:00
Abodunrinwa Toki
8681720055 Merge "Support min/max height for FloatingToolbar overflow." into mnc-dev 2015-05-18 16:56:56 +00:00
Dan Sandler
a42d27804e am a9dca98e: am f6351ece: Merge "Mmm mmm mmm mmm." into mnc-dev 
* commit 'a9dca98ec32ac0ad5e13c70d1954f3ea46230b7d':
  Mmm mmm mmm mmm.
 2015-05-16 03:32:32 +00:00
Dan Sandler
f6351ece20 Merge "Mmm mmm mmm mmm." into mnc-dev 2015-05-16 03:11:53 +00:00
Adam Lesinski
7fb55c66b5 am e171e34e: am 18f84162: Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev 
* commit 'e171e34e63bbeea790cb6c5191873fc181d1b5c0':
  BatteryStats: Enable bluetooth energy collection
 2015-05-15 23:21:58 +00:00
Adam Lesinski
18f84162fe Merge "BatteryStats: Enable bluetooth energy collection" into mnc-dev 2015-05-15 22:57:02 +00:00
Adam Lesinski
719e61fa5f BatteryStats: Enable bluetooth energy collection 
Device firmware has been fixed and bluetooth energy values
should be correct now.

Change-Id: I9b9eff378d81e8de4a3f475c071a4ef26cc97f21
 2015-05-15 15:49:24 -07:00
Paul Mclean
a53b87c918 am bb2387bd: am 0844dcd0: Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev 
* commit 'bb2387bd3f715e1ecc9aed6555519d769e1f4631':
  Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"
 2015-05-15 22:48:13 +00:00
Paul Lawrence
8e16c38f35 am edc3fbb9: am 21c8a493: Merge "DOn\'t save encryption settings when not encrypted" into mnc-dev 
* commit 'edc3fbb90619eb89da7db5cf1c76026a19a2ac98':
  DOn't save encryption settings when not encrypted
 2015-05-15 22:48:00 +00:00
Adam Lesinski
89d1f70748 am 47247e72: am ce27996c: Merge "BatteryStatsHelper: Bluetooth wasn\'t being included in usage list" into mnc-dev 
* commit '47247e728abb6bee77e2f650b9a339cdd55ddc29':
  BatteryStatsHelper: Bluetooth wasn't being included in usage list
 2015-05-15 22:33:31 +00:00
Paul McLean
abe665cf2e am 46f7c233: am 8c501a3a: Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev 
* commit '46f7c233ec2edbefe4cb3728871f3dcc0537d9fd':
  Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java
 2015-05-15 22:33:22 +00:00
Paul Mclean
0844dcd070 Merge "Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java"" into mnc-dev 2015-05-15 22:28:31 +00:00
Paul Mclean
788854b8c0 Revert "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" 
This reverts commit 34f5e04290.

Change-Id: Ie2a00ef26b20a662fb0e801925a3721804e427ba
 2015-05-15 22:28:07 +00:00
Paul Lawrence
21c8a49306 Merge "DOn't save encryption settings when not encrypted" into mnc-dev 2015-05-15 22:22:25 +00:00
Adam Lesinski
ce27996c4f Merge "BatteryStatsHelper: Bluetooth wasn't being included in usage list" into mnc-dev 2015-05-15 22:18:59 +00:00
Adam Lesinski
ee36c2861a BatteryStatsHelper: Bluetooth wasn't being included in usage list 
Bug:20892246
Change-Id: I6eaf204a2cd970ff75704be22c9006fe4dc696cd
 2015-05-15 15:18:06 -07:00
Paul McLean
8c501a3a56 Merge "Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java" into mnc-dev 2015-05-15 22:09:15 +00:00
Paul McLean
34f5e04290 Addeding try/catch to card#/device# parsing in AlsaDevicesParser.java 
Not the cause of, but related to...
Bug: 19082426

Change-Id: I296c67989debc932838b39d63fdb57396448c50c
 2015-05-15 14:58:30 -07:00
Adam Lesinski
9304393043 am 10595666: am 038959e8: Merge "Remove UID from kernel cpu accounting when uninstalled" into mnc-dev 
* commit '10595666e441952c5ab7fa1d7f9b4e8f7d25d200':
  Remove UID from kernel cpu accounting when uninstalled
 2015-05-15 21:44:01 +00:00