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

163725 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ryosuke Matsuuchi
6876209ae8 am a667bcd6: am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 
* commit 'a667bcd688a35f7c9184452ffe7eb4bfe2989bf2':
  doc: Add Japanese version of DAC/distribute/ page.
 2015-02-27 17:10:31 +00:00
Andrew Solovay
35b15f399b am f8ceaa6b: am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
* commit 'f8ceaa6b557f59fdd654ce63e35f9b73c0be33b8':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
 2015-02-27 17:10:27 +00:00
Ryosuke Matsuuchi
a667bcd688 am d4cdf18e: am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 
* commit 'd4cdf18e1c763c2aaedbb4f0cab3657db2adc097':
  doc: Add Japanese version of DAC/distribute/ page.
 2015-02-27 17:00:13 +00:00
Andrew Solovay
f8ceaa6b55 am 3a5b0815: am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
* commit '3a5b08153e432b79e40bc5ddd62db2bb5fcf71e9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
 2015-02-27 17:00:10 +00:00
Ryosuke Matsuuchi
d4cdf18e1c am b8593133: am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 
* commit 'b859313312a85285c2c243a5e58d133e308ee590':
  doc: Add Japanese version of DAC/distribute/ page.
 2015-02-27 16:53:42 +00:00
Andrew Solovay
3a5b08153e am 3daee377: am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
* commit '3daee37705d23a0f91680aa954e4bcdb2dfdf4e8':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
 2015-02-27 16:53:37 +00:00
Ryosuke Matsuuchi
b859313312 am c1120b45: am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 
* commit 'c1120b459eb1ecabd54966cef1873f0f0707382d':
  doc: Add Japanese version of DAC/distribute/ page.
 2015-02-27 16:46:53 +00:00
Andrew Solovay
3daee37705 am 7f26f2b9: am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
* commit '7f26f2b96a23f32bca69862b254dbbe8b59049d9':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
 2015-02-27 16:46:49 +00:00
Ryosuke Matsuuchi
c1120b459e am 8f0e9c75: Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 
* commit '8f0e9c7593fee981fc4b3831aae76a1f20e236db':
  doc: Add Japanese version of DAC/distribute/ page.
 2015-02-27 16:37:42 +00:00
Andrew Solovay
7f26f2b96a am b5e00e5c: docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
* commit 'b5e00e5c3db7fc7121aeff6dc7d20b21740d47e5':
  docs: Documented new IABv5 sub upgrade/downgrade and manual renewal
 2015-02-27 16:37:38 +00:00
Ryosuke Matsuuchi
8f0e9c7593 Merge "doc: Add Japanese version of DAC/distribute/ page." into lmp-docs 2015-02-27 03:41:51 +00:00
Sanket Padawe
654a473bfe am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 
* commit '249f2c3a6c918d18dc8f8273b0afd8c14a6c9c20':
  Changing usage of carrier name field of SubInfoRecord
 2015-02-26 23:26:57 +00:00
Jason Monk
0ac63669b1 am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '057fd382cc26ff85db397835fdd3b7e5c73ef336':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:18:53 +00:00
Sanket Padawe
249f2c3a6c am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 
* commit '025f0938544bae3262acc24e9c6031b6de88901d':
  Changing usage of carrier name field of SubInfoRecord
 2015-02-26 23:11:38 +00:00
Andrew Solovay
b5e00e5c3d docs: Documented new IABv5 sub upgrade/downgrade and manual renewal 
Documented new support for users upgrading/downgrading subscriptions
in the middle of a sub period, and for users manually renewing
before the subscription period ends. Also updated testing docs
to reflect that sandbox now supports testing subscriptions, and
documented new "autoRenewing" field in INAPP_PURCHASE_DATA.

See first comment for doc stage location.

bug: 18982828
bug: 18916814
bug: 18951608
bug: 18908756
Change-Id: I530b57d840ed5aeefe4c6a688a2e59aec41ec7d0
 2015-02-26 14:34:48 -08:00
Jason Monk
057fd382cc am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '9df42df2bca0a7a91d813b19e084069675d4057b':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 21:59:06 +00:00
Sanket Padawe
025f093854 Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 2015-02-26 21:58:28 +00:00
Jason Monk
9df42df2bc Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 2015-02-26 21:54:23 +00:00
Rich Slogar
b8b1e07668 am efda11e7: am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit 'efda11e708cf39ac408fc1189f9a58b3c66b0831':
  docs: 9patch tool update
 2015-02-26 18:37:38 +00:00
Rich Slogar
efda11e708 am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit '328dc4288bc86b6f7a7db56d7bfb17053e94ec1c':
  docs: 9patch tool update
 2015-02-26 18:30:32 +00:00
Rich Slogar
328dc4288b am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit '6bb23d627f608461f6dd5f40308ac176a327d99b':
  docs: 9patch tool update
 2015-02-26 18:22:34 +00:00
Rich Slogar
6bb23d627f am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit '299366847f50059fb3e13b573247d9a05d29eb3c':
  docs: 9patch tool update
 2015-02-26 18:15:41 +00:00
Rich Slogar
299366847f am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit '0a504745b4f63bd9f1d5e40addf50a6e90b8522d':
  docs: 9patch tool update
 2015-02-26 18:08:39 +00:00
Rich Slogar
0a504745b4 Merge "docs: 9patch tool update" into lmp-docs 2015-02-26 18:02:43 +00:00
Rich Slogar
fa514d6907 am 5b3b1a17: am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs 
* commit '5b3b1a17da0f59ee7a0b4c4defb1993b9de85b3f':
  docs: remove exploring sdk link
 2015-02-25 23:46:45 +00:00
Rich Slogar
1e72a9b247 am 2ed2c141: am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit '2ed2c141f338bef0f11ae93167b7c810bbbd645d':
  docs: note to install linux packages v2 update
 2015-02-25 23:46:41 +00:00
Rich Slogar
5b3b1a17da am bd409177: am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs 
* commit 'bd409177ec6b422e18d9e0c94ffab86dfd368976':
  docs: remove exploring sdk link
 2015-02-25 23:38:55 +00:00
Rich Slogar
2ed2c141f3 am 81049aff: am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit '81049aff4bad07427dc18543be1c759e16267a63':
  docs: note to install linux packages v2 update
 2015-02-25 23:38:51 +00:00
Rich Slogar
bd409177ec am 1836eea0: am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs 
* commit '1836eea08229dda72ff89d24f75f9f4948be957e':
  docs: remove exploring sdk link
 2015-02-25 23:32:51 +00:00
Rich Slogar
81049aff4b am f8a95b0b: am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit 'f8a95b0b6fc4e19c7935a2fb46c5b7b6cef3a194':
  docs: note to install linux packages v2 update
 2015-02-25 23:32:46 +00:00
Rich Slogar
1836eea082 am 41104632: am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs 
* commit '411046324743055e9eef3b04109c998b5354b496':
  docs: remove exploring sdk link
 2015-02-25 23:25:11 +00:00
Rich Slogar
f8a95b0b6f am 84994e87: am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit '84994e876e728fa57f06d803f7c4abfbc9df40db':
  docs: note to install linux packages v2 update
 2015-02-25 23:25:07 +00:00
Rich Slogar
4110463247 am eedf6ad8: Merge "docs: remove exploring sdk link" into lmp-docs 
* commit 'eedf6ad8ce1e15276311a78488e27388f049b4c0':
  docs: remove exploring sdk link
 2015-02-25 23:17:31 +00:00
Rich Slogar
84994e876e am db2ebca7: Merge "docs: note to install linux packages v2 update" into lmp-docs 
* commit 'db2ebca7ed10a4d5d943e414a35d4734b9987e91':
  docs: note to install linux packages v2 update
 2015-02-25 23:17:23 +00:00
Rich Slogar
eedf6ad8ce Merge "docs: remove exploring sdk link" into lmp-docs 2015-02-25 23:12:37 +00:00
Rich Slogar
db2ebca7ed Merge "docs: note to install linux packages v2 update" into lmp-docs 2015-02-25 23:11:24 +00:00
Filip Gruszczynski
1e74b5d6b0 Merge "Burn in protection." into lmp-mr1-modular-dev 2015-02-25 21:31:53 +00:00
Filip Gruszczynski
d2e8640c2c Burn in protection. 
Bug: 19373758
Change-Id: I7242f73acadd21bdee03262b4205c8af0734fccb
 2015-02-25 12:22:49 -08:00
Griff Hazen
aeffc9cebd Merge "Always draw the circular emulator overlay with square dimensions" into lmp-mr1-modular-dev 2015-02-25 19:39:56 +00:00
Filip Gruszczynski
01dd0e8654 Merge "Force translucency from windowIsTranslucent on SwipeDismissLayout." into lmp-mr1-modular-dev 2015-02-25 18:40:20 +00:00
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
 2015-02-25 18:17:13 +00:00
Jim Miller
19847b07e8 am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 
* commit 'b46e48067fd03b63fa5f5191651ac2a5d009e226':
  Remove TrustAgent whitelisting API
 2015-02-25 18:09:54 +00:00
Jim Miller
b46e48067f Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev 2015-02-25 18:04:58 +00:00
Geoff Mendal
6715b9dda1 am bb463806: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'bb463806aa9a83d10cfff5f565eebd71d500ae4e':
  Import translations. DO NOT MERGE
 2015-02-25 15:47:38 +00:00
Geoff Mendal
bb463806aa Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 15:41:24 +00:00
Geoff Mendal
70228b3929 Import translations. DO NOT MERGE 
Change-Id: I4e5b922995cf7eff9c984735209e2fe073fb5d83
Auto-generated-cl: translation import
 2015-02-25 07:39:28 -08:00
Geoff Mendal
28e4a357ce am c2cbbb89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c2cbbb89061d45dfe4ec84c3bf5304e76ac6ef64':
  Import translations. DO NOT MERGE
 2015-02-25 14:13:06 +00:00
Geoff Mendal
6d471d04b0 am a4f54454: (-s ours) Import translations. DO NOT MERGE 
* commit 'a4f544540ebe27aca15305dd8f5bda5b5d10283b':
  Import translations. DO NOT MERGE
 2015-02-25 14:13:00 +00:00
Geoff Mendal
c2cbbb8906 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-02-25 14:09:55 +00:00
Geoff Mendal
ecac2cb4d2 Import translations. DO NOT MERGE 
Change-Id: I84339eebbf7a8e2332e85a104b85ec740a25d6f1
Auto-generated-cl: translation import
 2015-02-25 06:08:29 -08:00