drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
154,781 Commits 1 Branch 0 Tags
Commit Graph

11156 Commits

Author SHA1 Message Date
Dianne Hackborn
d83e9e4280 am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '0761b1b5ebb453a411e3289c1c972dbfddcee880':
  Put in real "code" (aka marketing) name.
 2014-10-09 13:03:21 +00:00
Dianne Hackborn
0761b1b5eb am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev 
* commit '89b196958fee07475765bd3c458098464ba16f2e':
  Put in real "code" (aka marketing) name.
 2014-10-09 00:14:54 +00:00
Geoff Mendal
293b883c75 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-08 19:56:41 +00:00
Geoff Mendal
e19fa35585 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-08 19:54:21 +00:00
Geoff Mendal
50053dbf28 Import translations. DO NOT MERGE 
Change-Id: I30dfc9ade88728eaa4ee1d1a9921c3f69d9e349b
Auto-generated-cl: translation import
 2014-10-08 12:05:39 -07:00
Geoff Mendal
c926f83394 Import translations. DO NOT MERGE 
Change-Id: Ib6860d633a07ab2c18b4352f7a783e2ad18e266a
Auto-generated-cl: translation import
 2014-10-08 11:57:47 -07:00
Jorim Jaggi
786afcb3ee Trim graphics memory when closing the shade 
Graphics memory usually gets trimmed in applications when the
activity goes into the background. We use quite a lot of graphics
memory when the shade/lockscreen is open, and some of them never gets
freed unless the recents activity is closed, because we don't have
these activity-trimming-heuristics for the shade. This change
proactively trims the graphics memory when the shade gets closed or
when the lockscreen is hidden, to emulate the same heuristics as for
activities.

This change also adds trimMemory on RenderThread to systrace to
verify that no jank is introduced with this change.

This change immediately saves around 10-30 MB on an xxhdpi device
after the shade is closed.

Bug: 17581375
Change-Id: I4fb622efb51815fe08187be97ba15d012d4de5d4
 2014-10-08 18:30:54 +00:00
Dan Sandler
621fa30c54 am 9eef8749: am 2200f86f: All (er, L) is finally revealed. 
* commit '9eef8749232c00afad5ca3c26736c0be785cb8c1':
  All (er, L) is finally revealed.
 2014-10-08 18:25:57 +00:00
Jim Miller
73c3c37703 am af37450f: am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit 'af37450f41f6834979f1312e61ec550d2a0d665e':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 18:25:38 +00:00
Dan Sandler
9eef874923 am 2200f86f: All (er, L) is finally revealed. 
* commit '2200f86f800876d005f911e6864708fa9772d03a':
  All (er, L) is finally revealed.
 2014-10-08 18:16:01 +00:00
Jim Miller
af37450f41 am 52403d6f: Merge "Fix "Wrong password" message shown when using BT keyboard." into lmp-dev 
* commit '52403d6f8e9a0e31a0f880a9cd297aeb35c29c8e':
  Fix "Wrong password" message shown when using BT keyboard.
 2014-10-08 18:15:24 +00:00
Dianne Hackborn
89b196958f Merge "Put in real "code" (aka marketing) name." into lmp-dev 2014-10-08 17:59:19 +00:00
Dan Sandler
2200f86f80 All (er, L) is finally revealed. 
If you exceed 20000 points, please send in a screenshot.

Bug: 15984887
Change-Id: I1164160bfa8e7dca3b9e7d7ca5d50ef9abd38b61
 2014-10-08 04:01:01 +00:00
Dianne Hackborn
955d8d69ea Put in real "code" (aka marketing) name. 
Change-Id: Idb3976edfae37293ed75cb5b869b4b42d8042bbe
 2014-10-07 20:17:19 -07:00
Jim Miller
e8fed24be6 Fix "Wrong password" message shown when using BT keyboard. 
The code was assuming we're always using soft IME. When a physical
keyboard is attached, we get two events; ACTION_DOWN and ACTION_UP.
The code attempted to unlock the device twice.  The second attempt
failed because the TextView was cleared by the first successful attempt.

Fixes bug 17690585

Change-Id: Ia92a97400b4404d0cbe86aacb727009e95914327
 2014-10-07 16:50:04 -07:00
Wei Liu
6bf67ef1ce am c7d477bb: Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev 
* commit 'c7d477bb7d9d2391ad3d26bbe4718e7956597d20':
  Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable.
 2014-10-07 23:02:17 +00:00
Wei Liu
c7d477bb7d Merge "Keep the BugreportWarningActivity screen on. Make the bugreport warning text scrollable." into lmp-sprout-dev 2014-10-07 22:56:59 +00:00
Wei Liu
751160397d Keep the BugreportWarningActivity screen on. 
Make the bugreport warning text scrollable.

Bug: 16930717

Change-Id: I270ee3f3acdcdab2febc2a2768382bbfb20c438b
 2014-10-07 15:39:09 -07:00
Svet Ganov
2eb7fadcd6 Custom print settings cannot change resolution. 
bug:17677133

Change-Id: Ib8a24101f12d431fe221c1e91711d93a6a517273
 2014-10-07 15:32:31 -07:00
Jason Monk
fc3487cedd am 000b85fa: am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '000b85fa8ca68b530b18a7318f8ac49b76b1114f':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 20:03:18 +00:00
Jorim Jaggi
bc2af9fbcf am c4a7c191: am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit 'c4a7c191be3a6fcbff984aa8b54c6378cc94262d':
  Update 'No notifications' text on configuration change
 2014-10-07 20:03:04 +00:00
Jason Monk
000b85fa8c am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '733bcc7fbe8f03c92f20c57dd25cbc3b011cef9e':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 19:58:48 +00:00
Jorim Jaggi
c4a7c191be am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit '988a8a9820bb3ae331be4932eb9e672a4614efd5':
  Update 'No notifications' text on configuration change
 2014-10-07 19:58:28 +00:00
Jason Monk
733bcc7fbe Merge "Hide hotspot tile if 'provisioning' is needed" into lmp-dev 2014-10-07 18:53:20 +00:00
Jason Monk
20ef4024ed Hide hotspot tile if 'provisioning' is needed 
If we need carrier entitlement checks don't show the hotspot tile
which could bypass them, instead make the user go to settings.

Bug: 17879554
Change-Id: I30a5b51b26a2d4e977579b71a16c3c7a8d004eea
 2014-10-07 14:43:11 -04:00
Jorim Jaggi
988a8a9820 Merge "Update 'No notifications' text on configuration change" into lmp-dev 2014-10-07 17:48:01 +00:00
Amith Yamasani
4797554ab8 am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit 'b86671f4b8263affaa561796862bd4149235b1d3':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:43:08 +00:00
John Spurlock
97e9a034b9 am 2c52c443: am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '2c52c443dcca748279e386160143ae388b19bb66':
  Doze: Avoid pulsing in pockets.
 2014-10-07 17:43:03 +00:00
PauloftheWest
0c58307868 am f7b7b758: am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit 'f7b7b7585acb0bec5c8ccfd646981a1b9f906f60':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 17:42:52 +00:00
Amith Yamasani
b86671f4b8 am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '41bb3455e44dc8fde4569bbfd56fa20c6da8a27d':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 17:33:25 +00:00
John Spurlock
2c52c443dc am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit '0d334365c6123388a0df81438b82122be29d19ab':
  Doze: Avoid pulsing in pockets.
 2014-10-07 17:33:10 +00:00
PauloftheWest
f7b7b7585a am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit '53c84002911362c913bc72cd28d186718a33149d':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 17:31:39 +00:00
Amith Yamasani
41bb3455e4 Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 2014-10-07 17:11:34 +00:00
John Spurlock
92b8d41096 Doze: Avoid pulsing in pockets. 
Query for the current proximity value before starting a pulse.
If a "near" value is returned, skip the entire pulse.

Bug: 17350239
Change-Id: Ib930d84b163c8e54b7be5d1c975e547692f8529f
 2014-10-07 12:01:56 -04:00
PauloftheWest
53c8400291 Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 2014-10-07 13:01:28 +00:00
Amith Yamasani
aa6634eaca Set the default user restrictions to disallow calling and sms 
When creating a user via the UI, disallow phone calls and SMS by
default. Primary user must explicitly enable it via Settings.

Bug: 17832802
Change-Id: I18cad4be8493ddc8890b5d90da2df256cb3f1ec9
 2014-10-06 18:24:32 -07:00
Paul Jensen
84527eca75 am 69c489ed: am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 
* commit '69c489ed6f28cb3c79f13b2f7b6cffc6d3b49627':
  Use network-specific HTTP proxy settings in captive portal login app.
 2014-10-07 00:32:00 +00:00
Selim Cinek
79934acb40 Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev 2014-10-07 00:22:34 +00:00
Selim Cinek
face7c1795 Fixed a crash when the detail panel got very big 
An example was when we have many casting devices or users,
it was simply crashing. Also fixed a bug where the background
would not be drawn anymore.

Bug: 17699850
Change-Id: Ibdb8f75f53da2806dcd7dd1386ebcc345b012f47
 2014-10-06 16:54:46 -07:00
Paul Jensen
69c489ed6f am 7627d2cd: Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 
* commit '7627d2cd5cd93ebf8e683392edbef961dbc20d31':
  Use network-specific HTTP proxy settings in captive portal login app.
 2014-10-06 23:52:12 +00:00
Geoff Mendal
1d593ad474 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-06 23:39:12 +00:00
Geoff Mendal
a6b027084c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-06 23:29:52 +00:00
Geoff Mendal
fc8d65197a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-10-06 23:28:23 +00:00
Paul Jensen
7627d2cd5c Merge "Use network-specific HTTP proxy settings in captive portal login app." into lmp-dev 2014-10-06 23:01:27 +00:00
Wei Liu
de93b1049e am a940f865: Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 
* commit 'a940f8656d5ca6eb2d737a9a480166c760684ee0':
  Hide bug report notification in Android Framework from watches.
 2014-10-06 22:35:09 +00:00
Wei Liu
a940f8656d Merge "Hide bug report notification in Android Framework from watches." into lmp-sprout-dev 2014-10-06 22:10:33 +00:00
Geoff Mendal
295c3cabb2 Import translations. DO NOT MERGE 
Change-Id: I1b7537a5a607ad61da0b24e1826dc0876bb3f50d
Auto-generated-cl: translation import
 2014-10-06 15:04:49 -07:00
Geoff Mendal
b501dd1fad Import translations. DO NOT MERGE 
Change-Id: I157884cf5f8c29c59f1365a28578d988a0a357a5
Auto-generated-cl: translation import
 2014-10-06 14:58:45 -07:00
Geoff Mendal
c6da9afdcc Import translations. DO NOT MERGE 
Change-Id: Ib4bd44e7036f41df58740596f560091ef40c1f23
Auto-generated-cl: translation import
 2014-10-06 14:55:42 -07:00
Wei Liu
e255e4e536 Hide bug report notification in Android Framework from watches. 
Bug: 17806348
Change-Id: I1a90a9bc68d8ef4ff540dbbd9e4af4bfed8a61ae
 2014-10-06 14:50:10 -07:00