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

211499 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
3a289a2f97 am 29e963af: (-s ours) am b689d776: (-s ours) am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '29e963afbcca60cb3364d1350d7667e6c2a61789':
  Import translations. DO NOT MERGE
 2015-08-12 18:27:40 +00:00
Adrian Roos
afdfc2c04d am 192ca56d: am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit '192ca56d7a0c8a1a776bd8f9539c49f4b8ce3372':
  Prevent overlap of color views in landscape
 2015-08-12 18:26:49 +00:00
Ronghua Wu
81d6b35135 Merge "media: ignore null InputStream" 2015-08-12 18:21:44 +00:00
Jason Monk
fc10c98633 am 36ea805f: am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '36ea805f1e55fcf96e341668a200668939b03976':
  Fix tuner for secondary users
 2015-08-12 18:18:27 +00:00
Geoff Mendal
29e963afbc am b689d776: (-s ours) am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'b689d776bb5c3b8cc8778813db4b308acd9a7f61':
  Import translations. DO NOT MERGE
 2015-08-12 18:18:21 +00:00
Mike Dodd
4c197d2787 am 2b71aa76: am ae878c85: am 6379ddbe: am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '2b71aa764bb5d181198c8e6a9aaeefe7c5d2f175':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-12 18:17:13 +00:00
Todd Kennedy
2fee91c568 am f6f11daa: am f5107e38: am d43f4d92: am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev 
* commit 'f6f11daafe9884b93218487d5af29130e97107e9':
  Promote system app permissions
 2015-08-12 18:17:06 +00:00
Michael Wright
b28285f8a8 am 4ce7460f: am 8f527a82: am d3b7314e: am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev 
* commit '4ce7460f4ef122c6458aa404201b94dc04bb6069':
  Log last filtered sensor timestamp.
 2015-08-12 18:16:59 +00:00
Adrian Roos
192ca56d7a am c0a4883d: Merge "Prevent overlap of color views in landscape" into mnc-dev 
* commit 'c0a4883d58554c84d10911da20f43be149b47c53':
  Prevent overlap of color views in landscape
 2015-08-12 18:16:32 +00:00
Alan Viverette
eec786608b Merge "Remove incorrect ColorInt annotations" 2015-08-12 18:16:23 +00:00
Mike Dodd
2b71aa764b am ae878c85: am 6379ddbe: am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit 'ae878c851f01848ccae9ddc81d613123df12651e':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-12 18:09:59 +00:00
Todd Kennedy
f6f11daafe am f5107e38: am d43f4d92: am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev 
* commit 'f5107e38bb27b7840d926821b866107b4ebdc737':
  Promote system app permissions
 2015-08-12 18:09:52 +00:00
Michael Wright
4ce7460f4e am 8f527a82: am d3b7314e: am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev 
* commit '8f527a82a34d3f8c3bd1969a3787270d21b54de1':
  Log last filtered sensor timestamp.
 2015-08-12 18:09:47 +00:00
Jason Monk
36ea805f1e am 670b8b59: am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '670b8b597131c35cbd742d94ee1d22ace5d06e51':
  Fix tuner for secondary users
 2015-08-12 18:09:24 +00:00
Geoff Mendal
b689d776bb am 9e47ba6e: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '9e47ba6e06ad382361f166f26f4da5268f11f4aa':
  Import translations. DO NOT MERGE
 2015-08-12 18:09:21 +00:00
Adrian Roos
c0a4883d58 Merge "Prevent overlap of color views in landscape" into mnc-dev 2015-08-12 18:06:42 +00:00
Jason Monk
670b8b5971 am 0c762957: Merge "Fix tuner for secondary users" into mnc-dev 
* commit '0c7629579184f85d36a4854e7c6f5b81f5b7299e':
  Fix tuner for secondary users
 2015-08-12 18:06:18 +00:00
Geoff Mendal
9e47ba6e06 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-08-12 18:03:39 +00:00
Geoff Mendal
c439edced3 Merge "Import translations. DO NOT MERGE" 2015-08-12 18:03:27 +00:00
Mike Dodd
ae878c851f am 6379ddbe: am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '6379ddbe5a4b3d495d5cab3ff22c61c16ff2b4f7':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-12 18:00:25 +00:00
Todd Kennedy
f5107e38bb am d43f4d92: am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev 
* commit 'd43f4d924b28c98c8d82f31b58e4e52cfc2d0262':
  Promote system app permissions
 2015-08-12 18:00:19 +00:00
Michael Wright
8f527a82a3 am d3b7314e: am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev 
* commit 'd3b7314ee255982f9408b5cb4cbc87f70b468e53':
  Log last filtered sensor timestamp.
 2015-08-12 18:00:12 +00:00
Jason Monk
0c76295791 Merge "Fix tuner for secondary users" into mnc-dev 2015-08-12 17:59:22 +00:00
Roozbeh Pournader
f995b852a6 Merge "Make FormatBytes() not use decimal points for size <= 900." 2015-08-12 17:54:47 +00:00
Alan Viverette
58204be5e6 Remove incorrect ColorInt annotations 
These methods return [0,255], not a packed color.

Change-Id: I5bad2948a6bc7188d9521098fc030c8905714c48
 2015-08-12 13:53:03 -04:00
Geoff Mendal
f23b2966e1 Import translations. DO NOT MERGE 
Change-Id: I4fc5ccb494ee7b446489bcee8ecd733790c92779
Auto-generated-cl: translation import
 2015-08-12 10:51:55 -07:00
Mike Dodd
6379ddbe5a am 3f5d76dd: am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '3f5d76dd5ee4e73d69a6e6ce0d5f5c70c05f789f':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-12 17:51:17 +00:00
Todd Kennedy
d43f4d924b am 8af3406a: am 24e4d48f: Merge "Promote system app permissions" into mnc-dev 
* commit '8af3406a4558e81394ac18ea0d0dcd728833f483':
  Promote system app permissions
 2015-08-12 17:51:14 +00:00
Michael Wright
d3b7314ee2 am d9c906e7: am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev 
* commit 'd9c906e73160afef63fb1db66b5482f483ea05e0':
  Log last filtered sensor timestamp.
 2015-08-12 17:51:09 +00:00
Xiaohui Chen
c91edfafac Merge "Clean up USER_OWNER in ServiceWatcher" 2015-08-12 17:46:03 +00:00
Geoff Mendal
4ff636dd60 Import translations. DO NOT MERGE 
Change-Id: Id549b6f4dcaaf60ae283ef6c5068426b4e876f89
Auto-generated-cl: translation import
 2015-08-12 10:44:53 -07:00
Mike Dodd
3f5d76dd5e am 7f2f96cc: Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 
* commit '7f2f96cce3f1663e3c1dccdde2c0f196b2b16e72':
  Set default SMS/MMS app to com.android.messaging (new AOSP app).
 2015-08-12 17:43:55 +00:00
Todd Kennedy
8af3406a45 am 24e4d48f: Merge "Promote system app permissions" into mnc-dev 
* commit '24e4d48f56a6fca6974c5670b88a7b4da2180331':
  Promote system app permissions
 2015-08-12 17:43:52 +00:00
Michael Wright
d9c906e731 am e20493ea: Merge "Log last filtered sensor timestamp." into mnc-dev 
* commit 'e20493ea5affdc417db1fc3fbb527781d6e51612':
  Log last filtered sensor timestamp.
 2015-08-12 17:43:48 +00:00
Alan Viverette
7d3cc62df8 Merge "Remove framework-private Color.HSBtoColor API" 2015-08-12 17:19:08 +00:00
Alan Viverette
7873b6da5a Remove framework-private Color.HSBtoColor API 
Bug: 22815971
Change-Id: Ic4cb43e78e0a7a6fc234865759754d106cef11dc
 2015-08-12 13:12:34 -04:00
Mike Dodd
7f2f96cce3 Merge "Set default SMS/MMS app to com.android.messaging (new AOSP app)." into mnc-dev 2015-08-12 17:01:25 +00:00
Todd Kennedy
47c8244e4e Merge "Override package storage constraint" 2015-08-12 16:53:32 +00:00
Todd Kennedy
24e4d48f56 Merge "Promote system app permissions" into mnc-dev 2015-08-12 16:51:13 +00:00
Michael Wright
e20493ea5a Merge "Log last filtered sensor timestamp." into mnc-dev 2015-08-12 16:32:11 +00:00
Michael Wright
6eabf57e58 Log last filtered sensor timestamp. 
Bug: 22870354
Change-Id: Ib4efaa0f05bec81856c939c5c640eceff98d88ed
 2015-08-12 16:53:24 +01:00
Alan Viverette
da6b2f6ccb Add popup theme to AutoCompleteTextView, clean up constructor 
Bug: 22912507
Change-Id: I48d8b1ccae980847c743020d3f2a0d2eb6017e40
 2015-08-12 11:26:15 -04:00
Todd Kennedy
8b3e6b0df1 Promote system app permissions 
When upgrading from a pre-M version of Android, install permissions for
exisiting system are promoted to runtime permissions. This only happens
for apps that existed prior to the OTA. Other system apps targeting M
are not automatically granted any permissions.

Bug: 22970710
Change-Id: I964ee3f93c66ea43fbb1be6b5ac6b09ddea3c385
 2015-08-12 08:26:15 -07:00
Alan Viverette
cd703b6235 Clean up Spinner constructor docs, final class vars 
Change-Id: I8c7eef08718474bbdebe8eceaf34ebac4007d945
 2015-08-12 11:14:33 -04:00
Alan Viverette
2d2ba516e6 Merge "Pass handling context when invoking resolved click handler" 2015-08-12 12:40:48 +00:00
Narayan Kamath
ae61c26534 am 0d2e3d3e: am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit '0d2e3d3ea3cd1bd0f77b3fdd8da6b17261cdd799':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 11:02:48 +00:00
Narayan Kamath
0d2e3d3ea3 am c42acbdb: am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'c42acbdb65d89b1e5fc1cafde4cbe0996c104f7a':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:55:33 +00:00
Narayan Kamath
c42acbdb65 am 088c4155: am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit '088c4155b42081e929ce07507941a197ed0a9550':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:49:49 +00:00
Narayan Kamath
088c4155b4 am 86b6d204: am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit '86b6d204a5321bf2874c2cbee3452e674605c21f':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:44:38 +00:00
Narayan Kamath
86b6d204a5 am bf88205b: Fall back to persist.sys.language/country if locale isn\'t set. 
* commit 'bf88205bef88f78ade5c6830e6203aa343387820':
  Fall back to persist.sys.language/country if locale isn't set.
 2015-08-12 10:39:13 +00:00