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

212356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
e264f9a51e am 5a1234fa: am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5a1234fabf73224d107ce0715682728b35357203':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 19:01:16 +00:00
Ben Wagner
283e907af4 Merge "Use 'new' instead of 'SkNEW'." 2015-08-19 19:01:04 +00:00
Dianne Hackborn
5a1234fabf am 81b4616f: am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '81b4616f9f8ecf1be2db999acbd8504c33201eb9':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:53:24 +00:00
Dianne Hackborn
81b4616f9f am aa8c876e: am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit 'aa8c876e1dd159c37fa00d7ed6f3fd228c74e30b':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:45:41 +00:00
Dianne Hackborn
aa8c876e1d am 5c577bab: am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '5c577bab3b4cd9bf74a09368be5d73aed627f6a5':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:39:56 +00:00
Xiaohui Chen
98404fdc0b Clean up USER_OWNER reference. 
Bug: 19913735
Change-Id: I441672b360fa0fff5453f72c88f9577b5cc8eecf
 2015-08-19 18:34:46 +00:00
Dianne Hackborn
5c577bab3b am 29cd8808: Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 
* commit '29cd880890825ce15a1b2da977bcb1796db6f4e3':
  Fix issue #23326715: Clarify --checkin/-c options in batterystats
 2015-08-19 18:31:20 +00:00
Alan Viverette
f52b66588f Merge "Ensure layout resolution occurs when relative rules are removed" 2015-08-19 18:30:27 +00:00
Dianne Hackborn
29cd880890 Merge "Fix issue #23326715: Clarify --checkin/-c options in batterystats" into mnc-dev 2015-08-19 18:25:29 +00:00
Elliott Hughes
d52aa80705 am 9a6ec586: Move aapt2 off HAVE_MS_C_RUNTIME. 
* commit '9a6ec5862c8a3ef20ac46728da75d62c4c88bae4':
  Move aapt2 off HAVE_MS_C_RUNTIME.
 2015-08-19 18:04:35 +00:00
Elliott Hughes
9a6ec5862c Move aapt2 off HAVE_MS_C_RUNTIME. 
Change-Id: Iea75251bde4d8795213ea235db446065e1fea7b5
(cherry picked from commit c301ab8d6ab553ee0e641558f9fbe2f974a70e52)
 2015-08-19 17:56:44 +00:00
Derek Sollenberger
45f250aa1f Remove accidentally added old makefile 
Change-Id: Id3966f1458c14b659b1b35437e6620fb8306aa83
 2015-08-19 13:56:08 -04:00
Alan Viverette
6bc3cab958 Merge "Allow ExploreByTouchHelper client to populate node/event for host" 2015-08-19 17:39:18 +00:00
Xiaohui Chen
594f208d66 Clean up USER_OWNER reference in pm/Settings 
Bug: 19913735
Change-Id: I538ed443b945e9cbb731520450bf5ef39882ae37
 2015-08-19 17:34:15 +00:00
Ben Wagner
d1cbc16089 Use 'new' instead of 'SkNEW'. 
There isn't any good reason for Android code to be using SkNEW,
and in some places it is potentially an issue. Also, SkNEW really
should be considered private to Skia at this point.

Change-Id: I35c675bd2c45b7a65c526508c202a30e30859491
 2015-08-19 13:04:36 -04:00
Chong Zhang
530ea0dfb5 Merge "Initialize visible to false to reflect the real visibility state" 2015-08-19 17:03:14 +00:00
Geoff Mendal
c5a9c453fa am 35090b32: (-s ours) am cdeeecb0: (-s ours) am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '35090b322f2f198b641adb5a5af6e766b90eb1f2':
  Import translations. DO NOT MERGE
 2015-08-19 16:35:56 +00:00
Zhentao Sun
24b7f0fb47 am 00447eeb: am 4caf6b97: am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '00447eeb99d93b135bd5ef4f7c1f6ca90000e6f7':
  Launched camera in the correct user.
 2015-08-19 16:35:49 +00:00
Geoff Mendal
35090b322f am cdeeecb0: (-s ours) am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'cdeeecb05607f302a306929c806dece0332eb182':
  Import translations. DO NOT MERGE
 2015-08-19 16:30:11 +00:00
Zhentao Sun
00447eeb99 am 4caf6b97: am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '4caf6b9784d0102844f74ea65da75affc0750896':
  Launched camera in the correct user.
 2015-08-19 16:30:05 +00:00
Geoff Mendal
cdeeecb056 am 37aa01a3: (-s ours) am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '37aa01a34da149fa893e731032fd0aee32321396':
  Import translations. DO NOT MERGE
 2015-08-19 16:24:41 +00:00
Zhentao Sun
4caf6b9784 am 880ef585: am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit '880ef585ab1887bd7f95a1a668d11057d86dd964':
  Launched camera in the correct user.
 2015-08-19 16:24:35 +00:00
Geoff Mendal
37aa01a34d am 399237f8: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '399237f825863f8d52336778debde8c54313cca2':
  Import translations. DO NOT MERGE
 2015-08-19 16:18:11 +00:00
Zhentao Sun
880ef585ab am f2f01148: Merge "Launched camera in the correct user." into mnc-dr-dev 
* commit 'f2f0114848e5fb729bf5943a70142520f66daa4c':
  Launched camera in the correct user.
 2015-08-19 16:18:06 +00:00
Geoff Mendal
399237f825 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 16:15:00 +00:00
Geoff Mendal
b3f2d50cce Merge "Import translations. DO NOT MERGE" 2015-08-19 16:14:43 +00:00
Zhentao Sun
f2f0114848 Merge "Launched camera in the correct user." into mnc-dr-dev 2015-08-19 16:12:25 +00:00
Roshan Pius
a52c5e2193 Add a new carrier config for DTMF tone gap in CDMA. 
Adding a new carrier config key to specify the gap between the DTMF
tones sent out to the network. Setting it to 100ms by default.
This is based on a similar set of changes for IMS calls: ag/747865.

BUG: 19118840
Change-Id: Ifb64fe406509fe7c401ad1c4b4e906d6643e327b
 2015-08-19 16:01:25 +00:00
Geoff Mendal
79fd5c4559 Import translations. DO NOT MERGE 
Change-Id: Ibf82892f48ab6cc0b5aa3eb2460859afa8e44332
Auto-generated-cl: translation import
 2015-08-19 11:00:52 -05:00
Geoff Mendal
ef239f6805 Import translations. DO NOT MERGE 
Change-Id: Idcb180e269b44fa1d28edeedf4a67b55a840c2ea
Auto-generated-cl: translation import
 2015-08-19 10:53:39 -05:00
Ben Wagner
c091e218af Merge "Remove use of SkAutoSTMalloc from Android." 2015-08-19 15:38:14 +00:00
Ben Wagner
6bbf68d05a Remove use of SkAutoSTMalloc from Android. 
Skia desires to make SkTemplates.h private since the classes there
are designed only for internal use.

Change-Id: I1e05e54de9eb68e50ccd6a691889fecf34bc9cea
 2015-08-19 11:26:06 -04:00
Alan Viverette
0dcb9e81e2 Merge "Save and restore accessibility focus using decor view" 2015-08-19 14:37:03 +00:00
Geoff Mendal
f1ab38c847 am 47b04832: (-s ours) am 5b9e3290: (-s ours) am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '47b04832a58ab1c52582a792c45b03d578220733':
  Import translations. DO NOT MERGE
 2015-08-19 14:32:39 +00:00
Geoff Mendal
47b04832a5 am 5b9e3290: (-s ours) am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5b9e3290062e4065aeb45085ea908b81c1fbe909':
  Import translations. DO NOT MERGE
 2015-08-19 14:27:32 +00:00
Geoff Mendal
5b9e329006 am 257a9a87: (-s ours) am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '257a9a87d49a6bda05e9d18940152213fd156f0f':
  Import translations. DO NOT MERGE
 2015-08-19 14:20:53 +00:00
Geoff Mendal
80b9f01d62 am da1404d0: (-s ours) am 2c6fe6c1: (-s ours) am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit 'da1404d02d22dde2cd4e79eaed46a48e40eefe29':
  Import translations. DO NOT MERGE
 2015-08-19 14:19:28 +00:00
Geoff Mendal
da1404d02d am 2c6fe6c1: (-s ours) am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit '2c6fe6c1ca362411f42afc22bb4c08082d03b636':
  Import translations. DO NOT MERGE
 2015-08-19 14:15:34 +00:00
Geoff Mendal
257a9a87d4 am 81d99d47: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '81d99d47831153cfa71afaa1831b7a1e025e3069':
  Import translations. DO NOT MERGE
 2015-08-19 14:15:26 +00:00
Geoff Mendal
2c6fe6c1ca am 0c6eba36: (-s ours) am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit '0c6eba366e77daeedecdffdd4d1dcf9406d39117':
  Import translations. DO NOT MERGE
 2015-08-19 14:07:53 +00:00
Alan Viverette
4cbd3ac740 Save and restore accessibility focus using decor view 
Also avoids potential NPE when decor view is null or has no view root.

Bug: 23316836
Change-Id: Iccf75ddc0e4c769a234f5b80bc0707631c2719a2
 2015-08-19 10:07:29 -04:00
Geoff Mendal
81d99d4783 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-19 14:07:13 +00:00
Geoff Mendal
31a96b3716 Import translations. DO NOT MERGE 
Change-Id: I13d19cb68c1b7b7880e2168e621c377c2b750b1b
Auto-generated-cl: translation import
 2015-08-19 07:02:46 -07:00
Geoff Mendal
0c6eba366e am c2e81a0c: (-s ours) Import translations. DO NOT MERGE 
* commit 'c2e81a0c2d95c0eee54975cb62b6c535171d74ee':
  Import translations. DO NOT MERGE
 2015-08-19 14:02:25 +00:00
Ben Kwa
0fad22712c Merge "Fix XML early-outs." 2015-08-19 13:59:48 +00:00
Geoff Mendal
c2e81a0c2d Import translations. DO NOT MERGE 
Change-Id: Ifd3cfe65e9a82e21d6a1611368dcbe9d6dfee829
Auto-generated-cl: translation import
 2015-08-19 06:53:44 -07:00
Derek Sollenberger
55f4445013 Merge "Add ninePatch support to Canvas.h" 2015-08-19 13:10:40 +00:00
Geoff Mendal
14af6c50c3 Merge "Import translations. DO NOT MERGE" 2015-08-19 12:53:52 +00:00
Geoff Mendal
9ad926d011 Import translations. DO NOT MERGE 
Change-Id: I94432e596e46517d184b195e388af9ace8ac82dc
Auto-generated-cl: translation import
 2015-08-19 05:50:29 -07:00
Geoff Mendal
caed5d8634 Merge "Import translations. DO NOT MERGE" 2015-08-19 12:34:40 +00:00