147801 Commits

Author SHA1 Message Date
Adrian Roos
c55dd2bc04 Merge "QS: Update user switcher details" into lmp-dev 2014-08-11 18:41:55 +00:00
Adrian Roos
bc0a9fecf6 QS: Update user switcher details
- Update icon colors to white
- Change label for adding a guest

Bug: 16897120
Bug: 16898990

Change-Id: I0541d35df8c03bfeb3ee931d8074a7fe1064b2db
2014-08-11 20:45:04 +02:00
Winson Chung
9e229d80e5 Merge "Updating accessibility message for Recents activity. (Bug 15570522)" into lmp-dev 2014-08-11 18:20:32 +00:00
Winson Chung
f25268b402 Updating accessibility message for Recents activity. (Bug 15570522)
Change-Id: Iaaedb9a66b2160015b304863a00fbefdfb0e10ea
2014-08-11 11:58:32 -07:00
Winson Chung
448bb42c78 Merge "Tweaking empty recents text. (Bug 16711522)" into lmp-dev 2014-08-11 18:26:04 +00:00
Winson Chung
b1f749906f Initial changes to support swiping on the nav bar to switch affiliated tasks.
- Actual sideways animations to come once they've been finalized

Bug: 16846966
Change-Id: If6d40495498197a86a98f9b03f54ced3d2baf64a
2014-08-11 19:22:46 +00:00
Winson Chung
27b97fa098 Tweaking empty recents text. (Bug 16711522)
Change-Id: I338e2add6e4a46551ce7d52e873f332979b194e1
2014-08-11 19:17:34 +00:00
Deepanshu Gupta
b205fa602f Merge "Resolve color xml attributes properly." into lmp-dev 2014-08-11 18:14:57 +00:00
Deepanshu Gupta
99d90a6210 Resolve color xml attributes properly.
Color attributes were not being converted to int properly. The
conversion to int was a simple string to int using base 16. This change
resolves the colors as per #RGB, #ARGB, #RRGGBB or #AARRGGBB format
depending on the length of the attribute. All values that begin with '#'
are treated as colors.

Bug: http://b.android.com/73845
Change-Id: I8ad089b821af1e290b9b95771b50213fe2fdd784
2014-08-12 09:57:27 -07:00
Baligh Uddin
dc77ea411a Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-11 18:20:32 +00:00
Baligh Uddin
deb6799eee Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-12 04:17:55 +00:00
Baligh Uddin
becf634dd5 Import translations. DO NOT MERGE
Change-Id: I19b9647d1f535c00fbf17a3508e30dab5b3b3054
Auto-generated-cl: translation import
2014-08-11 13:11:54 -07:00
Baligh Uddin
10b363434b Import translations. DO NOT MERGE
Change-Id: I05a1dc49c04d92092723d84c7fdadf7e190b5476
Auto-generated-cl: translation import
2014-08-11 12:52:01 -07:00
Baligh Uddin
78f793f740 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-11 18:20:32 +00:00
Baligh Uddin
f8aaf710d9 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-12 04:17:55 +00:00
Baligh Uddin
170f785bbf Import translations. DO NOT MERGE
Change-Id: I70fade0a8a1cba8734874b955634c7296c9aaff7
Auto-generated-cl: translation import
2014-08-11 14:47:50 -07:00
Baligh Uddin
3cbd20935a Import translations. DO NOT MERGE
Change-Id: Ice9a22422396849c763e2fcc011567e2527c7556
Auto-generated-cl: translation import
2014-08-11 14:27:01 -07:00
RoboErik
1f7a39fee1 Merge "Fix registering global priority sessions" into lmp-dev 2014-08-11 18:20:32 +00:00
RoboErik
4d26598677 Fix registering global priority sessions
We were never setting a global priority session due to a change in
the way sessions were registered. This makes sure a global session
gets set correctly.

bug:16930866
Change-Id: I859846c9265e98bb1a37ff9d22808137e787ce18
2014-08-11 16:50:18 -07:00
Selim Cinek
f4a1635060 Merge "Fixed a bug where a notification had no background" into lmp-dev 2014-08-11 18:05:12 +00:00
Robin Lee
7e67871174 Clean up DevicePolicyManager CA certificate APIs
For consistency all CA-related methods now require the ComponentName
of a DeviceAdminReceiver as the first parameter. Updated javadoc for
this and added in some more detail about the methods in general as
well.

Created two new utility APIs,one to list all installed CAs and one to
remove all installed (user) CAs. Deleted old hasAnyCaCertsInstalled
method because it is now redundant.

@bug 16488006

Change-Id: I55eec17e01489ab323f8a0e68b11592605a7b740
2014-08-12 16:54:40 +01:00
Selim Cinek
23e6acbde2 Fixed a bug where a notification had no background
When tapping on a notification and then dragging down,
the notification had no background anymore

Bug: 16191184
Change-Id: I233a45744fc39ac3fcd9f533c8427354ab384709
2014-08-12 16:01:41 +02:00
George Mount
8d2ba6dac3 Merge "Pass elevation to enable shadow in shared elements." into lmp-dev 2014-08-12 04:17:55 +00:00
Sungsoo Lim
1681ac0b69 Add equals method of TvContentRating
Bug: 16963556
Change-Id: I09869d322fc2056ef1df5d2ca95891263646b46f
2014-08-12 22:48:28 +09:00
George Mount
26c82b6ed1 Pass elevation to enable shadow in shared elements.
Bug 15932772

Change-Id: Ia4cb89035244656a2dd24936bf0e36a5b7970ea6
2014-08-11 15:38:56 -07:00
Jaewan Kim
22f7c4769f Merge "Treat empty subrating as the same as null subratings." into lmp-dev 2014-08-11 19:46:21 +00:00
Jaewan Kim
d22e37acac Treat empty subrating as the same as null subratings.
Change-Id: Ic288c680c639ccba6cf593d1286776a6c891b726
2014-08-12 22:21:33 +09:00
Jeff Davidson
328e679b21 Merge "Security-related cleanup for network scoring." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Davidson
ac7285dc1e Security-related cleanup for network scoring.
-Perform additional checks for the SCORE_NETWORKS permission when
broadcasting scoring requests to the active scorer and when accepting
score updates. In theory, these checks are unnecessary as we manually
check package manager when obtaining the list of valid scorers, but
they cannot hurt to add.

-Fix multi-user. Since the active scorer is a global setting, we
ensure that scoring can only be done by apps available to the primary
user / owner of the phone, and that the request scores broadcast is
sent to that user's profile. When the scorer is changed, we send that
to all user profiles as it's just informational, although it's
unlikely that apps outside the primary user's profile would need to
respond.

Bug: 14117916
Bug: 16399238
Change-Id: Iaf06bda244eec730b590a30a3f4ffab4965bde96
2014-08-11 15:46:20 -07:00
Sungsoo Lim
8a22f0180f Merge "Add version attribute in tv_content_rating_system.xml" into lmp-dev 2014-08-11 19:46:21 +00:00
Sungsoo Lim
6219fa8b2d Add version attribute in tv_content_rating_system.xml
- 'version' attribute is added in 'rating-system-definitions' tag.
- Update javadoc for the format change of XML file in TvContentRating.
- Fix some errors in the javadoc comment.

Bug: 16805703
Change-Id: If9473c89cef0777232470d67f1542a5e5eac3182
2014-08-12 21:49:20 +09:00
Yuncheol Heo
e5910f70fc Merge "Use the system property for the HdmiControlService configuration." into lmp-dev 2014-08-11 19:42:53 +00:00
Yuncheol Heo
7d9acc7a3e Use the system property for the HdmiControlService configuration.
- We've used the system resoure overlay for this purpose, but we found
  that it's hard for OEM which uses PDK to override this.  Since the
  resource was already compiled and provided as a binary, so it's hard
  to change it.

Bug: 16965963
Change-Id: I868305d6f76c128d79c00ab6a8023656cd476c62
2014-08-12 15:55:52 +09:00
Wonsik Kim
05182b2d69 Merge "TIF: small refactoring around audio configuration update" into lmp-dev 2014-08-11 19:46:21 +00:00
Wonsik Kim
7587d298c9 TIF: small refactoring around audio configuration update
Bug: 16880310
Change-Id: Ic519ff0f67cb35a876784530d956fcf8cb7edbf7
2014-08-12 13:04:17 +09:00
Jinsuk Kim
302938e9b5 Merge "CEC: Fix two bugs" into lmp-dev 2014-08-11 19:46:21 +00:00
Jinsuk Kim
1f8d1c576f CEC: Fix two bugs
- <Routing Change> goes out with invalid parameter (F.F.F.F) for
  old path if the active source/path is not set. Should have been
  set to internal path (0.0.0.0)
- <User Control Pressed> was still sent when active source was not
  set. Fixed to discard it.

Bug: 16966486
Bug: 16965446
Change-Id: I5abb062be42c17514b3ed7ac930d7a3535fc9132
2014-08-12 15:47:19 +09:00
Jungshik Jang
54662165b5 Merge "Set active port path to HdmiControlService" into lmp-dev 2014-08-11 19:42:53 +00:00
Jungshik Jang
867b4e0c55 Set active port path to HdmiControlService
Set active port path to HdmiControlService so that the service
can handle proper event patch between cec and mhl devices.

Bug: 16215362
Change-Id: I2bd703916a422429b1029067fa3422e24de39274
2014-08-12 14:23:21 +09:00
Amit Mahajan
ff2efd5299 Revert "add apn setting parameters, and set apn parameters to bp"
This reverts commit 3fd217b3f492c95c8550da2a36fffbc6f3a3b724.

Change-Id: Icf32debc07b858c5ae2eb8a7bf4a6e95445a7466
2014-08-12 05:14:36 +00:00
Jinsuk Kim
502d8b3beb Merge "CEC: Make sure CEC switch info is always updated" into lmp-dev 2014-08-11 19:42:53 +00:00
Jinsuk Kim
bcfa0677d4 CEC: Make sure CEC switch info is always updated
The CEC switch information was not updated as expected if
Device Discovery action is in progress. Refactored to have the
update routine gets called regardless of the presence of action.

Conflicts:
	services/core/java/com/android/server/hdmi/HdmiCecLocalDeviceTv.java

Bug: 16931883
Change-Id: I629e8b646bef54599c1a706bf1c797ecebf8616b
2014-08-12 07:54:58 +09:00
Selim Cinek
bee465f9e1 Merge "Fixed a ordering bug with the notification shade" into lmp-dev 2014-08-11 18:41:55 +00:00
Selim Cinek
becf5e30ed Fixed a ordering bug with the notification shade
The dismiss view was not always guaranteed to be on the bottom,
which could lead to a weird hole.

Bug: 16900568
Change-Id: Ib46ec0011dcdd47a8f678b5e3f9756f6a128f286
2014-08-12 14:29:18 +02:00
Selim Cinek
4581cf8206 Fixed a jump in the stack scroller algorithm
The bottom stack jumped slightly when scrolling in landscape.

Bug: 16954513
Change-Id: I11ed9074cf5286b01f4f57ce37b4476c2ee9cd7e
2014-08-12 10:50:55 +00:00
Ihab Awad
6013583cb9 Merge "Fix incorrect connection ID for remote connection service" into lmp-dev 2014-08-11 18:20:32 +00:00
Ihab Awad
8aecfedb7b Fix incorrect connection ID for remote connection service
Also cleans up incidental issues including:
* Remote connection service disconnects from the service it
  represents if it is not currently handling any connections;
  hope to avert excessive service pinning in the future.
* Fix destroyed connection handling.

Bug: 16828152
Change-Id: Id4555f91ddac5e9c1a12ce00bfd1ee0d6d2cb1d9
2014-08-12 03:27:12 +00:00
Barnaby James
2bed283743 Merge "Fix VoiceInteractionService.isActiveService()." into lmp-dev 2014-08-11 18:14:57 +00:00
Jeff Sharkey
93f871126c Merge "Hack and ship: NetworkStats edition." into lmp-dev 2014-08-12 00:32:51 +00:00
Jeff Sharkey
eb2c2c790c Hack and ship: NetworkStats edition.
Some devices use clatd for catching raw IPv4 traffic when running on
a pure-IPv6 carrier network.  In those situations, the per-UID
stats are accounted against the clat iface, so framework users need
to combine both the "base" and "stacked" iface usage together.

This also means that policy rules (like restricting background data
or battery saver) need to apply to the stacked ifaces.

Finally, we need to massage stats data slightly:

-- Currently xt_qtaguid double-counts the clatd traffic *leaving*
the device; both against the original UID on the clat iface, and
against UID 0 on the final egress interface.

-- All clatd traffic *arriving* at the device is missing the extra
IPv6 packet header overhead when accounted against the final UID.

Bug: 12249687, 15459248, 16296564
Change-Id: I0ee59d96831f52782de7a980e4cce9b061902fff
2014-08-11 18:40:23 -07:00