Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,122 Commits 3 Branches 0 Tags
9641feee025cfd669cd4730bb0609ba16aaffc2a
Commit Graph

160122 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
9641feee02 am 38499cf8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '38499cf8a129b15fd526d45aad96657d96235abf':
  Import translations. DO NOT MERGE
 2014-11-26 15:13:40 +00:00
Geoff Mendal
cb3a6f89f1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-26 15:10:41 +00:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00:00
Geoff Mendal
014aba26ed Import translations. DO NOT MERGE 
Change-Id: I1c487be2ef6c76224feae69f285a18ef0eda4840
Auto-generated-cl: translation import
 2014-11-26 07:03:09 -08:00
Geoff Mendal
b82f42a139 Import translations. DO NOT MERGE 
Change-Id: I885436b95251805a80c4a6edf308448d5ed43ca3
Auto-generated-cl: translation import
 2014-11-26 06:56:43 -08:00
Geoff Mendal
3efcd8da61 am 441d4f04: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '441d4f04d1e7a3223449add1c70d9d2831277d0e':
  Import translations. DO NOT MERGE
 2014-11-26 14:50:06 +00:00
Jorim Jaggi
f1b05619cc am 95e89cae: Fix jank when pin/pattern is shown 
* commit '95e89caeb252a54807c76d60c7440766829e418c':
  Fix jank when pin/pattern is shown
 2014-11-26 14:49:56 +00:00
Jorim Jaggi
c5c2e53779 Merge "resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev" into lmp-mr1-ub-dev 2014-11-26 14:48:47 +00:00
Geoff Mendal
57086523d5 Import translations. DO NOT MERGE 
Change-Id: Ic378d28436a78faca2428b60431714db6dc7a0f2
Auto-generated-cl: translation import
 2014-11-26 06:35:08 -08:00
Geoff Mendal
441d4f04d1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 14:32:45 +00:00
Geoff Mendal
92ed2ec015 Import translations. DO NOT MERGE 
Change-Id: Idfd2434481ce912e23afaaa7fb6bbef3dcad35f8
Auto-generated-cl: translation import
 2014-11-26 06:31:37 -08:00
Jorim Jaggi
d9b91d0d49 resolved conflicts for merge of 803a6dc0 to lmp-mr1-ub-dev 
Change-Id: I194616c947a3366911e932f4c7111097d3767db3
 2014-11-26 15:17:14 +01:00
Jorim Jaggi
95e89caeb2 Fix jank when pin/pattern is shown 
- Only update layout params of status bar window when needed
- Do not update security method all the time, only when needed (only
  when reset gets called)
- Check for actual used security method when updating states for
  bouncer

Bug: 18505838
Change-Id: Ib3d0021c0cc364fa5598e06e0a2bae059ae79cbe
 2014-11-26 14:07:49 +00:00
Jorim Jaggi
803a6dc080 Merge "Make IKeyguardService interface asynchronous" into lmp-mr1-dev 2014-11-26 14:07:21 +00:00
Paul Jensen
58a493accf am be3736d3: Merge "Don\'t let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 
* commit 'be3736d38774210549deb2999bb226d83a29f1ee':
  Don't let NetworkMonitor state stop user-initiated transitions.
 2014-11-26 12:08:47 +00:00
Paul Jensen
be3736d387 Merge "Don't let NetworkMonitor state stop user-initiated transitions." into lmp-mr1-dev 2014-11-26 12:05:01 +00:00
Jinsuk Kim
3052fede88 am 1c72ba8a: Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 
* commit '1c72ba8ac3036e16a58cd1fd50c7cb01804e993e':
  CEC: Do not compare active input when updating
 2014-11-26 06:02:36 +00:00
Jinsuk Kim
1c72ba8ac3 Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 2014-11-26 05:58:40 +00:00
Andy Hung
feeaa0ba54 am f32d06d8: Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 
* commit 'f32d06d855a6a7f2cb88886a58cb595518a2bd63':
  Allow set loop and position before write for static AudioTracks
 2014-11-26 02:10:03 +00:00
Andy Hung
f32d06d855 Merge "Allow set loop and position before write for static AudioTracks" into lmp-mr1-dev 2014-11-26 02:04:45 +00:00
Dianne Hackborn
b3cf1136d0 am 4298db73: Merge "Re-tune low memory killer params." into lmp-mr1-dev 
* commit '4298db73cecf81cd896b0460c69dbaa727b22514':
  Re-tune low memory killer params.
 2014-11-26 01:55:16 +00:00
smain@google.com
357efcd1d9 am ee032263: am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit 'ee032263046b135045cce0db6dbb8e55cc68baeb':
  add wear design guide for contextual apps
 2014-11-26 01:45:16 +00:00
Dianne Hackborn
4298db73ce Merge "Re-tune low memory killer params." into lmp-mr1-dev 2014-11-26 01:44:22 +00:00
Dianne Hackborn
824aeab2db Re-tune low memory killer params. 
Drop the minimums back down to their old values.

Revert what I think was a mistake in bumping up the last two
maximums to the same value as was being forced for 64 bit.

Smarten the 64 bit adjustment to be relative to the values picked,
rather than hard-coded.

Change-Id: Ibee9625073469ad4722a1b6684c9fb2b9f0a4681
 2014-11-25 17:26:36 -08:00
smain@google.com
ee03226304 am 9da0881f: am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '9da0881ffbcdc566cc1bf60b817ab4f617d0049a':
  add wear design guide for contextual apps
 2014-11-26 00:59:45 +00:00
Alan Viverette
c8361ba78e am 0a310c99: Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 
* commit '0a310c99ee3217567f66578de2d2051e611d39aa':
  Revert "Animates AbsSeekBar progress movement from key presses."
 2014-11-26 00:56:47 +00:00
Alan Viverette
30c0d5b5ea am 8a45126a: Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 
* commit '8a45126a2986fd408dec7c531ee1cadb690aaffd':
  Load SPEAK_PASSWORD from currently active user rather than self
 2014-11-26 00:56:43 +00:00
Alan Viverette
0a310c99ee Merge "Revert "Animates AbsSeekBar progress movement from key presses."" into lmp-mr1-dev 2014-11-26 00:52:36 +00:00
Alan Viverette
8a45126a29 Merge "Load SPEAK_PASSWORD from currently active user rather than self" into lmp-mr1-dev 2014-11-26 00:52:20 +00:00
Alan Viverette
5ce0ec0efd Revert "Animates AbsSeekBar progress movement from key presses." 
Incorrect implementation that broke the Brightness dialog slider. Reverting
to the previous behavior.

This reverts commit c5c9d0af764f590ae0031b5470192a0a08ca42d1.

BUG: 18510040
Change-Id: I201b1da46be964fcf6f041bb92ef79c335c2d23d
 2014-11-26 00:36:26 +00:00
smain@google.com
9da0881ffb am 59f4624a: am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit '59f4624a378ac29c9bb98ea6e800077919e4c8bf':
  add wear design guide for contextual apps
 2014-11-26 00:31:54 +00:00
smain@google.com
59f4624a37 am be718f7c: Merge "add wear design guide for contextual apps" into lmp-docs 
* commit 'be718f7cebd3e09eaa2a432d044a8305dc7b8428':
  add wear design guide for contextual apps
 2014-11-26 00:26:15 +00:00
smain@google.com
be718f7ceb Merge "add wear design guide for contextual apps" into lmp-docs 2014-11-26 00:18:59 +00:00
smain@google.com
98ee16c52a add wear design guide for contextual apps 
Change-Id: I2c5709f02352def34c5c6a0c7dcf7193ebd58e4f
 2014-11-25 16:12:48 -08:00
Alan Viverette
8311f4d5c6 am ee222182: Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 
* commit 'ee2221827910c3df7bc89ccd25b43898551e5aa2':
  Ensure time picker HH:MM header is laid out left-to-right
 2014-11-26 00:11:19 +00:00
Alan Viverette
b6e0cb97b7 Load SPEAK_PASSWORD from currently active user rather than self 
Also fixes a typo in UserHandle's docs.

BUG: 18295054
Change-Id: I1f5384f84062b9ea7dcbebe1e5f64af331028d41
 2014-11-25 16:08:03 -08:00
Alan Viverette
ee22218279 Merge "Ensure time picker HH:MM header is laid out left-to-right" into lmp-mr1-dev 2014-11-26 00:07:14 +00:00
padarshr
3e39c7f50c am e3c48e90: am ddd9c2b9: am 1586b9c3: Start MountService before performBootDexOpt 
* commit 'e3c48e9025274d77bee11f612b5e9bbe84bd11c8':
  Start MountService before performBootDexOpt
 2014-11-25 23:59:00 +00:00
Alan Viverette
e6974e32e7 am 10e2700d: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit '10e2700d50f68a4943ee2d7fe0804db73dc76bff':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 23:50:54 +00:00
padarshr
e3c48e9025 am ddd9c2b9: am 1586b9c3: Start MountService before performBootDexOpt 
* commit 'ddd9c2b97d5a388074ed84c82b41f99ed15ad010':
  Start MountService before performBootDexOpt
 2014-11-25 23:49:38 +00:00
padarshr
ddd9c2b97d am 1586b9c3: Start MountService before performBootDexOpt 
* commit '1586b9c33ed8429b8dbbe15ce3316a2d1a73977a':
  Start MountService before performBootDexOpt
 2014-11-25 23:43:19 +00:00
Alan Viverette
10e2700d50 Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 2014-11-25 23:42:19 +00:00
padarshr
1586b9c33e Start MountService before performBootDexOpt 
This change is to start Mountservice before starting
performBootDexOpt, as in one case, in performBootDexOpt
when system upgrade happens, StorageManager will be started to
get the low threshold of DataDir. But, at this point, as
Mountservice is still not up, StorageManager will end up
having a null object of Mountservice.

Change-Id: If2b5e1b58e7d2a72c6313f196e98a68738295ec6
 2014-11-25 15:30:02 -08:00
Eric Laurent
297222315e am e511ddce: Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 
* commit 'e511ddce43ce3586f9bced5f8505e540951ab524':
  AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION.
 2014-11-25 22:33:03 +00:00
Roozbeh Pournader
779c8ad679 am c08b47a7: Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 
* commit 'c08b47a7acf0192bb24d7d189345840f1c5258cc':
  Add Lohit Odia (Oriya) font to the fallback chain.
 2014-11-25 22:32:58 +00:00
Eric Laurent
e511ddce43 Merge "AudioService: use FEATURE_LEANBACK instead of FEATURE_TELEVSION." into lmp-mr1-dev 2014-11-25 22:28:17 +00:00
Roozbeh Pournader
c08b47a7ac Merge "Add Lohit Odia (Oriya) font to the fallback chain." into lmp-mr1-dev 2014-11-25 22:27:40 +00:00
Jim Miller
ab954546dc Make IKeyguardService interface asynchronous 
Add a state callback so lockscreen reports back whenever its state
relevant for PhoneWindowManager changed, instead of synchronously
calling into SysUI which can lead to deadlocks. Directly use
LockPatternUtils for isSecure, and optimize the number of calls to
this method to optimize layout performance.

Bug: 17677097
Change-Id: I5d491fc8884d4f84d9562626b9ea0d5eaa5166fc
 2014-11-25 23:22:52 +01:00
Lajos Molnar
c60a5d781a am 3ed95fe2: Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 
* commit '3ed95fe2589c01e9255f4d75636fb8b0c83a01d5':
  media: add support for 160-byte image info in MediaCodec
 2014-11-25 22:15:11 +00:00
Lajos Molnar
3ed95fe258 Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 2014-11-25 22:09:36 +00:00