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
Deepanshu Gupta
17a6170c62
Fix AnalogClock rendering
...
1. Change calls to java.lang.System.log* since they don't exist on the
host.
2. Clean up method rewrite mechanism in ReplaceMethodCallsAdapter.
3. Stub out creation of uninitialized GregorianCalendar.
4. Memory map the time zone data base file and provide a custom
implementation of BufferIterator for use by ZoneInfoDB
5. Delete unused Time_Delegate
Also fixed a comment in BridgeAssetManager and an error message in
FontFamily_Delegate.
Bug: http://b.android.com/79160
Change-Id: Iae5ef65678f0e6c7c5af520c45bd15980ce3fa55
2014-11-26 12:03:39 +00:00
Scott Main
2995bd8033
am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs
...
* commit '5a27b4b8216cf758f302200f7a2b0a071a1be90e':
docs:advmgr-updates
2014-11-26 11:56:53 +00:00
smain@google.com
277fb8fdae
am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load
...
* commit 'd3c172703df68c70aca6f212fda3023246869777':
define height for context images to avoid content jumps on load
2014-11-26 11:56:49 +00:00
Narayan Kamath
7377998dac
resolved conflicts for merge of a42f7c1d to lmp-sprout-dev
...
Change-Id: I8e53c9d7e0014b4ffc621c561b737aa2dae5460c
2014-11-26 10:39:08 +00:00
Jinsuk Kim
57d766f533
Do not perform forceVolumeControlStream in master volume mode
...
The method should be no-op when in master volume mode.
Bug: 18250921
Change-Id: Iaab806db935ef97aa1124c3447e228d3eaef7584
2014-11-26 17:02:18 +09: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
Scott Main
5a27b4b821
am fc793074: Merge "docs:advmgr-updates" into lmp-docs
...
* commit 'fc793074063ee40b0bc4b4cbf710802123f84251':
docs:advmgr-updates
2014-11-26 03:19:30 +00:00
Scott Main
fc79307406
Merge "docs:advmgr-updates" into lmp-docs
2014-11-26 03:13:27 +00:00
smain@google.com
d3c172703d
am 3a4b011c: define height for context images to avoid content jumps on load
...
* commit '3a4b011c9e4260ec34b490368ccf19edb3a0b5fe':
define height for context images to avoid content jumps on load
2014-11-26 02:22:44 +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
smain@google.com
3a4b011c9e
define height for context images to avoid content jumps on load
...
Change-Id: I95fb6d628f8be12c31c0b7fa2978dd266f72dbf6
2014-11-25 18:05:39 -08: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
vandwalle
da123a6726
make startScan with worksource specific to location scans
...
Change-Id: Ia09dae3e334ef6fd11f2b468e78ad7c2c3cf55e9
2014-11-25 17:35:12 -08:00
Dianne Hackborn
a42f7c1d42
Merge "Be increasingly aggressive about fstrim if it isn't being run" into lmp-dev
2014-11-26 01:32:54 +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
Rich Slogar
0ed88b9a2e
docs:advmgr-updates
...
Change-Id: I4895f8dc91d0397a615a358d97cbd229b171f507
2014-11-25 16:40:28 -08: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
Christopher Tate
7265abe77a
Be increasingly aggressive about fstrim if it isn't being run
...
The current heuristics depend on devices being alive at midnight+ in
order to run periodic background fstrim operations. This unfortunately
means that people who routinely turn their devices off overnight wind
up with their devices *never* running fstrim, and this causes major
performance and disk-life problems.
We now backstop this very-friendly schedule with an increasingly
aggressive one. If the device goes a defined time without a background
fstrim, we then force the fstrim at the next reboot. Once the
device hits the midnight+ idle fstrim request time, then we already
aggressively attempt to fstrim at the first available moment
thereafter, even if it's days/weeks later without a reboot.
'Available' here means charging + device idle. If the device never
becomes idle then we can't do much without rendering an in-use device
inoperable for some number of minutes -- but we have no evidence of
devices ever failing to run fstrim due to this usage pattern.
A new Settings.Global element (type 'long', called
"fstrim_mandatory_interval") is the source of the backstop time. If
this element is zero or negative, no mandatory boot-time fstrim will
ever be performed. If the element is not supplied on a given device,
the default backstop is 3 days.
Adds a new string to display in the upgrading dialog when doing
the fstrim. Note it is too late for this to be localized, but since
this operation can take a long time it is probably better to have
it show *something* even if not localized, rather than just sit there.
Bug 18486922
Change-Id: I5b265ca0a65570fb8931251aa1ac37b530635a2c
2014-11-25 16:35:06 -08: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
Amit Mahajan
5ed82c8ca0
Change to use DATA_ROAMING setting correctly with subId.
...
Bug: 18466745
Change-Id: Ib2d7979d164ca3cf32c6619340fae1dc578ca686
2014-11-25 16:29:10 -08: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
Erik Kline
b567aa8938
Revert some verbose logging from ag/489226
...
Bug: 18171889
Change-Id: I582a17b2272746e04717ac8da1d6984ff187ddf6
2014-11-26 09:01:16 +09: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