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

143089 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wonsik Kim
5b2295a521 Merge "TIF: change onCreateSession() method signature" into lmp-dev 2014-07-17 21:07:39 +00:00
Wonsik Kim
1032f034ff TIF: change onCreateSession() method signature 
Bug: 16138420
Change-Id: I73f4992bd76b888c7e5bc6260b3ed849760ee707
 2014-07-18 12:00:20 +09:00
Jinsuk Kim
fe61a67bb9 Merge "Remove system audio output option for HdmiControlService" into lmp-dev 2014-07-17 21:07:39 +00:00
destradaa
841566e295 am 607d3271: Merge "Fix exceptions in ActivityRecognition platform stack." into lmp-dev 
* commit '607d3271089e4874028aca9cfbede38c557961bb':
  Fix exceptions in ActivityRecognition platform stack.
 2014-07-17 21:04:28 +00:00
Sailesh Nepal
4bf2736ad4 Merge "Use main thread for RemoteConnection callbacks" into lmp-dev 2014-07-17 21:04:20 +00:00
Sailesh Nepal
480315939d Use main thread for RemoteConnection callbacks 
Currently call backs from RemoteConnection can happen
on non-main threads. This CL updates the code to always
use the main thread.

Change-Id: I134c0fbdba1f916f49676c0c6696ac63bcb7c513
 2014-07-18 14:21:23 -07:00
Craig Stout
643ce7a0cb am 68e9eb34: Fix legacyMode for leanback timepicker 
* commit '68e9eb34d5b35a092ca329d78a5c39f643e390af':
  Fix legacyMode for leanback timepicker
 2014-07-17 20:56:19 +00:00
Craig Stout
f83ccb9647 Fix legacyMode for leanback timepicker 
Change-Id: Idcd9627f330918d8b2de144af28e749c47602769
 2014-07-17 20:50:13 +00:00
Andres Morales
182b3a9dc9 am e9f27df7: Permit settings to "wipe" the persistent partition 
* commit 'e9f27df72263e769ac5325a7523d6f5379c6015a':
  Permit settings to "wipe" the persistent partition
 2014-07-17 20:48:33 +00:00
Andres Morales
963295ea10 Permit settings to "wipe" the persistent partition 
One of the requirements is that when the user does a
factory reset through settings, all data on the
persistent partition should be cleared.

This adds one last API method that allows settings
to wipe the partition.

Bug: 14288780
Change-Id: Ib87ee741d1e5195814516ae1d66eb7c4cf754dcf
 2014-07-17 20:42:04 +00:00
Zhijun He
c788c7624a am 4c6f6ffe: Merge "Camera2: replace partial quirks with normal partial result" into lmp-dev 
* commit '4c6f6ffe214444a4e924d189581e99ba2319b01f':
  Camera2: replace partial quirks with normal partial result
 2014-07-17 20:40:32 +00:00
Andrew Lee
8198cb7deb am 9eb532f5: Merge "Pass through video state when answering a call." into lmp-dev 
* commit '9eb532f594f1ff3c290a92ab9b7bca55176dede3':
  Pass through video state when answering a call.
 2014-07-17 20:24:17 +00:00
Evan Charlton
5b694edaa8 am 58299755: Merge "Plumb through StatusHints change notifications" into lmp-dev 
* commit '58299755075aa3c32c413b54824f3a46321da49f':
  Plumb through StatusHints change notifications
 2014-07-17 20:20:09 +00:00
John Spurlock
7c29da7e35 am d75d1ef0: Merge "QS: Fix crash switching users." into lmp-dev 
* commit 'd75d1ef07c175c8a48a126f4e36172e03c30987c':
  QS: Fix crash switching users.
 2014-07-17 20:02:14 +00:00
Filip Gruszczynski
bbc499415c am a76164e1: Merge "Only use bottom outset for main display." into klp-modular-dev 
* commit 'a76164e1d0d283baf412c18999e680d93bd50f01':
  Only use bottom outset for main display.
 2014-07-17 19:55:27 +00:00
Christoph Studer
329a85ba90 Merge "Cancel notification group children when summary is canceled" into lmp-dev 2014-07-17 19:55:10 +00:00
Craig Mautner
34f23f33eb am 20b338d9: Merge "Restore calling identity before checking permission" into lmp-dev 
* commit '20b338d949e6995853f37960241af010db7c8e40':
  Restore calling identity before checking permission
 2014-07-17 19:53:26 +00:00
RoboErik
945dd4e506 am 4e8b237d: Merge "return false for media keys if no controller" into lmp-dev 
* commit '4e8b237d6a97b7c97fded14005723e56c9bb8c19':
  return false for media keys if no controller
 2014-07-17 19:53:23 +00:00
Narayan Kamath
53777b58f3 Merge "Fix broken locale related assumptions in TextServicesManager." into lmp-dev 2014-07-17 19:51:18 +00:00
Narayan Kamath
6648dded69 Fix broken locale related assumptions in TextServicesManager. 
startsWith is a bogus check unless languages match. Also, don't
assume 2 letter languages.

bug: 10090157
Change-Id: I8adda61bddc465aac261c0ce2023fa9606affe1b
 2014-07-18 15:02:34 +01:00
Niels Egberts
7a56ea350f Merge "New TtsSpan builders for types measure, time, date, digits and verbatim." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
6e7c8995dd New TtsSpan builders for types measure, time, date, digits and verbatim. 
Change-Id: I60022aa72c64f454261a0b69c21c45ce6351b9e7
 2014-07-18 16:36:11 +01:00
Niels Egberts
f976abe700 Merge "Add builders for TtsSpans of type ordinal, decimal and fraction." into lmp-dev 2014-07-17 19:45:26 +00:00
Niels Egberts
a896363400 Add builders for TtsSpans of type ordinal, decimal and fraction. 
Also document the possibility to give phone numbers in parts.

Change-Id: Ie1cdf56cc3b6c221c9410fb02dcba2568ea337b7
 2014-07-18 13:43:22 +01:00
Narayan Kamath
e7d1f16fa9 Merge "Unhide." into lmp-dev 2014-07-17 19:45:26 +00:00
Narayan Kamath
b91ca2d880 Unhide. 
Change-Id: Ie5788bfdde7ec7394dbd6e11e63e3044ccc5a802
 2014-07-18 14:54:24 +01:00
Bryan Mawhinney
8a97d9dfc5 Merge "Default MediaStyled notifications to CATEGORY_TRANSPORT" into lmp-dev 2014-07-17 19:45:26 +00:00
Bryan Mawhinney
6be8de36e6 Default MediaStyled notifications to CATEGORY_TRANSPORT 
This makes it easier to identify them later (e.g., for filtering).
The developer can always specify a different category if preferred.

Also fixed some javadoc related to setMediaSession()

Change-Id: I5f28514758218ff66fdbaa9fd37ccb19f12d4852
 2014-07-18 10:35:12 +01:00
Eino-Ville Talvala
f2d21f054f am 97bc6530: Merge "Add PackageManager features for differentiating camera2 devices" into lmp-dev 
* commit '97bc653093792eb0efb9581d1885e55ccbd0bad9':
  Add PackageManager features for differentiating camera2 devices
 2014-07-17 19:37:57 +00:00
Winson Chung
6d984b8f6e am 3bf3d3c0: Merge "Fixing optimization in Task loading. (Bug 16372369)" into lmp-dev 
* commit '3bf3d3c0a283f086f605b1d9497755d854dc852d':
  Fixing optimization in Task loading. (Bug 16372369)
 2014-07-17 19:37:51 +00:00
Chris Craik
5ff847763b am 8ca30207: Merge "Minor cleanups around color usage" into lmp-dev 
* commit '8ca3020778727ad35f305fb84611c1e43c3c8a92':
  Minor cleanups around color usage
 2014-07-17 19:37:46 +00:00
Chris Craik
ca6c80f508 am 19f0c01c: Merge "Simplify ViewRootImpl\'s AttachInfo usage" into lmp-dev 
* commit '19f0c01cdfae327487497bcc3c2b9e2b2ab628a2':
  Simplify ViewRootImpl's AttachInfo usage
 2014-07-17 19:33:15 +00:00
Dan Sandler
2083deb8f9 Merge "Actually show secret notifications sometimes." into lmp-dev 2014-07-17 19:26:18 +00:00
Dan Sandler
1b71878e4e Actually show secret notifications sometimes. 
Factor out the "should we be hiding sensitive data"
predicate so we get it right everywhere.

Show visibility stuff in Notification.toString().

Bug: 16307122
Change-Id: Ifd16d073c4595add2ac3582ffc0d0179e55246e5
 2014-07-18 13:37:33 -04:00
Paul Jensen
286b06ae4c Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev 2014-07-17 19:26:18 +00:00
Paul Jensen
b6ea9ee6fe Make back button work in CaptivePortalLogin app like a web browser. 
Users will be using the app to navigate web pages like they are used to in
web browsers, so the back button should act similarly.  There also isn't
an in-app back button so this adds essentially necessary functionality.

bug:16397616
Change-Id: Idd73d4a048d79e56bf981a8f477336f00eaafc3b
 2014-07-18 16:34:57 +00:00
John Spurlock
56d77b9c83 Merge "Volume: Rocker animation + style updates." into lmp-dev 2014-07-17 19:26:18 +00:00
John Spurlock
b71e68f9aa Volume: Rocker animation + style updates. 
- Add more spacing at the top
- Update window animations to fades
- Improve style for alarm warnings

Bug:16200897
Change-Id: I7a64e235eff1f9a77fc697a98a4440bc69043386
 2014-07-17 23:23:11 -04:00
Amith Yamasani
5ae8e6fe34 am 56e7c4ef: Merge "Split telephony restrictions into outgoing calls and sms" into lmp-dev 
* commit '56e7c4ef6277c573be0f9b1409f875286b79b671':
  Split telephony restrictions into outgoing calls and sms
 2014-07-17 19:21:49 +00:00
Dan Sandler
5598216931 Merge "Deprecate and stop generating tickerViews." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
5fcdf6e81d Deprecate and stop generating tickerViews. 
Tickers have been replaced in the UI by heads-up
notifications (and not creating the tickerView will save
memory, almost 150k if you have an xhdpi largeIcon).

Update docs to explain that tickers are just for
accessibility now.

Bug: 16395266
Change-Id: Ib1372b34c1c261f64228bbe705d174675cd007dc
 2014-07-18 12:11:58 -04:00
John Spurlock
1f9cd414b2 Merge "Volume: Dismiss shade when launching settings from rocker." into lmp-dev 2014-07-17 19:20:15 +00:00
John Spurlock
c86f573fb8 Volume: Dismiss shade when launching settings from rocker. 
The volume dialog can appear over the expanded QS panel.  Dismiss
the shade when launching zen settings so that it is not obscured.

Bug:16397104
Change-Id: Icc9e7107572305d366a9648f5082096ff92a8b71
 2014-07-18 11:45:05 -04:00
Dan Sandler
78f92eef03 Merge "Shrink user profile bitmaps to 48dp^2." into lmp-dev 2014-07-17 19:20:15 +00:00
Dan Sandler
4d75c079f3 Shrink user profile bitmaps to 48dp^2. 
Can save megabytes of memory.

Bug: 16371371
Change-Id: Ifec5cff3a3376d045ee4e3b605edeb8d9ac93799
 2014-07-18 15:26:48 +02:00
John Spurlock
c2d09dd746 Merge "Shade: Hide status icons, take 2." into lmp-dev 2014-07-17 19:20:15 +00:00
John Spurlock
604ae09142 Shade: Hide status icons, take 2. 
Restore visibility logic (for mirrored view) and remove a bad
optimization from the clipping calculation.

Bug:16337935
Change-Id: I7eb82ef6c87f30da9d8b70136e05dab3abdbdead
 2014-07-17 18:22:45 -04:00
Evan Charlton
9c33953e51 Merge "Plumb through StatusHints change notifications" into lmp-dev 2014-07-17 19:20:15 +00:00
Evan Charlton
5b49adea48 Plumb through StatusHints change notifications 
When StatusHints are modified, inform listeners. Also expose two
constants for passing optional strings from the CallService to
the in-call UI.

Bug: 13334257
Bug: 13334252

Change-Id: If7fde7c1ca6940cec8b7232469a22900c36dbb17
 2014-07-17 12:53:39 -07:00
John Spurlock
edbaa7d293 Merge "QS: Fix crash switching users." into lmp-dev 2014-07-17 19:13:40 +00:00