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

7488 Commits

Author SHA1 Message Date
Amith Yamasani
34a2a6ca93 am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '42f611f2f5cbc68a6aaac18ed9e3c62ebc765901':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 18:02:29 +00:00
John Spurlock
ca99de7df1 am a85ab9d9: am 97e9a034: am 2c52c443: am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit 'a85ab9d9d3a386e3771fe3073d6fa07c3b8171ac':
  Doze: Avoid pulsing in pockets.
 2014-10-07 18:02:25 +00:00
PauloftheWest
6de3993320 am a100b44a: am 0c583078: am f7b7b758: am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit 'a100b44a1ba0d7cec756839a9630c2df3926a66a':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 18:02:17 +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
Selim Cinek
afb1981e00 am 63a6bc2d: am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev 
* commit '63a6bc2d996381ae62a71b2d464978b7f884d7d1':
  Fixed a crash when the detail panel got very big
 2014-10-07 00:35:06 +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
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
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
Dianne Hackborn
8b718b80e0 am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit 'db75703b261e1d1446cca210d7dcafa3279c31bc':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:39:50 +00: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
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
83c7963c2a am 711ea1e5: am 23f07789: am 3c6300da: am eae1c3d5: Merge "Fix blank Keyguard #4" into lmp-dev 
* commit '711ea1e5e25eaaf7bb1eb4ffb63ef08b339f61f2':
  Fix blank Keyguard #4
 2014-10-04 16:13:56 +00:00
Jorim Jaggi
a94d2c5442 am 5c9f0987: am 85701394: am a359df01: am f009e358: Merge "Fix blank lockscreen #3" into lmp-dev 
* commit '5c9f0987fce29a78f79429947c00b14f5a8b4504':
  Fix blank lockscreen #3
 2014-10-04 15:45:25 +00: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
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
Elliott Hughes
9f22aef0c9 resolved conflicts for merge of 57ec13b2 to lmp-mr1-dev-plus-aosp 
Change-Id: I79418b166b9efbc2ca028a05ec04e5a7fd667ee6
 2014-10-03 15:29:32 -07:00
Elliott Hughes
1fb235aa9b Merge "Fix percentage formatting in SystemUI." into lmp-mr1-dev 2014-10-03 21:42:38 +00:00
Jorim Jaggi
449981be16 Fix blank lockscreen #3 
Bug: 17439581
Change-Id: Ic8cb7f32200b541ecc8fa36ad2517975cec0b545
 2014-10-03 14:24:55 -07:00
Elliott Hughes
88d255107d Fix percentage formatting in SystemUI. 
Also remove some orphaned strings that tried to format percentages wrongly.

(The ar and fa localizations will be clobbered, but this lets you test this
change independently.)

Bug: 15476051
Change-Id: Ifd97d47446bdd2e95298b04e1a11542dfed7f9a1
 2014-10-03 12:06:17 -07:00
John Spurlock
8005c38e17 am e02d4b0e: am 0dbc6f32: am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit 'e02d4b0ef382415c976f7aa1a398c8d61fcd5216':
  Update framework icons for media & alarm streams.
 2014-10-03 14:18:39 +00:00
John Spurlock
0dbc6f328e am 7da91cc2: am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit '7da91cc21f0f77277d76001af9133de3923ba686':
  Update framework icons for media & alarm streams.
 2014-10-03 14:05:47 +00:00
John Spurlock
7da91cc21f am a79caa53: Merge "Update framework icons for media & alarm streams." into lmp-dev 
* commit 'a79caa53405ea3efdd77d59ea7aa6dd64ecf09d3':
  Update framework icons for media & alarm streams.
 2014-10-03 14:00:29 +00:00
John Spurlock
4bebb1dc5e Update framework icons for media & alarm streams. 
Update resources to new style and remove obsolete items.

Bug: 17762712
Change-Id: Ibec121828084934cc066afe117f66b6a0eea603f
 2014-10-02 20:11:37 -04:00
Neil Fuller
c2a0b4482d resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp 
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
 2014-10-02 14:32:37 +01:00
John Spurlock
9ab7d0a736 am a0aa089b: am eac9f30c: am 4940789b: am c403a340: Merge "Doze: Route volume keys to music only while pulsing." into lmp-dev 
* commit 'a0aa089bcf8358f93c4eef33cfe409238ccecd39':
  Doze: Route volume keys to music only while pulsing.
 2014-10-02 12:38:40 +00:00
Winson Chung
7716f1b609 am 98391728: am 0dad6a07: am d8ab73d7: am d092fc70: Merge "Ensure that we don\'t show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to ho 
* commit '983917288d1d6ea0ade9229740ea5bac0b8b2887':
  Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) - Fix regression with launching an affiliated task due to clipping changes (Bug 17755902) - Tweaking previous changes to home transition - Disable the debug mode option
 2014-10-02 12:38:36 +00:00
Selim Cinek
6ebab792d2 am 1e5e35ef: am 1c061d48: am cdbda3e9: am 15b2202b: Merge "Adapting translation length for a string in a dialog" into lmp-dev 
* commit '1e5e35ef626d2a73cf823e75fcbb67af3398b1ff':
  Adapting translation length for a string in a dialog
 2014-10-02 00:58:46 +00:00