141327 Commits

Author SHA1 Message Date
Jason Sams
24bea6a3ef Resolve conflicts with AOSP.
Change-Id: I2f1afdb83dcfc9078df5d3c2f13abacb6504d73d
2014-07-02 14:32:24 -07:00
Brian Duff
a6e9dd3f9a Merge "Fix a typo in NumberPicker javadoc." 2014-07-02 20:51:20 +00:00
Jorim Jaggi
0fa5652eab Merge "Disable flexy straw when in QS" 2014-07-02 19:50:27 +00:00
Jorim Jaggi
341d182100 Disable flexy straw when in QS
Change-Id: Ic6c7834512c3cc96e3e6956008727312ea1f2423
2014-07-03 23:34:48 +02:00
Jorim Jaggi
540454259d Quick settings improvements
- Remove hole in landscape when no notifications are shown.
- Start intercepting touch events directly when already flinging.
- Fix jump in top panel when collapsing QS in landscape.

Change-Id: If2da5215ee20ea1b0d3a0f88f32c8f5b0dd147da
2014-07-03 22:50:20 +02:00
Jorim Jaggi
563062569c Reenable touches to notifications in expanded QS
Revert "Closing the QS when tapping on the notifications now."
This reverts commit 3bb0bb8817690728a40edd3f8f665b09907a451b.

Revert "Disabled touch interaction when in Quick settings."
This reverts commit 5cd19bc6a4fac0513bb285fdaf08b1d19c87f4ae.

Also, shuffle order of notifications and quick settings such that
scrolling still works and delegate touches from stack scroller to
the scroll view for expanded QS panel.

In addition, make the panel close transition work when QS is expanded
and scrolled.

Last but not least, decrease scrim amount so the notifications still
look 100% interactive.

Change-Id: I17710e078cff84bcdf303c22986a31135dae2aee
2014-07-03 17:24:50 +02:00
Jorim Jaggi
30c305ce62 Implement nice motion for collapsing panel while QS open
Also remove the delay for actions which close the panel. Delaying is
no longer necessary as you still see the touch feedback when the
panel is closed.

Change-Id: I0dffae6998fc41b1590cb182667323f40be3a7d5
2014-07-03 17:24:24 +02:00
Jorim Jaggi
ed2f4b77da Merge "Quick settings improvements" 2014-07-02 19:56:47 +00:00
Jessica Hummel
ea9bdd7c50 Merge "Remove unused action from DevicePolicyManager." 2014-07-02 19:56:47 +00:00
Jessica Hummel
edb7ae704b Remove unused action from DevicePolicyManager.
This is part of a simplification to cut out one communication with mdm apps.

Change-Id: I7d0067928c20387dca8fcc45a7bc48d9d158fa2c
2014-07-03 11:14:33 +01:00
Winson Chung
5e6edd87c9 Merge "Bug fixes and cleanup" 2014-07-02 18:22:50 +00:00
John Spurlock
e048d85301 Merge "QS: Wifi control panel." 2014-07-02 20:06:33 +00:00
John Spurlock
7f8f22a530 QS: Wifi control panel.
Create first example of an inline detail view with line
items, bind to new access-point controller.

Move the common bits of all control panels into a
common abstraction.  Share common parts of layout
(More settings / done button).

Change-Id: I14a1bf548f3291dc628f97bf09dd4e38ac2fb2dc
2014-07-03 12:28:46 -04:00
Jean-Michel Trivi
50f45d0185 Merge "AudioDevice class to expose concept of device in SDK" 2014-07-02 18:22:50 +00:00
Jean-Michel Trivi
3ef1812272 AudioDevice class to expose concept of device in SDK
Change-Id: I94c87e98061581a767d775f64dd6bd9a1f9956e1
2014-07-02 21:12:18 +00:00
Christoph Studer
e65501a743 Merge "Inline replace notification views when layout changes" 2014-07-02 19:50:27 +00:00
Christoph Studer
a7fe63190c Inline replace notification views when layout changes
Instead of going through a full remove / add when a notification
is updated with a different layout, only re-inflate the inner views.

Bug: 15869868
Change-Id: Ie18c431e7b3e2a6209d4a9b6418b3150781a063f
2014-07-03 17:18:11 +02:00
Ihab Awad
ecf4d09664 Merge "Fix references to two constants" 2014-07-02 18:17:00 +00:00
Ihab Awad
6c9566fb2d Fix references to two constants
The names of two constants missed getting updated in a previous CL,
causing a build breakage.

Change-Id: I2a87f6b3aead2c6b751afedf32a321c8290b51be
2014-07-02 13:51:50 -07:00
Santos Cordon
7a76e87218 Merge "Move cancelMissedCallsNotification to PhoneManager." 2014-07-02 18:17:00 +00:00
Santos Cordon
3c4ff9effc Move cancelMissedCallsNotification to PhoneManager.
Change-Id: I2ce26e77ef1f0acc11552bf28efc039391e09766
2014-07-02 23:39:30 +00:00
Craig Mautner
53e3b38b09 Merge "Use cached thumbnails in Recent tasks." 2014-07-02 21:11:19 +00:00
Tyler Gunn
d0154927a8 Adding "start call with video" extra for ACTION_CALL intent.
Bug: 16014224
Change-Id: I6240b50383de60fbe9038b247856227c6c278b85
2014-07-02 23:31:46 +00:00
Craig Mautner
c0ffce5ddd Use cached thumbnails in Recent tasks.
The thumbnail returned from ActivityManager.getTaskThumbnail() now
contains either a Bitmap or a ParcelFileDescriptor that points to
a file containing a compressed Bitmap. The Recent tasks list is
now responsible for all thumbnail Bitmap caching as the activity
manager keeps only the most recent 5. This also permits low memory
devices to have many more tasks in the Recent tasks list.

As part of this CL the concept of subtasks is removed eliminating
code supporting the TaskAccessInfo and IThumbnailRetriever classes.

Fixes bug 15828934.

Change-Id: I0fd0320a1a04e3c78d79357899b83a2fff97abf2
2014-07-02 16:31:46 -07:00
Jason Sams
51cb970968 am 24bea6a3: Resolve conflicts with AOSP.
* commit '24bea6a3ef53733ffd1622dfa0bdaeea0a74303a':
  Resolve conflicts with AOSP.
2014-07-02 23:19:27 +00:00
Baligh Uddin
191ba12499 am ed61958a: (-s ours) am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'ed61958a254deb6299b907ecb079ebe15da339c3':
  Import translations. DO NOT MERGE
2014-07-02 23:19:22 +00:00
Baligh Uddin
c685fff9b7 am 0bd94e4b: (-s ours) am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '0bd94e4b7a5f490dac0090db931bef0f60121cf9':
  Import translations. DO NOT MERGE
2014-07-02 23:19:16 +00:00
Baligh Uddin
ac7b1e6032 am 066fb41f: (-s ours) am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '066fb41fc74419d321f385f9d641c014efb474ae':
  Import translations. DO NOT MERGE
2014-07-02 23:19:12 +00:00
Martijn Coenen
1a0fd95a46 Merge "Add API to query for AID prefix support." 2014-07-02 20:11:01 +00:00
Martijn Coenen
d92c168974 Add API to query for AID prefix support.
For future devices which may support
registering AID prefixes. Get the API in for now,
the actual implementation is pretty simple and
will follow later.

Change-Id: I6c16dae9a4dbc0f9cd84bdb61a4de93cffd278ec
2014-07-02 16:30:06 -07:00
Martijn Coenen
b92dc6b013 Clean up dynamic AID XML parser.
<aid-group> should be generated and parsed
in its own object.

Change-Id: I70f4511a682c66f8d11b7797a0f171cda24cc617
2014-07-02 14:11:54 -07:00
Martijn Coenen
b51441163f Move AID validation to CardEmulation.
More logical place since it's a generic utility
function.

Change-Id: I3381f10d6720e415d091dbd475ef0df8733e7e75
2014-07-02 12:44:33 -07:00
Alan Viverette
396d485ba9 Merge "Add style for SearchView" 2014-07-02 18:17:00 +00:00
Nick Kralevich
4facb0796f resolved conflicts for merge of dbbc0706 to master
Change-Id: I3b4e442988021d5ac569cb06682bc1355edbb430
2014-07-02 16:06:55 -07:00
Alan Viverette
5dddb70b4e Add style for SearchView
BUG: 6420978
Change-Id: I31d9f7e66c2404388ccbe6d2e43a005deb0b7c25
2014-07-02 15:59:30 -07:00
Nick Kralevich
a00144ca89 resolved conflicts for merge of a8dbd7b4 to master
Change-Id: I90f42546c6d0a8f21af3041e59baf6a226247b1c
2014-07-02 15:41:21 -07:00
Raph Levien
6df71c76e0 Merge "Fix native crash when typeface is missing" 2014-07-02 18:50:12 +00:00
Raph Levien
27bb05f2dc Fix native crash when typeface is missing
Creating a typeface from a missing file crashes when it tries to extract
the style from the font. This patch just uses default style when the
resulting font object is NULL.

Bug: 15930808
Change-Id: I9438687100026f336db7aa204fe3a0232eee2db6
2014-07-02 15:07:39 -07:00
Martijn Coenen
c813dbbfb3 Merge "Clean up dynamic AID XML parser." 2014-07-02 18:22:50 +00:00
Ido Ofir
609332192e Merge "fixing i18n bug. b/15711200" 2014-07-02 21:11:19 +00:00
Ido Ofir
12ea0d24a5 fixing i18n bug. b/15711200
Change-Id: I485859f6536c68f3d0d3e2d62c21a39705ba87b4
2014-07-02 13:51:01 -07:00
Martijn Coenen
8d61b67234 Merge "Move AID validation to CardEmulation." 2014-07-02 18:11:52 +00:00
Adrian Roos
287554ca95 Merge "Update QS flashlight icon" 2014-07-02 19:50:27 +00:00
Adrian Roos
e59bd9af26 Update QS flashlight icon
Bug: 15934851
Change-Id: Id1d08fce8916c29c6cb53eee7cb069b250c0b805
2014-07-02 20:03:26 +00:00
dcashman
ca76cccb61 Merge "Initial work for key rotation." 2014-07-02 18:22:50 +00:00
dcashman
55b1078e2a Initial work for key rotation.
Introduces the upgrade-keyset tag to AndroidManifest.xml. This specifies a
KeySet by which an apk must be signed in order to update the app. Multiple
upgrade KeySets may be specified, in which case one of them must be used to
sign the updating apk.  If no upgrade-keyset is specified, the current logic
involving signatures is used.

Current Key Rotation Design Decisions:
-Apps using a shared user id may not rotate keys.
-All acceptable upgrade keysets must be specified, including the key signing
the app.  This enables key rotation in one update, but also 'locks' an app if
an incorrect upgrade keyset is specified.
-Minimal changes to existing KeySet code.

Bug: 6967056
Change-Id: Ib9bb693d4e9ea1aec375291ecdc182554890d29c
2014-07-02 12:51:28 -07:00
Alexandra Gherghina
1e1f2e8926 Merge "Adds per-user APIs required by the Settings app" 2014-07-02 16:34:47 +00:00
Baligh Uddin
ed61958a25 am e1ef888e: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'e1ef888eac66c247710833746f7e8e2fc1f45c1b':
  Import translations. DO NOT MERGE
2014-07-02 15:08:10 +00:00
Baligh Uddin
0bd94e4b7a am 48f89343: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit '48f89343d9abdaa81dcdbebd7a15b2b313d67aa7':
  Import translations. DO NOT MERGE
2014-07-02 15:08:06 +00:00
Baligh Uddin
066fb41fc7 am caaf4aed: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev
* commit 'caaf4aed05163df62365d351e592083ba95102cd':
  Import translations. DO NOT MERGE
2014-07-02 15:08:02 +00:00