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

183378 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Edward Cunningham
86398cd9eb Merge "Fix UsageStats to report correct endTime from XML" 2015-02-27 00:25:19 +00: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
5414d155e5 am 40aa30b3: am 654a473b: am 249f2c3a: am 025f0938: Merge "Changing usage of carrier name field of SubInfoRecord" into lmp-mr1-dev 
* commit '40aa30b3747fc62b14832682d2cc3117edd93b80':
  Changing usage of carrier name field of SubInfoRecord
 2015-02-26 23:47:36 +00:00
Jason Monk
bd61b2a1fd am 58ae213c: am 0ac63669: am 057fd382: am 9df42df2: Merge "Keyguard: Use plmn/spn broadcast when no SIMs" into lmp-mr1-dev 
* commit '58ae213c3df42d9aa7501071a03460ff69ba44e2':
  Keyguard: Use plmn/spn broadcast when no SIMs
 2015-02-26 23:47:27 +00:00
Andrew Lee
c2f30a9df0 Merge "Add intent for call accessibility settings." 2015-02-26 23:38:37 +00: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
Edward Cunningham
690f78adf1 Fix UsageStats to report correct endTime from XML 
Bug: 19529542
Change-Id: Iacb1a245a40c6b88ae15740797217f59d5fca1e6
 2015-02-27 00:33:30 +01:00
Andrew Lee
873cfbf185 Add intent for call accessibility settings. 
Preparatory work for adding a new Accessibility settigns activity
in Telephony, which we will need an intent to be able to launch.

Bug: 19372734
Change-Id: Ibf72ffe21da3ba2819eb165dda9bde30204bab68
 2015-02-26 15:32:16 -08: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
Geoff Mendal
e70de67381 am 11ea0d6d: (-s ours) am 70eb8077: (-s ours) Import translations. DO NOT MERGE 
* commit '11ea0d6db68932254bf5a1e84adbc2255764b8e1':
  Import translations. DO NOT MERGE
 2015-02-26 23:26:00 +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
P.Y. Laligand
a046faaf38 Always check for null when peeking at the InputMethodManager. 
Change-Id: I8c0d66c63b617c58be3d5fcf3dfb0c55aa287dcb
 2015-02-26 23:03:46 +00: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
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
Mike Lockwood
464c655871 Move ALSA utilities to com.android.internal.alsa package 
Change-Id: Icbd45ec97a942e44e60f8d4ba0bb58c97f85b55f
 2015-02-26 13:50:08 -08:00
Alan Viverette
39df5fea22 Merge "Vertically center seek bar track and thumb when maxHeight is set" 2015-02-26 21:48:49 +00:00
Alan Viverette
3afd8b0d1a Vertically center seek bar track and thumb when maxHeight is set 
Also removes unused tinting method from ProgressBar.

Bug: 19480491
Change-Id: I9faeff51870088c2b5ba7386dfbfd7c4898c5564
 2015-02-26 13:36:28 -08:00
Ruben Brunk
248ed8282b Merge "camera2: Fix local variable names in rgb->ycbcr conversion." 2015-02-26 21:13:53 +00:00
John Spurlock
af5d44e441 Merge "VolumePrototypes: Better handle removals/upgrades." 2015-02-26 20:54:14 +00:00
Alan Viverette
5bc5d7c45f Merge "Propagate original Resources to DrawableContainer if no override set" 2015-02-26 20:53:39 +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
Alan Viverette
102a6bff77 Propagate original Resources to DrawableContainer if no override set 
Also fixes a double-add in ASLD.

Bug: 19498949
Change-Id: I9e7e0a0fb22a23518c80c1b099f8da0e0c1f53d8
 2015-02-26 12:52:47 -08:00
John Spurlock
c72d4cbc81 VolumePrototypes: Better handle removals/upgrades. 
- Repoke the setting at startup to ensure we have the latest UID.
 - Automatically restore the default volume UI when the current
   vcs is uninstalled.

Bug: 19260237
Change-Id: Ie1fe356fea08392278340b54230ab429d14e1583
 2015-02-26 15:51:11 -05:00
James Cook
14a92fe75d Merge "Revert "Add basic support for Ctrl-Z to editable TextViews"" 2015-02-26 20:34:16 +00:00