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

157895 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:38:45 -08:00
Jinsuk Kim
bc3226e21d Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 2014-11-26 21:27:19 +00:00
Chris Craik
ca84c8b1b0 Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 2014-11-26 20:50:10 +00:00
Lajos Molnar
a181da10ac Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 2014-11-26 19:14:26 +00:00
vandwalle
47772ac8e9 Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 2014-11-26 19:05:02 +00:00
Chris Craik
9f81485a76 Revert "Force-use the pbuffer surface for destroy" 
bug:18528859

This reverts commit b945f2313aee6e49a082ba5caaf95334d2570d52.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
 2014-11-26 18:59:58 +00:00
Jeff Sharkey
293f0f380b Merge "package_info GID shouldn't have write." into lmp-mr1-dev 2014-11-26 18:49:33 +00:00
Ryan Lothian
1e88cf0796 Fix broken @see javadoc in android.media.* classes 
This CL fixes all android.media.* javadoc that includes an "ERROR(...)"
message when rendered to HTML.

Bug: 18537403
Change-Id: Ic60f7cfe4cf4961da163d955387d65a5d2011905
(cherry picked from commit d550f9028ee7f52018fbed3cfd2d0b18d6a7c4f0)
 2014-11-26 18:49:01 +00:00
John Spurlock
f17f04a51e Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev 2014-11-26 16:32:38 +00:00
Geoff Mendal
038c144442 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 16:30:49 +00:00
Geoff Mendal
d2160dd097 Import translations. DO NOT MERGE 
Change-Id: Ia430daa8ca9fbc8181130d7380a4ca5761d01ef1
Auto-generated-cl: translation import
 2014-11-26 08:13:55 -08:00
Jeff Davidson
8c99018a98 Merge "Handle package changes in NetworkScoreService." into lmp-mr1-dev 2014-11-26 15:55:18 +00:00
Jeff Davidson
f8a3b8e008 Merge "Fix WifiTile's Connected indicator for ephemeral networks." into lmp-mr1-dev 2014-11-26 15:54:25 +00:00
John Spurlock
e506c85eaa Volume: Avoid making bad forceVolumeControlStream call. 
Ensure we don't call audio manager with STREAM_MASTER, which is
a pseudo-stream value internal to volume panel.

Bug: 18250921
Change-Id: I4b6af9fc60d7683e9103be52cc937c33c1c15e31
 2014-11-26 10:11:19 -05:00
Geoff Mendal
38499cf8a1 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-26 15:08:47 +00: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
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
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
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
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
1c72ba8ac3 Merge "CEC: Do not compare active input when updating" into lmp-mr1-dev 2014-11-26 05:58:40 +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
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
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
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
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
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
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
3ed95fe258 Merge "media: add support for 160-byte image info in MediaCodec" into lmp-mr1-dev 2014-11-25 22:09:36 +00:00
Paul Crowley
77e25331ca Merge "Add flag for wiping factory reset protection data." into lmp-mr1-dev 2014-11-25 21:13:30 +00:00
Paul Crowley
a7e87acb24 Add flag for wiping factory reset protection data. 
Bug: 18366448
Change-Id: If8904888a6bf8611d34647e6d65d2347d824dbb3
 2014-11-25 20:48:41 +00:00
Amit Mahajan
3749541a20 Merge "Adding helper functions to retrieve settings that are stored per subId." into lmp-mr1-dev 2014-11-25 20:39:09 +00:00
John Reck
dec3f138c2 Merge "Force-use the pbuffer surface for destroy" into lmp-mr1-dev 2014-11-25 19:52:53 +00:00