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

14495 Commits

Author SHA1 Message Date
Baligh Uddin
197f81eda9 Merge "Import translations. DO NOT MERGE" 2014-12-23 15:52:59 +00:00
Baligh Uddin
8036310439 Merge "Import translations. DO NOT MERGE" 2014-12-23 15:52:44 +00:00
Baligh Uddin
be0cca472b Import translations. DO NOT MERGE 
Change-Id: Ie3c6d7239fc0f85e1703332c816edf8b19d9fa5d
Auto-generated-cl: translation import
 2014-12-23 00:46:49 -08: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
e876dbcaaa Merge "Import translations. DO NOT MERGE" 2014-12-23 04:45:08 +00:00
Baligh Uddin
6f0e661704 Merge "Import translations. DO NOT MERGE" 2014-12-23 04:45:00 +00:00
Baligh Uddin
1b09b23b74 Import translations. DO NOT MERGE 
Change-Id: I9535f01cf967b5a17dfad63ef52d1b6bec03d322
Auto-generated-cl: translation import
 2014-12-22 20:31:46 -08:00
Baligh Uddin
2d9543abca Import translations. DO NOT MERGE 
Change-Id: I502afa35fad7c98a1a6728b88706245891296c18
Auto-generated-cl: translation import
 2014-12-22 20:19:30 -08:00
Baligh Uddin
46b75cf7df Import translations. DO NOT MERGE 
Change-Id: I6951b81085c270c7539e19a6524b8950e86cbabc
Auto-generated-cl: translation import
 2014-12-22 20:15:52 -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
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
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
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
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
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
b9d5551be2 am c266f62f: am eece3339: Merge "Show broken lock image when SSL errors are encountered in CaptivePortalLogin." into lmp-mr1-dev automerge: ee8feae 
* commit 'c266f62fd9f241b0d122bae7ad016ecd58ab40da':
  Show broken lock image when SSL errors are encountered in CaptivePortalLogin.
 2014-12-17 18:50:30 +00: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
7fb57f3968 Import translations. DO NOT MERGE 
Change-Id: I7048b2f5e758fb9b6448402c4a8bb8114ddb39dd
Auto-generated-cl: translation import
 2014-12-17 06:56:49 -08: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
Geoff Mendal
8f0d3694f6 Import translations. DO NOT MERGE 
Change-Id: Ib6806ea69f69ba66b4dc09a46b6e86d0ace3e734
Auto-generated-cl: translation import
 2014-12-17 06:44:29 -08:00
Marvin Paul
6879555723 Buffer SettingsBackupAgent checksum writes 
Reduce SettingsBackupAgent I/O when writing new checksum by wrapping
FileOutputStream in a BufferedOutputStream.

Bug: 18674340

Change-Id: Ia8169445d42d032e24d8a395e678295f67841a65
 2014-12-16 16:27:49 -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
b1a280a3ee am 052e9b12: Merge "Add config to handle periodic check of tether provision" into lmp-mr1-dev 
* commit '052e9b12f5fc7a1e3ecdd126ca8c07298941f291':
  Add config to handle periodic check of tether provision
 2014-12-16 16:59:44 +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
38706fc799 Merge "Import translations. DO NOT MERGE" 2014-12-15 15:11:37 +00:00
Geoff Mendal
b73e02cf5c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:11:25 +00:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +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
Geoff Mendal
099cce32d2 Import translations. DO NOT MERGE 
Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import
 2014-12-15 06:56:40 -08: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
Geoff Mendal
c2364bc396 Import translations. DO NOT MERGE 
Change-Id: I8cabcbd1ee5327a6545b379dd7f35ca9c29c9114
Auto-generated-cl: translation import
 2014-12-15 06:33:10 -08:00
Geoff Mendal
e184608398 Import translations. DO NOT MERGE 
Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import
 2014-12-15 06:28:48 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00
Jason Monk
0adc69032d am f8dd5f6a: am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
automerge: 89b75bd

* commit '89b75bdbf64416cfea39641a85bf6458212a32bf':
  Handle config changes in NetworkController
 2014-12-12 18:56:18 +00:00
Jason Monk
7f8fab6fc3 am 10680627: am a6869700: Merge "Fix tests after inet changes in NetworkController" into lmp-mr1-dev 
automerge: 19b6ae0

* commit '19b6ae0fe82913a9838a43f60ae330197d4ef978':
  Fix tests after inet changes in NetworkController
 2014-12-12 18:55:04 +00: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
f8dd5f6a19 am a47f968d: Merge "Handle config changes in NetworkController" into lmp-mr1-dev 
* commit 'a47f968d7e27560984d846bb62c7b40297c1579c':
  Handle config changes in NetworkController
 2014-12-12 18:43:33 +00:00