Wink Saville
948279954a
am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
...
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:15:58 +00:00
Wink Saville
6a903c31fe
am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
...
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
Rename reg/unreg OnSubscriptionsChangedListener.
2015-01-13 19:09:48 +00:00
Wink Saville
84c5e8ebf0
Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev
2015-01-13 19:02:07 +00:00
Winson Chung
7ce662ef87
Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev
2015-01-13 18:16:22 +00:00
Wink Saville
071743f0cb
Rename reg/unreg OnSubscriptionsChangedListener.
...
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.
Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
2015-01-13 08:36:24 -08:00
Winson Chung
98e8f7ac5e
DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes.
...
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.
Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
2015-01-12 17:36:47 -08:00
Jason Monk
afeefb63c6
am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev
...
automerge: 3454612
* commit '3454612e2c0879ece4ac17c8b7ba93dce59b1907':
Avoid showing emergency calls when not possible
2015-01-12 16:28:02 +00:00
Jason Monk
d74a331ae1
Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev
2015-01-12 14:01:04 +00:00
Jason Monk
b36becff08
Avoid showing emergency calls when not possible
...
Tablets aren't phones, so we shouldn't be showing an emergency calls
only message when in airplane mode or no sims are in them.
Bug: 18897573
Change-Id: I8cf31fe73dfd6dfd672a5ee58524815475a76c9c
2015-01-08 11:12:39 -05: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
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
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
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
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
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
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
3fa832bbfa
Import translations. DO NOT MERGE
...
Change-Id: I2096264002a0f4dad73672f5834327f151e95788
Auto-generated-cl: translation import
2014-12-23 00:28:11 -08: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
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
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
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
Geoff Mendal
8f0d3694f6
Import translations. DO NOT MERGE
...
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
2014-12-17 06:44:29 -08:00
Jason Monk
b8ba4719c1
am b1a280a3: am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev
...
* commit 'b1a280a3ee38af72c6eed10ec9763f1202e63dd8':
Add config to handle periodic check of tether provision
2014-12-16 17:05:10 +00:00
Jason Monk
052e9b12f5
Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev
2014-12-16 15:44:07 +00:00
Geoff Mendal
111a81669e
Import translations. DO NOT MERGE
...
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
2014-12-15 06:50:18 -08:00
Jason Monk
89b75bdbf6
am f8dd5f6a: am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev
...
* commit 'f8dd5f6a19791fdb6fbe1fc40863c1e8dcf785e6':
Handle config changes in NetworkController
2014-12-12 18:49:32 +00:00
Jason Monk
19b6ae0fe8
am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
...
* commit '106806270c6808c94978ce39e11b7ea73a2cfcf1':
Fix tests after inet changes in NetworkController
2014-12-12 18:49:26 +00:00
Jason Monk
a47f968d7e
Merge "Handle config changes in NetworkController" into lmp-mr1-dev
2014-12-12 18:36:40 +00:00
Jason Monk
a686970051
Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev
2014-12-12 18:36:26 +00:00
Jason Monk
3aaabd7124
Handle config changes in NetworkController
...
We need to remap or recalculate icons after a config change, so
configs based on mccmnc can update properly.
Bug: 18654943
Change-Id: I6a4c1debf9b266d486143b9869abb569bbc31aef
2014-12-12 11:56:11 -05:00
Jorim Jaggi
0b12c6cd89
am e741a3e9: am 8934e670: Merge "Limit item count in QS detail" into lmp-mr1-dev
...
* commit 'e741a3e9fe1d710f5531d134ae317d2b73c57292':
Limit item count in QS detail
2014-12-12 15:46:37 +00:00
Jorim Jaggi
4ec83a764d
am 19131b49: am d3cccec0: Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
...
* commit '19131b49f62e6a6b21013be1f9f25b3874728a9b':
Fix low FPS when entering wifi/BT detail panel
2014-12-12 15:46:30 +00:00
Jorim Jaggi
8514333283
am 569a113a: am ab60f285: Merge "Improve transition when going to Wifi/BT detail panel" into lmp-mr1-dev
...
* commit '569a113a1957fee2a9ef2131f3334e68b30f30f4':
Improve transition when going to Wifi/BT detail panel
2014-12-12 15:46:24 +00:00
Jorim Jaggi
8934e67051
Merge "Limit item count in QS detail" into lmp-mr1-dev
2014-12-12 15:32:57 +00:00
Jorim Jaggi
d3cccec083
Merge "Fix low FPS when entering wifi/BT detail panel" into lmp-mr1-dev
2014-12-12 15:32:30 +00:00