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

13434 Commits

Author SHA1 Message Date
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
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
85eec267dd QS WiFi panel trigger settings on correct user 
Bug: 18900000
Change-Id: I67e234eb6300dd05f950f174107b6a28867af7a2
 2015-01-05 12:05:24 -05: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
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
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
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
4acca67390 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 15:52:54 +00:00
Baligh Uddin
b0e2d4c7f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 15:52:49 +00:00
Baligh Uddin
8dbf4f60e6 Import translations. DO NOT MERGE 
Change-Id: Ia6fc4bb7529db266834f9de0e809c77be53fa38b
Auto-generated-cl: translation import
 2014-12-23 00:37:22 -08:00
Baligh Uddin
3fa832bbfa Import translations. DO NOT MERGE 
Change-Id: I2096264002a0f4dad73672f5834327f151e95788
Auto-generated-cl: translation import
 2014-12-23 00:28:11 -08:00
Baligh Uddin
83a590b14c Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-23 04:44:58 +00:00
Baligh Uddin
f17490f5c2 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-23 04:44:53 +00:00
Baligh Uddin
0b85506360 Import translations. DO NOT MERGE 
Change-Id: Ie975c5e8d1edb7afc679ce1d27bb7e09b81df571
Auto-generated-cl: translation import
 2014-12-22 20:26:50 -08:00
Baligh Uddin
4136b4f7fe Import translations. DO NOT MERGE 
Change-Id: Ib629c0bca4f92a0c81bf5af904773df1b1f8549e
Auto-generated-cl: translation import
 2014-12-22 20:23:07 -08:00
John Spurlock
de9af5cdc0 am 17ca1aaf: Merge "Zen: Fix selection logic for "Indefinitely"." into lmp-mr1-dev 
* commit '17ca1aaf72ac5d48d33517331b6d772c1a158bfd':
  Zen: Fix selection logic for "Indefinitely".
 2014-12-22 22:01:27 +00:00
John Spurlock
0b68850375 Zen: Fix selection logic for "Indefinitely". 
Use a signal condition value for the forever condition in the panel
to ease the distinction between no selection + selecting indef.

Bug: 18810529
Change-Id: I2590899ab43734708c72aad066653ef27f89d760
 2014-12-22 15:13:30 -05:00
Andre Eisenbach
650639f9a5 Exclude unnecessary intents in SystemUI 
Bug: 18771211
Change-Id: Ie1288938b51aa85ba36aabbc1c34aee5fdbf4e28
 2014-12-19 10:45:01 -08:00
Jason Monk
bce72316c5 am 87343eff: am 28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev 
* commit '87343eff543a127c29e0fa47c9c276b3e9b92d57':
  Fix missing subscription list changes
 2014-12-19 15:06:43 +00:00
Jason Monk
87343eff54 am 28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev 
* commit '28fbe04052b95ada3c32d805f26d6d9ad5548d6b':
  Fix missing subscription list changes
 2014-12-19 15:00:12 +00:00
Jason Monk
28fbe04052 Merge "Fix missing subscription list changes" into lmp-mr1-dev 2014-12-19 14:55:49 +00:00
Winson Chung
5d40d0b645 am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit '4edaa5e4b65c9bac4ab9bdc26b4cdde217a9053a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:53:36 +00:00
Winson Chung
4edaa5e4b6 am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
* commit 'a320b2176c9e6a5b3f2c3fe6f80ca9b14e088e9a':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 20:25:55 +00:00
Winson Chung
a320b2176c Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 2014-12-18 19:30:40 +00:00
Winson Chung
e494c382c0 Bug 18784289: Fix issue with transition animation callback. 
This is a regression where we changed the source view for the transition
to dummy view, but since it was not yet attached, it could not get the
handler implicitly to post the onAnimationCompleted callback.  This CL
modifies these ActivityOption transitions to also take an explicit
handler to process the callback on.

Bug: 18784289

Change-Id: I73f745c33b9f8aed91f8d9cd975f37cf7e4128f1
 2014-12-18 11:27:18 -08:00
Jason Monk
c9f0571302 Fix missing subscription list changes 
A missing @Override let the wrong function try to catch changes
to the subscription list.

The SubscriptionManager returns null when no SIMs are in the device,
so handle null as an empty list of subscriptions.

Bug: 18752587
Change-Id: I20ee1bde3f23828860f57b512662ad54ee51baf0
 2014-12-18 14:07:46 -05:00
Jorim Jaggi
3a70523eb6 am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '4a5129c83b92e7ae198f4b9a3018c8cdcba5dd86':
  Fix colored icons in doze mode
 2014-12-17 19:10:43 +00:00
Jorim Jaggi
4a5129c83b am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit 'c3059b444fbd30b1344cd5ee3c7030d1e9e5c408':
  Fix colored icons in doze mode
 2014-12-17 19:04:42 +00:00
Jorim Jaggi
c3059b444f Merge "Fix colored icons in doze mode" into lmp-mr1-dev 2014-12-17 18:59:40 +00:00
Jorim Jaggi
92df1f2758 Fix colored icons in doze mode 
Also fixes the issue that small icons promoted to large icons were
not forced to be white, which lead to inconsistent treatment of the
icons.

Bug: 18537470

Change-Id: Ic35e082da12793f3f13c91740bfc345b336c3db4
 2014-12-17 19:57:45 +01:00
Paul Jensen
c266f62fd9 am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae 
* commit 'eece33395561fff249afc96749cd69a21c28fbac':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:43:36 +00:00
Paul Jensen
eece333955 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 
automerge: ee8feae

* commit 'ee8feae5d4624e6759e264cc80eac28b0d0af20f':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:36:31 +00:00
Paul Jensen
ee8feae5d4 Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev 2014-12-17 18:34:57 +00:00
Geoff Mendal
c8be182061 Import translations. DO NOT MERGE 
Change-Id: I23edfacad6257591c34c9af3b18e6ed03d3e80e4
Auto-generated-cl: translation import
 2014-12-17 06:50:55 -08:00