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

185346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
ada8590547 Fix AppCompat action bar theming. 
Use themed context to inflate the action bar when AppCompat is used.
Also fix minor issues exposed as a result.

 - Set project callback when LayoutInflater is created by
   LayoutInflater.from(context).
 - Remove duplication of code to get base context from context wrapper.

Bug: http://b.android.com/159711
Change-Id: I379ba2ba71c0ef547460987c3aa5db521c7de967
 2015-03-16 11:45:00 -07:00
Eric Laurent
aff57b7519 Merge "broadcast radio API" 2015-03-16 18:30:23 +00:00
Eric Laurent
d92e28255e Merge "broadcast radio JNI." 2015-03-16 18:29:22 +00:00
Dianne Hackborn
3d07c94c39 Add new voice request for picking from a list. 
Also add API for voice interaction service to control
whether the system should hold a wake lock while it is
working with an activity (and actually *do* hold a wake
lock while doing so, duh!).

And while in there, clean up the launching wake lock to
correctly give blame to the app that is launching.

Change-Id: I7cc4d566b80f59fe0a9ac51ae9bbb7188a01f433
 2015-03-16 11:29:12 -07:00
Andreas Gampe
872d191e61 am 8af305f1: am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '8af305f17ff0d4b84e5a71777de788e9a6ae2780':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:11:47 +00:00
Andreas Gampe
8af305f17f am 6878ee57: Merge "Revert "Frameworks/base: Fix a constructor"" 
* commit '6878ee57b438b063fcc09a19a04fba92e113c1d2':
  Revert "Frameworks/base: Fix a constructor"
 2015-03-16 18:03:17 +00:00
Selim Cinek
b60a658edb Merge "Added more anti-falsing logic" 2015-03-16 18:01:00 +00:00
Selim Cinek
547a06b50f Added more anti-falsing logic 
We now discard unlock attempts with multiple pointers.

Bug: 18544191
Change-Id: Id2e7bca0353b3f85aa193f6a5c793b93ca0776e3
 2015-03-16 10:53:08 -07:00
Andreas Gampe
6878ee57b4 Merge "Revert "Frameworks/base: Fix a constructor"" 2015-03-16 17:51:15 +00:00
Andreas Gampe
8c80efeaeb Revert "Frameworks/base: Fix a constructor" 
The constructor was public API, doh. Gotta do this differently.

This reverts commit 33c5b2a62f3e62382c41e24c6b527119978816a0.

Change-Id: Iadca87fe6a8866a8bd9d6f2a91578ec0d4c44691
 2015-03-16 17:51:01 +00:00
Andreas Gampe
08067d9829 am 8e176d39: am 007e207b: Merge "Frameworks/base: Fix null-pointer check" 
* commit '8e176d396d393af90ffe288d849e95ff40aa2b23':
  Frameworks/base: Fix null-pointer check
 2015-03-16 17:20:12 +00:00
Andreas Gampe
ebb8922a5b am 19279ec0: am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit '19279ec04845b2a47b90240c9d47bf8fb5ece464':
  Frameworks/base: Fix a constructor
 2015-03-16 17:13:26 +00:00
Andreas Gampe
8e176d396d am 007e207b: Merge "Frameworks/base: Fix null-pointer check" 
* commit '007e207bdeda3f0143eba8f52db3e72bf7487efb':
  Frameworks/base: Fix null-pointer check
 2015-03-16 17:12:57 +00:00
Andreas Gampe
19279ec048 am d61cbf9a: Merge "Frameworks/base: Fix a constructor" 
* commit 'd61cbf9a08733b45a6aecafffffa60da269a3e1e':
  Frameworks/base: Fix a constructor
 2015-03-16 17:03:02 +00:00
Andreas Gampe
007e207bde Merge "Frameworks/base: Fix null-pointer check" 2015-03-16 16:59:14 +00:00
Andreas Gampe
d61cbf9a08 Merge "Frameworks/base: Fix a constructor" 2015-03-16 16:51:01 +00:00
Robert Greenwalt
88dadfaa3b am 7cff91ea: am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" 
* commit '7cff91ea67f89ca963a822daa1b68674bfc0e587':
  Frameworks/base: Fix a hashCode implementation
 2015-03-16 16:48:46 +00:00
Andreas Gampe
1109006158 resolved conflicts for merge of 038b8462 to master 
Change-Id: I394b152c3cfe8368e87fc4bc57566b410c96b554
 2015-03-16 09:45:34 -07:00
Alan Viverette
3808227615 Add single-arg TextView.setTextAppearance, deprecate two-arg method 
The text appearance should always be inflated against the TextView's
original inflation context.

Change-Id: Id9fd219d83bbe76e19b4d200a37ef4240665bfcd
 2015-03-16 09:41:30 -07:00
Ronghua Wu
0e22acb635 Merge "media: add MediaFormat.KEY_PRIORITY." 2015-03-16 16:38:25 +00:00
Robert Greenwalt
7cff91ea67 am 079cfa64: Merge "Frameworks/base: Fix a hashCode implementation" 
* commit '079cfa64ec827e80d3173e2043218866f1b36146':
  Frameworks/base: Fix a hashCode implementation
 2015-03-16 16:29:52 +00:00
Robert Greenwalt
079cfa64ec Merge "Frameworks/base: Fix a hashCode implementation" 2015-03-16 16:17:51 +00:00
Filip Gruszczynski
9779e128d6 Option for going home when going to sleep for devices without physical button. 
Bug: 19623388
Change-Id: Iec16f83c64646ded12ec97d4b540510b7f9dfd47
 2015-03-16 08:57:17 -07:00
Andreas Gampe
038b846284 am 5abcd06b: Merge "Frameworks/base: Fix always-false equals" 
* commit '5abcd06b1f673a2d59d1aba5f4b95fe741ace274':
  Frameworks/base: Fix always-false equals
 2015-03-16 15:43:37 +00:00
Mike Reed
def6ef85c5 Merge "use SkFilterQuality instead of SkPaint::FilterLevel" 2015-03-16 15:36:43 +00:00
Mike Reed
2a1ce8a4e5 use SkFilterQuality instead of SkPaint::FilterLevel 
Change-Id: I5d26869de746107b8a35a7a662236f993a824b0d
 2015-03-16 11:31:38 -04:00
Geoff Mendal
2c782e7cf8 Merge "Import translations. DO NOT MERGE" 2015-03-16 15:29:52 +00:00
Andreas Gampe
5abcd06b1f Merge "Frameworks/base: Fix always-false equals" 2015-03-16 15:28:53 +00:00
John Reck
2c528c2175 am 059ba981: am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '059ba9814bb07aeebd8bf697fc05ff833c63033b':
  Frameworks/base: Fix missing cast
 2015-03-16 15:16:17 +00:00
John Reck
059ba9814b am 386dcbdd: Merge "Frameworks/base: Fix missing cast" 
* commit '386dcbddf5c166f98209b78389e79d49ab3a8222':
  Frameworks/base: Fix missing cast
 2015-03-16 15:09:04 +00:00
John Reck
386dcbddf5 Merge "Frameworks/base: Fix missing cast" 2015-03-16 14:56:52 +00:00
Geoff Mendal
d64e48d850 Import translations. DO NOT MERGE 
Change-Id: Ib0dfcbb5ffa71a512164af5435a0784279bde292
Auto-generated-cl: translation import
 2015-03-16 07:43:37 -07:00
Robin Lee
ee1f24ff29 Merge "Recognise insecure encryption with a new constant" 2015-03-16 14:32:12 +00:00
Geoff Mendal
592f880895 Merge "Import translations. DO NOT MERGE" 2015-03-16 14:02:00 +00:00
Geoff Mendal
70c1675036 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:48:55 +00:00
Geoff Mendal
47c6843cb5 Import translations. DO NOT MERGE 
Change-Id: I5974745b1b216beda4ebed9da78b0b2c0b4d4efe
Auto-generated-cl: translation import
 2015-03-16 06:37:26 -07:00
Geoff Mendal
717bbf53f8 Import translations. DO NOT MERGE 
Change-Id: Id941e0ba453bd6b39cf654f0a20a68219584bd2a
Auto-generated-cl: translation import
 2015-03-16 06:25:49 -07:00
Geoff Mendal
a41378ac27 am c64f5ca0: (-s ours) am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c64f5ca02b16ebece40c21f401f75c7ace8178ac':
  Import translations. DO NOT MERGE
 2015-03-16 13:22:28 +00:00
Geoff Mendal
19f65359b9 am 4777b612: (-s ours) am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '4777b612e07f57afbcf362b78b0b6e1e5e77e8bb':
  Import translations. DO NOT MERGE
 2015-03-16 13:22:20 +00:00
Geoff Mendal
ef096473c8 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:20:50 +00:00
Geoff Mendal
8e39914610 Import translations. DO NOT MERGE 
Change-Id: I47e03bc7c00c7cb751c063324027e7846b067eaf
Auto-generated-cl: translation import
 2015-03-16 06:19:39 -07:00
Geoff Mendal
c64f5ca02b am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '0134869b5c81771ae3e3251fa42ac6c478e62f5a':
  Import translations. DO NOT MERGE
 2015-03-16 13:14:52 +00:00
Geoff Mendal
4777b612e0 am 3437d9e7: (-s ours) am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '3437d9e716e477d407dfc13cc797500e6421e464':
  Import translations. DO NOT MERGE
 2015-03-16 13:14:47 +00:00
Geoff Mendal
844c6a5194 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:10:09 +00:00
Geoff Mendal
c890637d82 Merge "Import translations. DO NOT MERGE" 2015-03-16 13:08:43 +00:00
Geoff Mendal
0134869b5c am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '74c66d10a7b2237f8aaf8c10675a10b9347860f4':
  Import translations. DO NOT MERGE
 2015-03-16 13:07:29 +00:00
Geoff Mendal
3437d9e716 am 57d39a3d: (-s ours) Import translations. DO NOT MERGE 
* commit '57d39a3d70cf820e830c351d9d7fbb5d16d42ecf':
  Import translations. DO NOT MERGE
 2015-03-16 13:07:26 +00:00
Geoff Mendal
74c66d10a7 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2015-03-16 13:05:43 +00:00
Geoff Mendal
c84863bc2e am 3fb3408b: (-s ours) am eb1aec7f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit '3fb3408b2ecdd601e93a2675ef0f81b15334ed0a':
  Import translations. DO NOT MERGE
 2015-03-16 13:04:07 +00:00
Geoff Mendal
cb5ebc25fe am e0c0f6c2: (-s ours) am 9a036229: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev 
* commit 'e0c0f6c2a8eae1004227f4d0a3d5f77730b29ff7':
  Import translations. DO NOT MERGE
 2015-03-16 13:03:56 +00:00