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

7989 Commits

Author SHA1 Message Date
Jason Monk
be64e1a1eb am 0f306a3c: am 90115ebe: am fc3487ce: am 000b85fa: am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '0f306a3ce7ca6bcc46c264ba0d64a150a889e433':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 20:41:06 +00:00
Jorim Jaggi
ab217f4dcb am 3ac771ae: am 9285c360: am bc2af9fb: am c4a7c191: am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit '3ac771aedc88dcda96fdc44cdc4f69ca9928623e':
  Update 'No notifications' text on configuration change
 2014-10-07 20:40:47 +00:00
Jason Monk
0f306a3ce7 am 90115ebe: am fc3487ce: am 000b85fa: am 733bcc7f: Merge "Hide hotspot tile if \'provisioning\' is needed" into lmp-dev 
* commit '90115ebec6ec6d84afe349b40355f2ec6137f39b':
  Hide hotspot tile if 'provisioning' is needed
 2014-10-07 20:34:46 +00:00
Jorim Jaggi
3ac771aedc am 9285c360: am bc2af9fb: am c4a7c191: am 988a8a98: Merge "Update \'No notifications\' text on configuration change" into lmp-dev 
* commit '9285c360d4f76e02019bb3927163b35a56b96fe2':
  Update 'No notifications' text on configuration change
 2014-10-07 20:34:31 +00: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
Amith Yamasani
a7081321d8 am 34a2a6ca: am 42f611f2: am 4797554a: am b86671f4: am 41bb3455: Merge "Set the default user restrictions to disallow calling and sms" into lmp-dev 
* commit '34a2a6ca933c3583fda5a04bf26f9951aa139e79':
  Set the default user restrictions to disallow calling and sms
 2014-10-07 18:07:52 +00:00
John Spurlock
3e4af56c25 am ca99de7d: am a85ab9d9: am 97e9a034: am 2c52c443: am 0d334365: Merge "Doze: Avoid pulsing in pockets." into lmp-dev 
* commit 'ca99de7df11cd776bdb006def1414093266eaa22':
  Doze: Avoid pulsing in pockets.
 2014-10-07 18:07:48 +00:00
PauloftheWest
34d662569b am 6de39933: am a100b44a: am 0c583078: am f7b7b758: am 53c84002: Merge "Fixed a Bluetooth Quick Settings update bug." into lmp-dev 
* commit '6de39933201d33e01ab8ea52638174048ccef4bc':
  Fixed a Bluetooth Quick Settings update bug.
 2014-10-07 18:07:29 +00:00
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
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
Selim Cinek
025a083ce7 am afb1981e: am 63a6bc2d: am 79934acb: Merge "Fixed a crash when the detail panel got very big" into lmp-mr1-dev 
* commit 'afb1981e004dff060c55972ebfb413ebead4787a':
  Fixed a crash when the detail panel got very big
 2014-10-07 00:44:04 +00: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
08e5f60ac3 Merge "Import translations. DO NOT MERGE" 2014-10-06 23:44:51 +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
Geoff Mendal
ebd532bc35 Import translations. DO NOT MERGE 
Change-Id: Ia61d25e126fd677f5d3dcded34a56e782cd8fea8
Auto-generated-cl: translation import
 2014-10-06 15:17:06 -07: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
22dbaddf58 am 8b718b80: am db75703b: am 2f577e83: am 90d557b7: am 7f7d240b: Merge "Fix issue #17752399: Multiple apps broken by GET_TASKS permission change" into lmp-dev 
* commit '8b718b80e0caf179a174f8417fe4f5b875297de6':
  Fix issue #17752399: Multiple apps broken by GET_TASKS permission change
 2014-10-06 19:43:58 +00: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
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
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
589cda806b Merge "Import translations. DO NOT MERGE" 2014-10-05 17:49:34 +00:00
Baligh Uddin
0e33b1a2a6 Import translations. DO NOT MERGE 
Change-Id: I94ea057516c95dbc1ed583b64d69e638d14d81ee
Auto-generated-cl: translation import
 2014-10-04 14:43:55 -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