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

174959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
97f758184f am f456898c: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'f456898cb9e04f19817dfe66eb829130eb3f97fc':
  Import translations. DO NOT MERGE
 2015-02-27 00:44:05 +00:00
Geoff Mendal
9dbedf7bea am ee13d90c: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'ee13d90c18392524d7d9f83216573e334095fdb1':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:57 +00:00
Geoff Mendal
037250261f am 791dcb95: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '791dcb95975fc060cbc9c24d31d169bac74364b0':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:51 +00:00
Geoff Mendal
d66580f340 am 5277e144: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '5277e14417e7fcdc02d2bf8b5b14892c08354653':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:46 +00:00
Geoff Mendal
5d586466b2 am d0625ced: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'd0625cedca001cad32767cb834e71508d6013e68':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:40 +00:00
Geoff Mendal
6de722ad64 am 46c5d0b1: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit '46c5d0b157de2fb9249a1ce0e8695bb985cdb093':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:34 +00:00
Geoff Mendal
37cf19e4e7 am f24cf437: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'f24cf43727039436dd73854da1ebc852275760fd':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:28 +00:00
Geoff Mendal
f8b7b16c64 am d307a122: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master 
* commit 'd307a122aef6f06cd7983f2d9384be09f9d89eea':
  Import translations. DO NOT MERGE
 2015-02-27 00:43:22 +00:00
Geoff Mendal
50b04190c9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:32:49 +00:00
Geoff Mendal
10b62bff6f Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:32:30 +00:00
Geoff Mendal
3fdb4cc75e Import translations. DO NOT MERGE 
Change-Id: Id83bfa16ba15aaa1f901547117c114490f4035fa
Auto-generated-cl: translation import
 2015-02-26 16:28:53 -08:00
Geoff Mendal
b17653a6a8 Import translations. DO NOT MERGE 
Change-Id: I030ed9725292854138dabb8c6d9b67e5a7ef0aa6
Auto-generated-cl: translation import
 2015-02-26 16:26:53 -08:00
Geoff Mendal
428472a1e4 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:20:51 +00:00
Geoff Mendal
f456898cb9 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:20:27 +00:00
Geoff Mendal
db14d28944 Import translations. DO NOT MERGE 
Change-Id: I12dd7931cbe95c7dfb4c9c468e19a25bcd780324
Auto-generated-cl: translation import
 2015-02-26 16:18:09 -08:00
Geoff Mendal
c4f503fd77 Import translations. DO NOT MERGE 
Change-Id: I69d645539c36b3915e43eaa0d7b190bc6d559840
Auto-generated-cl: translation import
 2015-02-26 16:16:10 -08:00
Geoff Mendal
ee13d90c18 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:15:46 +00:00
Geoff Mendal
61379caf15 Import translations. DO NOT MERGE 
Change-Id: Idb623a7515bd47274efcd49cc7f9182296213202
Auto-generated-cl: translation import
 2015-02-26 16:14:09 -08:00
Geoff Mendal
791dcb9597 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:13:08 +00:00
Geoff Mendal
5277e14417 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:12:54 +00:00
Geoff Mendal
d0625cedca Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:12:32 +00:00
Geoff Mendal
46c5d0b157 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:11:53 +00:00
Geoff Mendal
f24cf43727 Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:11:01 +00:00
Geoff Mendal
d307a122ae Merge "Import translations. DO NOT MERGE" into stage-aosp-master 2015-02-27 00:10:11 +00:00
Geoff Mendal
40f6a22b6e Import translations. DO NOT MERGE 
Change-Id: I1a8de3ff34e0661702038b8f006f920c5ca3ba27
Auto-generated-cl: translation import
 2015-02-26 16:08:40 -08:00
Geoff Mendal
57d73dbd34 Import translations. DO NOT MERGE 
Change-Id: I333284d756efb9b6f22577b047e95fde5a27ff71
Auto-generated-cl: translation import
 2015-02-26 16:04:59 -08:00
Geoff Mendal
f74ee77486 Import translations. DO NOT MERGE 
Change-Id: I59953f8c826f975cd602346307300d124b884a1c
Auto-generated-cl: translation import
 2015-02-26 16:02:59 -08:00
Geoff Mendal
5e8e930aec Import translations. DO NOT MERGE 
Change-Id: I893f1ac696506a8a96a1e447b3851ed3bf51c31c
Auto-generated-cl: translation import
 2015-02-26 15:59:12 -08:00
Geoff Mendal
413c7a9cca Import translations. DO NOT MERGE 
Change-Id: I5fb0da094aa109b970f333aea78b0366f2f5eb2c
Auto-generated-cl: translation import
 2015-02-26 15:57:08 -08:00
Geoff Mendal
1a61491215 Import translations. DO NOT MERGE 
Change-Id: I654168fbbcd5fe9371390f2d673561ce1e5c9c89
Auto-generated-cl: translation import
 2015-02-26 15:54:57 -08:00
Sanket Padawe
40aa30b374 am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 
* commit '654a473bfea9a4197868ae81091812505da8ca87':
  Changing usage of carrier name field of SubInfoRecord
 2015-02-26 23:37:55 +00:00
Jason Monk
58ae213c3d am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '0ac63669b1a3da456fde5c8df61b652eb090a407':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:31:35 +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
Geoff Mendal
11ea0d6db6 am 70eb8077: (-s ours) Import translations. DO NOT MERGE 
* commit '70eb8077a265283b43d6f97b2553e142974c9204':
  Import translations. DO NOT MERGE
 2015-02-26 23:14:43 +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
Deepanshu Gupta
1a10ca7e52 Correct PorterDuff filters. 
1. Remove unused modes - makes the class more manageable, and missing
modes can always be readded from the git history.
2. Reuse the existing BlendComposite instances where possible.
3. Fix incorrect alpha computation for multiply mode.
4. Change the alpha computation for all blend modes to compenstate for
the fact that the color filter image that we create extends beyond the
image it is inteded to be applied to.

Change-Id: Iedebf289a23325ee4c6d406dcad46a9edb1855c7
 2015-02-26 15:02:16 -08:00
Mark Salyzyn
ca50cd2114 jni: Add paranoia regarding android_logger_list_read 
Change-Id: Ic52be201ec7efaef6a385aaf8ea523554aa06f22
 2015-02-26 14:49:17 -08: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
Deepanshu Gupta
d68448a601 Fix codestyle for switch statements. 
Fix intellij's codestyle settings for indenting switch/case statement.

Change-Id: I905231538fef0fcd7fa4e742f937b8da34f2e30f
 2015-02-26 14:32:30 -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
Geoff Mendal
70eb8077a2 Import translations. DO NOT MERGE 
Change-Id: Ic79aace8bc91318a1d637c834ae3176ee221bead
Auto-generated-cl: translation import
 2015-02-26 12:53:29 -08:00
Rich Slogar
0aae791d5a am b8b1e076: am efda11e7: am 328dc428: am 6bb23d62: am 29936684: am 0a504745: Merge "docs: 9patch tool update" into lmp-docs 
* commit 'b8b1e07668f684b734758fe2084496466d671339':
  docs: 9patch tool update
 2015-02-26 18:44:39 +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