Commit Graph

48957 Commits

Author SHA1 Message Date
Alan Viverette
3c8e3a96e9 Merge "Add popup theme for Spinner, use for actionBarPopupTheme default" 2015-01-15 22:50:26 +00:00
Alan Viverette
3355414b09 Merge "Allow views to be positioned relative to baseline-aligned views" 2015-01-15 22:48:59 +00:00
Alan Viverette
14af813940 Merge "Update radial time picker styling, clean up code" 2015-01-15 22:27:54 +00:00
Roozbeh Pournader
60f8df9339 am a601d44b: am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev
* commit 'a601d44baa4ff21d3888dd624c016dc07c5ff937':
  Fudge getRightPaddingOffset in TextView to match clipRect.
2015-01-15 22:17:35 +00:00
Scott Kennedy
db5fd42a03 Mark the root argument as @Nullable in LayoutInflater#inflate()
Change-Id: I174ff06268ece7a47ce22c98eb0377fa1b5a4a36
2015-01-15 11:56:33 -08:00
Scott Kennedy
069db2ae23 Merge "Add @Nullable annotation where necessary in Rfc822Token" 2015-01-15 19:52:28 +00:00
Roozbeh Pournader
a601d44baa am a4d1e250: am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev
* commit 'a4d1e25000195b2349cb29e389d1ded4b23dc7a6':
  Fudge getRightPaddingOffset in TextView to match clipRect.
2015-01-15 19:21:01 +00:00
Roozbeh Pournader
a4d1e25000 am 9787039d: Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev
* commit '9787039d91ad23805a1e73e1cd973b85295b85c2':
  Fudge getRightPaddingOffset in TextView to match clipRect.
2015-01-15 19:10:33 +00:00
Roozbeh Pournader
9787039d91 Merge "Fudge getRightPaddingOffset in TextView to match clipRect." into lmp-mr1-dev 2015-01-15 18:56:08 +00:00
Chet Haase
e1039c6f83 Merge "Add resource attributes for Keyframes and PropertyValuesHolders" 2015-01-15 18:53:36 +00:00
Scott Kennedy
adc6b85072 Add @Nullable annotation where necessary in Rfc822Token
Change-Id: I9b3088cbdfa09a8085b525674ff2540f23d4c96e
2015-01-15 10:50:31 -08:00
Raph Levien
a239ef91e5 Merge "Track TextView locale changes if not explicitly set" 2015-01-15 17:27:56 +00:00
Chet Haase
d430753cba Add resource attributes for Keyframes and PropertyValuesHolders
Issue #17939329 Expose multi-property and multi-keyframe capabilities in animation resources

Change-Id: I14822ced47665fa6cde4996f74d3078da2ada38a
2015-01-15 07:21:54 -08:00
Nicolas Prevot
a55e3ed8bf am 97c18827: am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
* commit '97c1882719437d4b4d8ce99d53ffc400975fdd5e':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
2015-01-15 12:50:29 +00:00
Nicolas Prevot
97c1882719 am 97f1ac01: am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
* commit '97f1ac016b6c116dc2964ba60ffe1e405578756a':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
2015-01-15 12:42:47 +00:00
Nicolas Prevot
97f1ac016b am a9f9c4b9: Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev
* commit 'a9f9c4b90a8af25974bc74971efeafa521073df2':
  Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING
2015-01-15 12:35:05 +00:00
Nicolas Prevot
a9f9c4b90a Merge "Fix javadoc for UserManager.KEY_RESTRICTIONS_PENDING" into lmp-mr1-dev 2015-01-15 12:28:13 +00:00
Dianne Hackborn
e6eb0772d6 am fce232b4: am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
* commit 'fce232b4080a12220821568ab670a0cdce4893c5':
  Fix issue android-app doc, bump battery stats checkin version
2015-01-15 04:57:52 +00:00
Christopher Tate
33194035a5 am 49138184: am 9568307c: am 43a4a8c7: Fix redundant file backups
* commit '49138184dee54357b1923f302e4b3fedd73ca34f':
  Fix redundant file backups
2015-01-15 04:30:34 +00:00
Chad Brubaker
f038345826 am b8794c76: Merge "resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
* commit 'b8794c76d677ef04c96b9edc002fe6e1f53022c7':
  Generate IKeystoreService using aidl
2015-01-15 03:45:12 +00:00
Dianne Hackborn
fce232b408 am 5a4b4084: am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
* commit '5a4b4084215b1efc5308c0c914185599b4d502bf':
  Fix issue android-app doc, bump battery stats checkin version
2015-01-15 01:52:21 +00:00
Dianne Hackborn
5a4b408421 am b96a6916: Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev
* commit 'b96a6916f657c4b3f5da7a5d2d8d32dee4d6167c':
  Fix issue android-app doc, bump battery stats checkin version
2015-01-15 01:42:35 +00:00
Christopher Tate
49138184de am 9568307c: am 43a4a8c7: Fix redundant file backups
* commit '9568307cf32c8abc6703dc7a1b0b0fee56c4f8f5':
  Fix redundant file backups
2015-01-15 01:39:29 +00:00
Dianne Hackborn
b96a6916f6 Merge "Fix issue android-app doc, bump battery stats checkin version" into lmp-mr1-dev 2015-01-15 01:38:23 +00:00
Mike Lockwood
dea9dbe631 Merge "MidiManager updates:" 2015-01-15 01:32:52 +00:00
Mike Lockwood
10024b3dc1 MidiManager updates:
MIDI ports are now implemented as file descriptors directly between the sender
and receiver, so the MidiService is no longer in the message path.

To facilitate the above, each port has its own file descriptor, rather than multiplexing
all ports on a device through a single socket.

Added a new class MidiDeviceServer, which is used by implementors of MIDI devices.
This replaces the MidiVirtualDevice class (which only was included in changes that were reviewed but never submitted).

The USB MIDI implementation has moved from the MIDI service to the USB service.
The USB MIDI implementation uses MidiDeviceServer as its interface, so we now have a common
interface for all MIDI device implementations.

Change-Id: I8effd1583f344beb6c940c3a24dbf20b477a6436
2015-01-14 16:51:54 -08:00
Christopher Tate
9568307cf3 am 43a4a8c7: Fix redundant file backups
* commit '43a4a8c777fbb8f71540ac7fbe82674489ef557b':
  Fix redundant file backups
2015-01-15 00:49:46 +00:00
Christopher Tate
43a4a8c777 Fix redundant file backups
We'd observed a bug in which an unchanged file was nevertheless
being redundantly transmitted for backup on every backup pass.
The underlying issue turns out to have been the FileBackupHelper
base implementation's logic for diffing the prior-state file
set against the current state, in the case when there had been
deletions of prior files.  In addition, there was also a
parallel bug in which file checksums were not calculated
properly in some cases, leading to at least one additional
redundant backup of the file in question.

Bug 18694053

Change-Id: Ie0dec06486b5fef4624561737019569c85d6b2a0
2015-01-14 16:36:30 -08:00
Roozbeh Pournader
7c0e7db67e Fudge getRightPaddingOffset in TextView to match clipRect.
A previous change (df68999dc7) adjusted
the clipRect slightly on the right side, but didn't adjust the
padding offset used in fading.

Bug: 18820846
Change-Id: I68c0918f914742d1e7b91f9ea8d5acbd41938233
2015-01-14 16:19:48 -08:00
Dianne Hackborn
0ee10f6d26 Fix issue android-app doc, bump battery stats checkin version
Issue #18983662: API Reivew: clarify Intent docs for URI_ANDROID_APP_SCHEME
Issue #19019830: Bump up battery stats checkin version

Change-Id: I0bd8f32b9d8d5978bd01d421ea2232d20def340a
2015-01-14 16:16:13 -08:00
Raph Levien
2e3aa445b4 Track TextView locale changes if not explicitly set
The locale in the Paint used by TextView is set at the time the view
is created. If the locale changes and the locale hasn't been explicitly
set, better behavior is "whatever the current locale is." This patch
updates the locale in that particular case.

Bug: 16274782
Change-Id: I3b1b8e77c9508c757543ea50de3590d254404c1e
2015-01-14 16:12:53 -08:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master.
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
2015-01-15 00:12:18 +01:00
Adrian Roos
4bc5b2bce9 Merge "LockPatternUtils clean up continued" 2015-01-14 22:32:08 +00:00
Chad Brubaker
29f4d9f9ea resolved conflicts for merge of 3d64a850 to lmp-mr1-dev-plus-aosp
Change-Id: Ieed2c2a3b9977c30bc5318317c91c29907aa1377
2015-01-14 13:51:45 -08:00
Adrian Roos
9dd16ebcf2 LockPatternUtils clean up continued
- Deprecate Settings.Secure.LOCK_PATTERN_ENABLED
- Remove unused permanent lock out
- Disallow empty/null arguments to saveLockPattern and saveLockPassword
- Refactor repeated quality checks

Change-Id: I6f369eb60f8f6bb1e33384cd06534c713ab52e79
2015-01-14 22:51:31 +01:00
Adrian Roos
dd6961d768 Merge "Explicitly specify user on LPU's private methods" 2015-01-14 20:49:13 +00:00
Adrian Roos
bb4bc22021 Merge "Directly dispatch USER_REMOVED to LockSettingsService" 2015-01-14 20:45:42 +00:00
Adrian Roos
0791e8fb30 Merge "Purge biometric weak and keyguard widgets" 2015-01-14 20:41:35 +00:00
Chad Brubaker
aa7a646eeb Merge "Generate IKeystoreService using aidl" 2015-01-14 20:31:29 +00:00
Alan Viverette
e1a65719af Allow views to be positioned relative to baseline-aligned views
Previously baseline alignment was handled as a separate pass after
normal bottom/top/etc. alignment, but this prevented views from being
laid out relative to baseline-aligned views.

BUG: 17938274
Change-Id: I5965110f012f3b27149b437ba3524cda84e9daf4
2015-01-14 12:30:04 -08:00
Nicolas Prevot
f23f355645 am 206d31f5: am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
* commit '206d31f598d499dd5a8659235afada35c3417f94':
  Make documentation for cross-profile intent filters clearer.
2015-01-14 19:24:16 +00:00
Alan Viverette
ec9fe1ad66 Update radial time picker styling, clean up code
Uses activation color for picker background. Removes bounce animation
when switching between hour and minute pickers. Improves touch handling
when touch moves outside the circle. Cleans up use of string in XML
where float should have been used. Fixes layout so that padding can be
adjusted.

Change-Id: Ibc8e087a83ca522272cdcd434b36cf38583bf541
2015-01-14 10:47:06 -08:00
Alan Viverette
34b064a140 Merge "Clean up TypedArray docs & formatting, remove coercion warnings" 2015-01-14 18:44:37 +00:00
Alan Viverette
b9ead4a915 Add popup theme for Spinner, use for actionBarPopupTheme default
Also adds methods for setting the context used to inflate drop-down
views in several adapters.

Bug: 17625714
Change-Id: Id267afa4901c1d46ceb3bc3b10fc642cea1799fe
2015-01-14 10:43:31 -08:00
Andres Morales
cb3fd69458 Check bootimage build fingerprint against vendor
Prevents image mismatch issues

Change-Id: Ibd972cbcedf1000bfe2a8ceed7696a229365dc25
2015-01-14 10:16:49 -08:00
Nicolas Prevot
206d31f598 am 42ebaa43: Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev
* commit '42ebaa434f95417cbf55ef6975fab7cb9d27ab3e':
  Make documentation for cross-profile intent filters clearer.
2015-01-14 13:38:21 +00:00
Nicolas Prevot
42ebaa434f Merge "Make documentation for cross-profile intent filters clearer." into lmp-mr1-dev 2015-01-14 13:33:13 +00:00
Wink Saville
691d9f9eaf am 657f9a68: am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '657f9a680fd1a82d83b7f8b7658388ea3456ee86':
  StateMachine.dump produces no output sometimes.
2015-01-14 12:06:22 +00:00
Wink Saville
657f9a680f am 1a6dd298: Merge "StateMachine.dump produces no output sometimes." into lmp-mr1-dev
* commit '1a6dd2985ef1eab036f6fc77cf723e3f12832e93':
  StateMachine.dump produces no output sometimes.
2015-01-14 11:59:41 +00:00
Nicolas Prevot
2c1c5dd5ef Make documentation for cross-profile intent filters clearer.
Explain why FLAG_MANAGED_CAN_ACCESS_PARENT and FLAG_PARENT_CAN_ACCESS_MANAGED
have these names.
Also do not mention the disambiguation list since there is not always a
disambiguation list shown when resolving cross-profile intent filters.

BUG:18962528

Change-Id: Ibbb9505dcab7cf17d87435eff2cef3e745e95209
2015-01-14 10:31:23 +00:00