9299 Commits

Author SHA1 Message Date
Baligh Uddin
5240aa49e2 Merge "Import translations. DO NOT MERGE" 2014-07-02 18:50:12 +00:00
Baligh Uddin
041628cea4 Import translations. DO NOT MERGE
Change-Id: Ie10265b48d7fce4ed1335fb6e6dbc33c260aa762
Auto-generated-cl: translation import
2014-07-05 13:36:45 -07:00
Adam Powell
e9414d922d ResolverActivity revisions, phase 1
* Switch to grid formatting for items to choose from.

* Format the grid at the bottom of the screen instead of in a formal
  dialog.

* Move to newer theming.

Change-Id: Ie1b23800b3a521570f9f62e4cdef620d3fb491d8
2014-07-05 18:28:24 -07:00
Nick Kralevich
948a4a08f1 am 569172e2: am aa4ff2ef: am eb822cec: Merge "Typo fix in permission string"
* commit '569172e2da1a550e64be16258bee1f332086e330':
  Typo fix in permission string
2014-07-05 16:33:23 +00:00
Nick Kralevich
569172e2da am aa4ff2ef: am eb822cec: Merge "Typo fix in permission string"
* commit 'aa4ff2efecb1aa03b6a6843bf8a4c19b885db4fc':
  Typo fix in permission string
2014-07-05 16:27:14 +00:00
Nick Kralevich
eb822cecdb Merge "Typo fix in permission string" 2014-07-03 01:32:01 +00:00
Selim Cinek
697178b124 Refactored the notification backgrounds
The background now only uses one specific drawable and emulating
the legacy behaviour by tinting. Notification backrounds are now
also a ripple drawable, giving feedback on click.

Bug: 15837646
Change-Id: Ia3b7dafebe2439cc56ed258264ef33b5b07faa69
2014-07-03 11:40:21 +00:00
Alan Viverette
dd6ebc5a72 Update progress bar styling and labelFor attr type
BUG: 16045463
BUG: 15900514
BUG: 15936901
Change-Id: Ib84e78cd3110d36f49ea5d9fc76a4321132af9ab
2014-07-03 01:47:06 +00:00
Alan Viverette
d1ed9b3ea7 Merge "Update dropdown background asset" 2014-07-02 18:17:00 +00:00
Alan Viverette
65b934dba5 Update dropdown background asset
BUG: 15985882
Change-Id: I9f271bf99371516bce5bad3e1c3f0efbedc8ffdd
2014-07-02 16:52:01 -07: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
Alan Viverette
396d485ba9 Merge "Add style for SearchView" 2014-07-02 18:17:00 +00:00
Alan Viverette
5dddb70b4e Add style for SearchView
BUG: 6420978
Change-Id: I31d9f7e66c2404388ccbe6d2e43a005deb0b7c25
2014-07-02 15:59:30 -07:00
Ido Ofir
12ea0d24a5 fixing i18n bug. b/15711200
Change-Id: I485859f6536c68f3d0d3e2d62c21a39705ba87b4
2014-07-02 13:51:01 -07: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
Alan Viverette
349a9bd760 Use shape drawable for button asset, enable shadows
BUG: 15316437
Change-Id: I8c2ddce50fcf8082c8ba01350606d6f344e03306
2014-07-01 23:32:12 +00:00
Jeff Davidson
b096bdceaf Add a SCORER_CHANGED broadcast.
Sent whenever the active network scorer is changed.

Bug: 16007033
Change-Id: Ib71e89e2cc98fa424db7e489445ec03edefb6880
2014-07-01 15:43:02 -07:00
ztenghui
dc3d9f1237 Merge "Make sure the indeterminate progress bar rotate correctly." 2014-07-01 19:15:58 +00:00
ztenghui
c8ffb0d3a5 Make sure the indeterminate progress bar rotate correctly.
Now the rotation is following a star pattern.

bug:16010534

Change-Id: I6c1b863d6a4e7b8bcb8621ffd4ad828628739d71
2014-07-01 14:14:48 -07:00
Hemant Gupta
8949bfb90c Bluetooth: Support MAP Client role on Bluedroid.
Implementation changes to support MAP client and PBAP client
role on Bluedroid stack.

Change-Id: I1733a67bf5256bd7b181bd5e68e40b476994ebfd
2014-07-01 18:01:27 +00:00
Ram
3e0e3bc617 MS: Adding Support for Emergency APN in Telephony Framework
(base/telephony)

Replacement for https://partner-android-review.googlesource.com/#/c/171175/

Change-Id: I16fc37f5c00ed79f2370bc46554fc7a24c52c4cb
Conflicts:
	core/java/android/net/ConnectivityManager.java
2014-07-01 02:00:51 +00:00
Shriram Ganesh
a0985d370a Config change to make emergency calls on ims always
Config value introduced to always place emergency calls on ims
irrespective of service state

Change-Id: If40fb8326d165f5b1093c77982ed9747cba596ca
2014-06-30 18:15:56 -07:00
Uma Maheswari Ramalingam
a8e9cf0989 Config change to skip hold before merge request
Config value introduced to skip apps sending
hold request before merge.
Vendor IMS solution will be responsible to do both.i.e.hold
followed by merge request.

Change-Id: I1aec0f95381d43b3f7f1704fce988f0796839c36

Conflicts:
	core/res/res/values/config.xml
	core/res/res/values/symbols.xml
2014-07-01 01:03:24 +00:00
Alan Viverette
20312a4825 Merge "Fix Material-themed alert dialog sizing" 2014-06-30 22:27:39 +00:00
Alan Viverette
f56ed2db00 Fix Material-themed alert dialog sizing
Also cleans up line width and final usage in AlertController.

BUG: 14904438
Change-Id: Idffa7a1c6edcf4a709ff6322d4bf95ce22d281ea
2014-06-30 15:57:44 -07:00
ztenghui
9e31cfa92c Merge "Use AnimatedVectorDrawable for progress bar." 2014-06-30 14:43:31 +00:00
ztenghui
9cb5b4c2d9 Use AnimatedVectorDrawable for progress bar.
Change-Id: I419197ef38a611757f27ca3192350ad4bd403875
2014-06-30 12:43:52 -07:00
ztenghui
66d3d8a09e Add string support for valueFrom/valueTo
b/15910407

Change-Id: I557e855f7d16e2eb0452d43ca6a672acdcae2071
2014-06-27 09:05:40 -07:00
Chet Haase
6c8fef7fb8 Avoid null-deref crashes in ScrollBarDrawable
Some of the code in ScrollBarDrawable automatically derefs
the horizontal and/or vertical thumb objects. The drawable can
sometimes be in a state where these objects are null, causing
a null deref. This fix simply avoids dereferencing null objects.

Also, fixed doc bug in attrs.xml for Transition tags.

Issue #13210554 Transition style documentation refers to 'move' instead of 'changeBounds'
Issue #15636059 ScrollBarDrawable crashes in setAlpha() and other methods when thumbs are null

Change-Id: I6664ba17dae0845de8a8658381ae6e9c9ef99214
2014-06-30 14:15:03 -07:00
George Mount
40868e198b Merge "Add curved motion to Transitions." 2014-06-26 23:40:51 +00:00
George Mount
ecd857be39 Add curved motion to Transitions.
Bug 15197527

Added two public PathMotions: PatternMotion and ArcMotion.
ArcMotion is the algorithm provided by UX. PatternMotion
provides a mechanism for using a Path as a pattern.

Change-Id: Ie57fd5f4e62269acc1164eced39853a12c52bd77
2014-06-30 19:25:04 +00:00
Alan Viverette
8510e28eb1 Merge "Remove unused radio button animation assets" 2014-06-26 23:40:51 +00:00
Alan Viverette
3ee9ed5509 Remove unused radio button animation assets
BUG: 15425820
Change-Id: I70924fa026bbb81422f6d1d57fa89b8be2f17d19
2014-06-30 12:31:32 -07:00
Selim Cinek
4e8b9ed30b Implemented new PIN unlock design
The pin unlock design was changed according to the spec
and new animations where introduced for the password field.

Bug: 13735707
Change-Id: I76f5e873bd0ea4f34ca3d2cd971223f0a83e2f28
2014-06-30 18:48:41 +00:00
Baligh Uddin
eb5b366411 Import translations. DO NOT MERGE
Change-Id: Ie9e0b56d87903d361e1a0384f51e32e39441ec7a
Auto-generated-cl: translation import
2014-06-30 14:35:37 +00:00
Baligh Uddin
46048fec8c Merge "Import translations. DO NOT MERGE" 2014-06-27 16:52:20 +00:00
Baligh Uddin
b282abcbf0 Import translations. DO NOT MERGE
Change-Id: Ida59c57e420b5e808d438fb1080bdf627c882bb1
Auto-generated-cl: translation import
2014-06-26 11:39:51 -07:00
John Spurlock
eb8d1be6ac Add a BIND_DREAM_SERVICE signature-level permission.
Starting in api 21, will be required to bind to a
declared dream or doze service.

Also added to aapt dump badging output.

Bug:15862654
Change-Id: Ifa0a594eeecf21e6146176c7810a847e1d08fe3b
2014-06-27 18:33:42 -04:00
George Mount
31e8005e06 Merge "Don't use overlay to transition ImageViews." 2014-06-27 15:56:14 +00:00
George Mount
2eb983be20 Merge "Activity Transitions: change default behavior." 2014-06-27 16:52:20 +00:00
George Mount
8885ac9518 Merge "Add IN/OUT flag for all Visibility transitions." 2014-06-26 17:57:04 +00:00
Alexandra Gherghina
aaec57d0ae Rename managed profile string
Bug: 15827349
Change-Id: I61b80171e7b6010f062d2e0bfa950b6b47858edf
2014-06-27 10:30:07 +01:00
George Mount
18ab79967c Add IN/OUT flag for all Visibility transitions.
Bug 15758206

Change-Id: If9b1871117a6808c87adc84ab9215b913ebd2704
2014-06-26 07:30:11 -07:00
George Mount
990205eada Don't use overlay to transition ImageViews.
Bug 15744992

MoveImage used an overlay to transition ImageViews. This
caused strange problems when ImageViews were contained in
other Views. The new ChangeImageTransform does a smooth
transition for changes in scale type and bounds.

Change-Id: Ia5021f4828f8f818a8699b3bdd38437aeba1cfc8
2014-06-25 13:45:16 -07:00
George Mount
abb63cb622 Activity Transitions: change default behavior.
Bug 15746767

The default for activity transitions with the material theme
should be to enable them when makeSceneTransitionAnimation is
used, but disable them when no ActivityOptions is used.

Change-Id: I4c777a72e4401b367e30b9ba971f7280646d5017
2014-06-24 07:01:27 -07:00
Adrian Roos
239d99c4d3 Merge "Trust Agents: Add lock now facility to global actions" 2014-06-24 06:38:28 +00:00
Adrian Roos
d4d6136eb3 Trust Agents: Add lock now facility to global actions
Change-Id: I732d7e989892081f6b53142953de71f90ec62d37
2014-06-26 01:54:53 +02:00
Baligh Uddin
8e27c6b20f Import translations. DO NOT MERGE
Change-Id: I4025ec551f09fb81735c85fab65d54cca7fe0835
Auto-generated-cl: translation import
2014-06-25 02:35:23 +00:00