150373 Commits

Author SHA1 Message Date
Jorim Jaggi
00fb8a80c8 Merge "Use simpler layout for auto-redacted notifications" into lmp-dev 2014-09-10 13:03:30 +00:00
Jorim Jaggi
c50ec62553 Merge "Inflate guts only when needed" into lmp-dev 2014-09-10 13:03:06 +00:00
Jorim Jaggi
b1cd3c1945 Inflate guts only when needed
This saves us a ton of views.

Bug: 17346296
Change-Id: I3eafd6703d19704dc8b108c1034266f38cf77f7b
2014-09-10 14:58:50 +02:00
Adrian Roos
c727fb1fc2 Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 2014-09-10 11:24:08 +00:00
Adrian Roos
f950641e28 Merge "Add system trust agents on first boot or when adding user" into lmp-dev 2014-09-10 11:23:38 +00:00
Kenny Guy
c8824b18c1 Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 2014-09-10 11:14:59 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Christoph Studer
b907affce2 Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 2014-09-10 11:14:08 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Yohei Yukawa
f8eef09622 Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 2014-09-10 08:29:31 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
2014-09-10 08:08:02 +00:00
Yohei Yukawa
443c2bafd8 Use public APIs to instantiate InputMethodSubtype
This is a groundwork for subsequent CLs that are
supposed to improve default input method selection
logics.

Historically we have had a @hide constructor of
InputMethodSubtype. However, this contructor is
a bit obsolete because we can not specify some
parameters that were added in recent platform
releases. We should use InputMethodSubtypeBuilder
instead.

BUG: 17347871
Change-Id: I72ad79682a58344e14380eb20e26edf98aee37cd
2014-09-10 15:42:14 +09:00
Vinit Deshpande
a0000c6c3c Merge "Secure access to WifiScanner" into lmp-dev 2014-09-10 06:34:25 +00:00
Zhijun He
350f2552e4 Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 2014-09-10 05:12:28 +00:00
Eric Rowe
5fea53d085 Merge "Allow protected wifi in connectivity tests" into lmp-dev 2014-09-10 02:43:23 +00:00
Lajos Molnar
2c5afa320e Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 2014-09-10 02:38:50 +00:00
Eric Rowe
86e15557c5 Allow protected wifi in connectivity tests
Change-Id: I31285572f90bfb46cc28fb04e79cb9b407477a7d
2014-09-09 19:25:55 -07:00
Robert Shih
8c4d53c3a9 MediaPlayer/SubtitleController:fix add/select timed text on start
- scan internal tracks when necessary
 - fix overflow in addTimedTextSource
 - do not hide timed text track in doSelectDefaultTrack; i.e. apply
   hiding logic to subtitle tracks only
 - do not notify stop in scheduleUpdate; it will be fired in onStopped
   if necessary

Bug: 17323221
Change-Id: I485f7d9197d10562fbd58d0afe5e9aa4cf610f1a
2014-09-10 01:33:17 +00:00
Alan Viverette
cd7955f66c Merge "Improve dialog padding when title or body text are missing" into lmp-dev 2014-09-10 01:27:57 +00:00
Alan Viverette
e809b11bc1 Improve dialog padding when title or body text are missing
BUG: 17446820
Change-Id: I20ace8660da90e6722e55978a3ce49eeafcd1220
2014-09-09 18:24:52 -07:00
Eric Laurent
0fd9d8a2c8 Merge "SoundTriggerHelper: handle media server death" into lmp-dev 2014-09-10 00:53:00 +00:00
Junda Liu
13e28bb938 Add ForSubscriber suffix to APIs w/ subId argument.
Bug: b/17255752
Change-Id: I142d8961aa4c1fa074833f70c404c955caea0870
2014-09-09 17:50:09 -07:00
Dianne Hackborn
d5adbec527 Merge "Fix build." into lmp-dev 2014-09-10 00:40:55 +00:00
Dianne Hackborn
f5cc3644f6 Fix build.
Change-Id: I92eabc35168acfe58641917179be0d90a14f2f11
2014-09-09 17:38:34 -07:00
Lajos Molnar
d7e5f680fa MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
Bug: 17059255
Change-Id: I9f5f0be61e94795d90ad29e94b3a1a6e6aedfb1d
2014-09-09 17:27:26 -07:00
Eric Laurent
2475e38c10 SoundTriggerHelper: handle media server death
Retry to attach sound trigger module when startRecognition() is called.

Bug: 17373746.
Change-Id: I5b2f806b6cab47741d345be1cde73a84f5a62590
2014-09-09 17:26:00 -07:00
Amit Mahajan
f14fb34292 Merge "Support to load default voicemail number from the configuration." into lmp-dev 2014-09-10 00:23:50 +00:00
wsmlby
e12c6f7d54 Merge "Fix AppCompatibility test for different process name of one package." into lmp-dev 2014-09-10 00:21:27 +00:00
Jinsuk Kim
109526fe4f Merge "CEC: Stub MHL Controller" into lmp-dev 2014-09-10 00:16:15 +00:00
Xia Ying
b9515f9c44 Support to load default voicemail number from the configuration.
If there is no preload VM number in the sim card, carriers such as
Verizon require to load a default vm number from the configurantion.
Define config_default_vm_number for this purpose. And there are two
optional formats for this configuration, example as below:
(1)<item>voicemail number</item>
(2)<item>voicemail number;gid</item>

Bug: 17209959
Change-Id: Ia4e78ad7265e73bb4e4a823dbaeb606935d39f46
2014-09-10 00:11:23 +00:00
Robert Ly
fb04057bf6 am 0cb4c738: am 9f60bc3f: am 52a18161: docs: update api dashboard for september
* commit '0cb4c738fba92671dc3a1a75917259f09532a9e4':
  docs: update api dashboard for september
2014-09-10 00:02:31 +00:00
Jeff Tinker
b00ab012bf Merge "Add support for max-res decode" into lmp-dev 2014-09-09 23:56:11 +00:00
Robert Ly
0cb4c738fb am 9f60bc3f: am 52a18161: docs: update api dashboard for september
* commit '9f60bc3f129037f2f1b05a09902c8e97d66322f3':
  docs: update api dashboard for september
2014-09-09 23:51:10 +00:00
Adam Lesinski
732edf098f Merge changes I79ba54d7,I224fb4b6 into lmp-dev
* changes:
  Make UsageStats API default on only for the system
  ActivityManager shouldn't return null for getCurrentUser
2014-09-09 23:50:04 +00:00
Robert Ly
9f60bc3f12 am 52a18161: docs: update api dashboard for september
* commit '52a1816180c7a85b13c543a5cdb6a7506cb8f01d':
  docs: update api dashboard for september
2014-09-09 23:40:51 +00:00
Tsuwei Chen
98ff7bce66 Merge "Move carrier-specific GPS parameters out of framework/base directory. Bug: 17288144" into lmp-dev 2014-09-09 23:29:14 +00:00
Robert Ly
52a1816180 docs: update api dashboard for september
Change-Id: Icae4efd0729b61c0f6c1850da641bc065bc12122
2014-09-09 16:28:08 -07:00
Zhijun He
b67c3102c9 CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
Bug: 17059255
Change-Id: Ic6b272e4ceec8fc852c9eb787370f4d366dad0ac
2014-09-09 16:19:10 -07:00
Adam Lesinski
e7ad74f070 Merge "AAPT: Don't crash on illegal symbol name" into lmp-dev 2014-09-09 23:15:08 +00:00
wsmlby
dd806b0ed3 Fix AppCompatibility test for different process name of one package.
Change-Id: Ic30e5ee81fe6ea82e88d2c5541dc9fa9eba71043
2014-09-09 16:10:12 -07:00
Adam Lesinski
3fb8c9b50e AAPT: Don't crash on illegal symbol name
We never checked the return value when adding a nested
symbol, which would be NULL if the symbol name was invalid.

External bug: https://code.google.com/p/android/issues/detail?id=75876

Change-Id: I5211f4d4b87897d52f2b6e5907113d31930bb92d
2014-09-09 16:05:10 -07:00
Alan Viverette
a7cbaeb138 Merge "Bring up the IME when TextView receives ACTION_CLICK" into lmp-dev 2014-09-09 22:58:28 +00:00
Adam Powell
ad0c450d4d Merge "ActionMenuViews always reserve overflow when creating their own menus" into lmp-dev 2014-09-09 22:56:20 +00:00
Christopher Tate
363c408af5 Merge "Fix BackupManager.isBackupEnabled()" into lmp-dev 2014-09-09 22:51:27 +00:00
Winson Chung
ee44595bd5 Announcing the task list as you scroll. (Bug 15699050)
Change-Id: I7453f41a2c87241e538cdc7281cdc20a8710ebbb
2014-09-09 22:50:01 +00:00
Winson Chung
8a8d9611e2 Fixing issue with Recents showing blank. (Bug 16987565) 2014-09-09 22:49:24 +00:00
Winson Chung
e5c06a6431 Fixing issue with touch events not being forwarded to task switch fling detector. (Bug 16656169)
Change-Id: Id8f96455f6e11a13a8ac12d341464bca4419d7c5
2014-09-09 22:49:04 +00:00
Winson Chung
3aa9c221c0 Adding task switching animation xmls for further tweaking. (Bug 16656169)
Change-Id: I472116cb3d86a3f90a935b2a3ac058ffc2ac1b5d
2014-09-09 22:48:19 +00:00
Winson Chung
7937fdb341 Fixing weird highlight on dismiss button ripple. (Bug 17420495)
Change-Id: I769c0647417efeda9b39913c01c62be0d6ff7887
2014-09-09 22:47:43 +00:00