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

11235 Commits

Author SHA1 Message Date
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
Jorim Jaggi
8cc8dfed32 Update 'No notifications' text on configuration change 
Bug: 17821946
Change-Id: Ia4518426ce059be5312d652bb27bbe11a1626518
 2014-10-06 12:27:55 -07:00
Dianne Hackborn
2f577e83cb am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '90d557b7a68e64e049a44560b76b959ef87f13d7':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:22:53 +00:00
Dianne Hackborn
90d557b7a6 am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '7f7d240b13b96b617e298c6178af0425308f5ef9':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:17:10 +00:00
Dianne Hackborn
7f7d240b13 Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 2014-10-06 18:48:34 +00:00
Geoff Mendal
c1a064dd94 Import translations. DO NOT MERGE 
Change-Id: I391b269b0d535fa7d8a4082cb0271b0aeb16a497
Auto-generated-cl: translation import
 2014-10-06 10:56:58 -07:00
Geoff Mendal
f65288da06 Import translations. DO NOT MERGE 
Change-Id: Ieb7aeaea1204f4ba7daf3abd7a30f647564807dd
Auto-generated-cl: translation import
 2014-10-06 10:55:10 -07:00
Geoff Mendal
86dec04749 Import translations. DO NOT MERGE 
Change-Id: I2100b649d1f2866cdc5ffd13f264afba347b6685
Auto-generated-cl: translation import
 2014-10-06 10:54:01 -07:00
PauloftheWest
6cdeaa0d03 Fixed a Bluetooth Quick Settings update bug. 
+ Now when a Bluetooth device disconnects, and the user is looking at quick
settings, the Bluetooth icon and text will update with the new state of
diconnected.

Bug: 17677593
Change-Id: Iccaf16a23f7e0b8690a32945906a9ccc2382cdd0
 2014-10-06 09:31:48 -07:00
Baligh Uddin
6fe06067ff Import translations. DO NOT MERGE 
Change-Id: I413d08f553c47701a72eb3481fe73a5ba80ba523
Auto-generated-cl: translation import
 2014-10-04 14:34:27 -07:00
Baligh Uddin
56541723bf Import translations. DO NOT MERGE 
Change-Id: I18962c620b68a9e1fa101aeda6f3511fb54af9c0
Auto-generated-cl: translation import
 2014-10-04 14:30:00 -07:00
Baligh Uddin
58f23336a8 Import translations. DO NOT MERGE 
Change-Id: Ied21f2af367832b5b11dc1ddc6f0927e47f1e113
Auto-generated-cl: translation import
 2014-10-04 14:27:49 -07:00
Jorim Jaggi
23f0778983 am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit '3c6300da713a7407a3fcfba126ef912ea7bc21bc':
  Fix blank Keyguard #4
 2014-10-04 00:11:22 +00:00
Jorim Jaggi
3c6300da71 am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit 'eae1c3d5c1d7b292823c668eaedc72ffa707a5d6':
  Fix blank Keyguard #4
 2014-10-04 00:04:22 +00:00
Jorim Jaggi
8570139447 am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'a359df01e012b194870d322fb1c16a6436d79f89':
  Fix blank lockscreen #3
 2014-10-03 23:57:33 +00:00
Jorim Jaggi
eae1c3d5c1 Merge "Fix blank Keyguard #4" into lmp-dev 2014-10-03 23:54:07 +00:00
Jorim Jaggi
a359df01e0 am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit 'f009e3583f2843a463d75f06675ef18c398b0efd':
  Fix blank lockscreen #3
 2014-10-03 23:53:09 +00:00
Dianne Hackborn
2d7576b082 Fix issue #17752399: Multiple apps broken by GET_TASKS permission change 
Keep around GET_TASKS as a permission available to apps, so apps still
think they have it and don't get all uppity because they don't.

Add a new REAL_GET_TASKS that is the actual permission now.

Plus some temporary compatibility code until everyone can transition
fromn GET_TASKS to REAL_GET_TASKS.

Change-Id: I12c1102eed24844685dcbd2fa3b612811603958f
 2014-10-03 16:26:04 -07:00
Jorim Jaggi
5e08e6957d Fix blank Keyguard #4 
When we were fading out the preview for phone/camera to crossfade to
the real application, it might have been that showKeyguard was
called in the middle of this transition. This change makes sure that
we cancel this animation when showing the keyguard.

Bug: 17439581
Change-Id: I89cacf7ecf43d37ea979418b976390272510a09d
 2014-10-03 15:52:24 -07:00
Jorim Jaggi
f009e3583f Merge "Fix blank lockscreen #3" into lmp-dev 2014-10-03 22:33:06 +00:00
Elliott Hughes
1fb235aa9b Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 2014-10-03 21:42:38 +00:00
Dianne Hackborn
02b4caf5f7 am 02d758a9: am 7caa51e6: Merge "Fix issue #17811029: Settings provider race when removing users" into lmp-dev 
* commit '02d758a9e83eb1da236f34a2a6b70af89941be43':
  Fix issue #17811029: Settings provider race when removing users
 2014-10-03 21:33:08 +00:00