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

9194 Commits

Author SHA1 Message Date
Jorim Jaggi
a29e81bc7f Remove dead code #2: Remove unused Keyguard resources 
Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5
 2015-01-07 15:00:16 +01:00
Jorim Jaggi
5c60b64704 Remove dead code #1: Remove unused Keyguard classes 
Change-Id: I08327dd23072b4e793be40635f105ce0aa5f6f6f
 2015-01-07 15:00:04 +01: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
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
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
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
269cbab0cd Import translations. DO NOT MERGE 
Change-Id: I71ee9b0879e33e6fe00883877ee712a93f451357
Auto-generated-cl: translation import
 2015-01-05 06:43:14 -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
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
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
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
0dbb961e8f Import translations. DO NOT MERGE 
Change-Id: Idf18f4ddf1f44a5618c1087b722eca4847b137a2
Auto-generated-cl: translation import
 2014-12-23 00:44:58 -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
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
e387af1cd0 am 87343eff: am 28fbe040: Merge "Fix missing subscription list changes" into lmp-mr1-dev 
automerge: bce7231

* commit 'bce72316c5ef39dc4669a8e0a023d43c78535bb4':
  Fix missing subscription list changes
 2014-12-19 15:08:32 +00: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
f69fe23bff am 4edaa5e4: am a320b217: Merge "Bug 18784289: Fix issue with transition animation callback." into lmp-mr1-dev 
automerge: 5d40d0b

* commit '5d40d0b645e31063d08e304e4ba2880b267234b9':
  Bug 18784289: Fix issue with transition animation callback.
 2014-12-18 21:56:20 +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
92c9be1c12 am 3a70523e: am 4a5129c8: am c3059b44: Merge "Fix colored icons in doze mode" into lmp-mr1-dev 
* commit '3a70523eb63c4f61dcd6fcf52f1d9ebae7482027':
  Fix colored icons in doze mode
 2014-12-17 19:39:49 +00: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
7fb57f3968 Import translations. DO NOT MERGE 
Change-Id: I7048b2f5e758fb9b6448402c4a8bb8114ddb39dd
Auto-generated-cl: translation import
 2014-12-17 06:56:49 -08: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
6adf41cca9 am b1a280a3: am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 
automerge: b8ba471

* commit 'b8ba4719c1661d30322b7ad360455044a1aa5593':
  Add config to handle periodic check of tether provision
 2014-12-16 17:06:57 +00: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
1d60e76c5e Import translations. DO NOT MERGE 
Change-Id: Ib24c34c76cbfdc490acb59d462a8c920a22139b2
Auto-generated-cl: translation import
 2014-12-15 07:02:33 -08:00