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

143138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert Ly
049cadd8c9 am f1b18ded: Merge "docs: Fix typo in Wear docs. Bug: 16327298" into klp-modular-docs 
* commit 'f1b18ded01adf94ee34dbd95a86616d8eadbdf06':
  docs: Fix typo in Wear docs. Bug: 16327298
 2014-07-17 20:27:03 +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
Prashant Malani
162d943350 am 9353e1a2: Merge "Make the booting flag update unconditional" into klp-modular-dev 
* commit '9353e1a2b2e8f02377c3f73565964ffb0927c776':
  Make the booting flag update unconditional
 2014-07-17 19:55:32 +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
Niels Egberts
5e413470e5 Merge "Add money as a new TtsSpan type." into lmp-dev 2014-07-17 19:55:10 +00:00
Niels Egberts
b1a092c772 Add money as a new TtsSpan type. 
Added ARG_QUANTITY to decimal so money and measure can 'inherit' it.

Change-Id: I0f9f464d198a9875df4a01e8a5c95a3d19ed6f7f
 2014-07-18 18:46:20 +01: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
John Spurlock
8b0249da3e QS: Fix crash switching users. 
Bug:16375449
Change-Id: I971c5b043edcffe669c29bbc566b80696b6251b2
 2014-07-17 15:53:32 -04:00
Adam Powell
bf347fdc7a am 21b1b8b9: Add nested pre-fling for nested scrolling 
* commit '21b1b8b9a17d8e32d193a14ec4507448f2f3e20b':
  Add nested pre-fling for nested scrolling
 2014-07-17 18:57:22 +00:00
Adam Powell
b72be59a6a Add nested pre-fling for nested scrolling 
Nested pre-fling allows a nested scrolling parent to consume a fling
operation before the child view does. If a parent has been consuming
nested pre-scroll events in a particular direction, this is generally
a good indication that it should also consume the resulting fling at
the end.

Bug 15538504

Change-Id: I88e8753a96c9b41815c3be530cafab8345164e64
 2014-07-17 11:37:59 -07:00
Joe Fernandez
4130462d52 am aafe9d65: am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit 'aafe9d65f6c2bc350e2a6c5ab3fe7e2b52d53e2a':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:20:00 +00:00
John Reck
0d7834b865 am bce422bd: Merge "Fix logging" into lmp-dev 
* commit 'bce422bd8ed6cab40593e2d4b9ccc4fd316b5d47':
  Fix logging
 2014-07-17 18:19:38 +00:00
Ruben Brunk
daa2d86dbf am 0a749af3: Merge "camera2: Fix swapped Face detection commands." into lmp-dev 
* commit '0a749af3a914a795f7cebdbdcb4c29372925e66a':
  camera2: Fix swapped Face detection commands.
 2014-07-17 18:19:35 +00:00
Joe Fernandez
9142a0f80c am 64ae9303: am e1e81a9e: am e287cf33: docs: Update ADT-1 page with supported apps 
* commit '64ae930359619f2a49c8a4bef5dc45261c772d45':
  docs: Update ADT-1 page with supported apps
 2014-07-17 18:16:10 +00:00