drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
179,457 Commits 1 Branch 0 Tags
719d5b3df0
Commit Graph

14560 Commits

Author SHA1 Message Date
Geoff Mendal
719d5b3df0 Import translations. DO NOT MERGE 
Change-Id: Idcfd4c630d636eeaaafd95085223178e395d0584
Auto-generated-cl: translation import
 2015-01-07 06:38:31 -08:00
Shishir Agrawal
8ddd54fb38 am 08fb858f: am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '08fb858f82c29467ba6e4bf1f54c56a4791b625d':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:54:34 +00:00
Shishir Agrawal
08fb858f82 am 91886677: am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '918866778f232ce07b1c2c2d6ea43bf5f0ce827f':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:48:11 +00:00
Shishir Agrawal
918866778f am 8955c54e: Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 
* commit '8955c54e0ea24a907c7ce06e7f2f3dd3afc84cda':
  Data quick settings - Usage shown should take into account merged IDs.
 2015-01-06 00:43:09 +00:00
Shishir Agrawal
8955c54e0e Merge "Data quick settings - Usage shown should take into account merged IDs." into lmp-mr1-dev 2015-01-06 00:37:07 +00:00
Jason Monk
afeb044afc resolved conflicts for merge of 336c4666 to master 
Change-Id: I350b3ecadce490b62c92c0e7b1d555825d035f87
 2015-01-05 16:37:46 -05:00
Jason Monk
1c1e115975 am 7662f6ea: am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
automerge: 9ce34fd

* commit '9ce34fd0a8335a18873d345eec675c177adbdd06':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:21:58 +00:00
Jason Monk
336c46668d am ad7cf95c: am ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev 
* commit 'ad7cf95c604732b36cd4b0da394b48cfd3dba878':
  Don't unregister MobileSignalControllers still used
 2015-01-05 21:20:21 +00:00
Jason Monk
9ce34fd0a8 am 7662f6ea: am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
* commit '7662f6ea8f7be5f090c6e7a4b7b686a6e5018426':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:20:16 +00:00
Jason Monk
ad7cf95c60 am ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev 
* commit 'ee2e13e75356fbef806dfb69ccf995d7f616f027':
  Don't unregister MobileSignalControllers still used
 2015-01-05 21:15:51 +00:00
Jason Monk
7662f6ea8f am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
* commit 'b142b7552a6245606d93c43ce56ce81c700b3c09':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:15:46 +00:00
Jason Monk
ee2e13e753 Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev 2015-01-05 21:09:23 +00:00
Jason Monk
b142b7552a Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 2015-01-05 21:09:05 +00:00
Jason Monk
c014decc74 Don't unregister MobileSignalControllers still used 
Also add some more testing for this section of code that manages
when MobileSignalControllers are added/removed to make sure we
are all good.

Bug: 18728593
Change-Id: I9902854c54d2e1deb58b38b7bd97dac1617831c0
 2015-01-05 15:53:00 -05:00
Jason Monk
e6fc4911e2 Show saved networks in QS sub-panel. 
Bug: 18365695
Change-Id: If32ea2e69c2100c706632ab1f90e2e99bbf230f6
 2015-01-05 14:33:26 -05:00
Jason Monk
85eec267dd QS WiFi panel trigger settings on correct user 
Bug: 18900000
Change-Id: I67e234eb6300dd05f950f174107b6a28867af7a2
 2015-01-05 12:05:24 -05:00
Jason Monk
a199880a01 am cf28f9b8: am 4ae97d36: Post broadcasts to bg and cache bt state info 
automerge: 2858ca9

* commit '2858ca9e282b10afd67da73885e3a25e82e510a6':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:37:46 +00:00
Jason Monk
2858ca9e28 am cf28f9b8: am 4ae97d36: Post broadcasts to bg and cache bt state info 
* commit 'cf28f9b8830503605ff254a5ca8edd368e065a93':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:34:35 +00:00
Jason Monk
cf28f9b883 am 4ae97d36: Post broadcasts to bg and cache bt state info 
* commit '4ae97d3632edf4fd00fe23b9a2304e4e0f2348b7':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:29:20 +00:00
Jason Monk
4ae97d3632 Post broadcasts to bg and cache bt state info 
Add a background thread to post bt broadcasts to for processing.

Try to cache all bluetooth connection state info possible and pull
from broadcasts because requesting it too often may be locking up
devices.

Bug: 18771211
Change-Id: I2cf4852c935b2f471e735d953370e5d9e996c6f7
 2015-01-05 11:09:48 -05:00
Geoff Mendal
87439cb601 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:47:58 +00:00
Geoff Mendal
d9c51a77db Merge "Import translations. DO NOT MERGE" 2015-01-05 14:47:03 +00:00
Geoff Mendal
5e1370cd62 Import translations. DO NOT MERGE 
Change-Id: I92a69ec4b6384998d842369bda0531a8c5ce7825
Auto-generated-cl: translation import
 2015-01-05 06:44:53 -08:00
Geoff Mendal
269cbab0cd Import translations. DO NOT MERGE 
Change-Id: I71ee9b0879e33e6fe00883877ee712a93f451357
Auto-generated-cl: translation import
 2015-01-05 06:43:14 -08:00
Geoff Mendal
0b07a8756c Merge "Import translations. DO NOT MERGE" 2015-01-05 14:34:12 +00:00
Geoff Mendal
01d33e5cf2 Import translations. DO NOT MERGE 
Change-Id: I8aed2731e04350bbf8c50de7ebc81f9aaddf8fee
Auto-generated-cl: translation import
 2015-01-05 06:32:26 -08:00
Geoff Mendal
fef673eaa4 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:28:45 +00:00
Geoff Mendal
22cd10d671 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:25:58 +00:00
Geoff Mendal
743f1e2cc8 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:25:02 +00:00
Geoff Mendal
39d7a360cb Import translations. DO NOT MERGE 
Change-Id: I2d6f0dda941a9f61b21d14c8d9d67be5a58de9ce
Auto-generated-cl: translation import
 2015-01-05 06:22:04 -08:00
Geoff Mendal
e66e10b563 Import translations. DO NOT MERGE 
Change-Id: Ibe706a89d57655a9fb5890533887ca7a793190aa
Auto-generated-cl: translation import
 2015-01-05 06:19:02 -08:00
Geoff Mendal
ffeed7078c Import translations. DO NOT MERGE 
Change-Id: I16370c1730b23cbcae593add08cee035c31469b4
Auto-generated-cl: translation import
 2015-01-05 06:17:21 -08:00
Geoff Mendal
4a682c1b44 Import translations. DO NOT MERGE 
Change-Id: I9c93551bd46a5ef15b327a8f7ae332e69578ad90
Auto-generated-cl: translation import
 2015-01-05 06:11:03 -08:00
Baligh Uddin
9939422efa Import translations. DO NOT MERGE 
Change-Id: I941e39b33f0dd49c4e0385d22787823acef5d93a
Auto-generated-cl: translation import
 2014-12-31 11:16:03 -08:00
Marvin Paul
437d859c57 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 automerge: 8298afb 
automerge: 9ff2160

* commit '9ff2160eddf4dfbd118eb9b0656e7803603f215a':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 03:18:54 +00:00
Marvin Paul
9ff2160edd Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev automerge: a30fdf7 
automerge: 8298afb

* commit '8298afbc78f2b2c609f2e52ca3fc7c6a2cd9797e':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 03:15:55 +00:00
Marvin Paul
8298afbc78 Merge "Don\'t backup ringtone on non-telephony devices." into lmp-mr1-dev 
automerge: a30fdf7

* commit 'a30fdf790d66e241252c51d7dbdc401e021e51ad':
  Don't backup ringtone on non-telephony devices.
 2014-12-30 00:53:52 +00:00
Marvin Paul
a30fdf790d Merge "Don't backup ringtone on non-telephony devices." into lmp-mr1-dev 2014-12-29 23:18:17 +00:00
Baligh Uddin
fbfa98aaac Merge "Import translations. DO NOT MERGE" 2014-12-29 22:56:27 +00:00
Baligh Uddin
4cb74d8d08 Import translations. DO NOT MERGE 
Change-Id: I260f664c1fc1196d913cd7daeacb6a20550f057c
Auto-generated-cl: translation import
 2014-12-29 13:22:41 -08:00
Andre Eisenbach
52e7e6fe3b am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
automerge: d5e2fa0

* commit 'd5e2fa0bed602a1eb45afb41dc64a09d60e91a44':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:45:50 +00:00
Andre Eisenbach
d5e2fa0bed am 1d23da91: am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit '1d23da911a698ee1cc0503118f661ef0609ea8e9':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:42:03 +00:00
Andre Eisenbach
1d23da911a am d7d9cdae: Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 
* commit 'd7d9cdaebb30df5564b5787ee02d4624673c8523':
  Exclude unnecessary intents in SystemUI
 2014-12-29 18:36:27 +00:00
Andre Eisenbach
d7d9cdaebb Merge "Exclude unnecessary intents in SystemUI" into lmp-mr1-dev 2014-12-29 18:32:22 +00:00
John Spurlock
02fb882c50 am de9af5cd: am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev 
automerge: edad58b

* commit 'edad58bc61fd4b54b6581f32f063321fcbd58cac':
  Zen: Fix selection logic for "Indefinitely".
 2014-12-26 20:35:08 +00:00
John Spurlock
edad58bc61 am de9af5cd: am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev 
* commit 'de9af5cdc0a8ce55657e82fa2a71faa9d6321cb1':
  Zen: Fix selection logic for "Indefinitely".
 2014-12-26 20:30:21 +00:00
Marvin Paul
8fc5072524 Don't backup ringtone on non-telephony devices. 
Restoring a device that supports telephony using the backup set of
a non-telephony device would cause the ringtone to be set to "None"
instead of the default value. This was due to the fact that on
non-telephony devices, the ringtone value was being backed up as
"_silent" instead of null.

Bug: 18777629

Change-Id: Idece1f874438a895169dbba7df1d716adea6660e
 2014-12-23 14:58:17 -08:00
Shishir Agrawal
7287ed3d4b Data quick settings - Usage shown should take into account merged IDs. 
The System Settings data usage graph takes into account merged Ids
(b/18012787), but the quick settings usage graph does not.

Bug: 18805245
Change-Id: I3146052606e691129a3aa5cc509cf632fda9d6b2
 2014-12-23 09:54:48 -08:00
Baligh Uddin
47f0c01f06 Merge "Import translations. DO NOT MERGE" 2014-12-23 15:53:38 +00:00
Baligh Uddin
edad64e6ac Merge "Import translations. DO NOT MERGE" 2014-12-23 15:53:15 +00:00