OSDN Git Service
Aga Wronska [Tue, 2 Feb 2016 23:46:12 +0000 (23:46 +0000)]
Merge "Add tests for action bar's search icon behavior - Icon hidden when root doesn't support search - Icon visible whan root supports search"
Tao Bao [Tue, 2 Feb 2016 23:41:08 +0000 (23:41 +0000)]
Merge "Condionally remove the block map file."
Chong Zhang [Tue, 2 Feb 2016 23:31:38 +0000 (23:31 +0000)]
Merge "Don't clear mExiting if window is going to be removed."
Yin-Chia Yeh [Tue, 2 Feb 2016 23:23:35 +0000 (23:23 +0000)]
Merge "Camera2: Legacy: fix legacy device CTS failures"
Filip Gruszczynski [Tue, 2 Feb 2016 23:11:39 +0000 (23:11 +0000)]
Merge "Don't extend alert windows onto status bar/nav bar."
Carlos Valdivia [Tue, 2 Feb 2016 20:20:42 +0000 (20:20 +0000)]
Revert "Permissions: Get rid of GET_ACCOUNTS"
This reverts commit
918c55a67c2bf0cec79f75dec6ca468e914a5fd1.
Change-Id: I995f134336bf61ac1f21052355900ae89d0d6694
Makoto Onuki [Tue, 2 Feb 2016 22:55:48 +0000 (22:55 +0000)]
Merge "DO / PO Shouldn't be removed as active admin..."
Selim Cinek [Tue, 2 Feb 2016 22:54:15 +0000 (22:54 +0000)]
Merge "RTL for NotificationHeader now working correctly."
Makoto Onuki [Thu, 28 Jan 2016 22:44:18 +0000 (14:44 -0800)]
DO / PO Shouldn't be removed as active admin...
even if they asked.
Also clear(Device|Profile)Owner should remove them as the active admin
too.
Also add some more unit tests.
Bug
26858840
Change-Id: I7b3ed92e1b4cbe803381ed6e3f64d8de17b2ebb0
Junda Liu [Wed, 20 Jan 2016 07:20:15 +0000 (23:20 -0800)]
Add strings/setting for carrier app install dialog.
Bug: b/
22863855
Change-Id: I34e2ff5997e14afe70a64edb055dc876e26d7946
Hall Liu [Tue, 2 Feb 2016 22:32:58 +0000 (22:32 +0000)]
Merge "Remove check for missing parent calls"
Chong Zhang [Tue, 2 Feb 2016 22:13:48 +0000 (14:13 -0800)]
Don't clear mExiting if window is going to be removed.
bug:
26819496
Change-Id: I7ab1f45f8d32bc086ded579b46b6b5e9b32771a0
Michael Lentine [Tue, 2 Feb 2016 21:57:20 +0000 (21:57 +0000)]
Merge "Fix activity thread."
Paul Lawrence [Tue, 2 Feb 2016 21:54:03 +0000 (21:54 +0000)]
Merge "Add APIs to allow detection of encryption type"
Ben Kwa [Tue, 2 Feb 2016 21:36:39 +0000 (21:36 +0000)]
Merge "Refactor key handling and selection."
Chris Tate [Tue, 2 Feb 2016 21:34:39 +0000 (21:34 +0000)]
Merge "Start the sync job service after primary boot"
Ben Kwa [Tue, 2 Feb 2016 21:17:18 +0000 (21:17 +0000)]
Merge "Add a config file for linting."
Christopher Tate [Tue, 2 Feb 2016 20:46:18 +0000 (12:46 -0800)]
Start the sync job service after primary boot
This avoids starting the "timeout?" clock until the system's main looper
thread is ready to actually process service startup, avoiding spurious
ANR reports.
Bug
26922408
Change-Id: I8fd3f20e4af644a933f1318e623096b73c7e8e08
Julia Reynolds [Tue, 2 Feb 2016 20:43:28 +0000 (20:43 +0000)]
Merge "Don't require apps to call showLights to use default lights."
Winson Chung [Tue, 2 Feb 2016 20:28:14 +0000 (20:28 +0000)]
Merge changes Idedf0045,Iae107a1b,Id798cc39
* changes:
Tweaking enter from/exit to home animations.
Allow animation controls for each animated property.
Fixing regression in animation of drag task.
Winson [Tue, 2 Feb 2016 02:04:59 +0000 (18:04 -0800)]
Tweaking enter from/exit to home animations.
Change-Id: Idedf00457055b6f0268c0f93a0a14c6a553e1168
Winson [Mon, 1 Feb 2016 22:27:52 +0000 (14:27 -0800)]
Allow animation controls for each animated property.
- Using onDrawForeground() instead of dispatchDraw()
Change-Id: Iae107a1ba14250f8c496264c60a29edc76df88e2
Winson [Mon, 1 Feb 2016 22:05:29 +0000 (14:05 -0800)]
Fixing regression in animation of drag task.
- Should be ignoring the drag task, caused by a bad merge in ag/854463.
- Preventing relayout when picking up a new task view. This issue
caused the task view to be relaid out mid-drag if the animation in the
stack causes a new TaskView to be picked up from the pool (ie. when
dragging immediately after starting recents from scratch)
Change-Id: Id798cc39216d7ccbaa106c687aa0a518e7d5155f
Julia Reynolds [Tue, 2 Feb 2016 20:11:59 +0000 (15:11 -0500)]
Don't require apps to call showLights to use default lights.
Bug:
26810573
Change-Id: I431a1a18e32c616238e763b401b5f6b14131fd89
Julia Reynolds [Tue, 2 Feb 2016 19:44:55 +0000 (19:44 +0000)]
Merge "Allowing querying for apps with blocked topics."
Rubin Xu [Tue, 2 Feb 2016 19:42:12 +0000 (19:42 +0000)]
Merge "Call SecurityLog methods via Injector"
Chulwoo Lee [Tue, 2 Feb 2016 18:54:48 +0000 (18:54 +0000)]
Merge "Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode""
Chulwoo Lee [Tue, 2 Feb 2016 18:34:58 +0000 (18:34 +0000)]
Revert "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"
This reverts commit
a6130cee3ac9ed8648be005adcf217cf4426defc.
Change-Id: Id3d5ec0ca35bbd8e0b28b2b0dd936078b5da93d6
Ben Kwa [Wed, 27 Jan 2016 17:58:36 +0000 (09:58 -0800)]
Refactor key handling and selection.
- Pull key handling code out of the MultiSelectManager.
- Tighten up the semantics around range selection:
- Create an API on MultiSelectManager for handling multi-select.
- Make the range selection more opinionated (e.g. more state checks),
to simplify the design and code.
BUG=
25195767
Change-Id: I4bbe446ed3059150499db3d28e581b2e68405266
Zach Kuznia [Tue, 2 Feb 2016 18:31:35 +0000 (18:31 +0000)]
Merge "Make AccessibilityGestureDetector handle gesture detection start and end."
Geoff Mendal [Tue, 2 Feb 2016 18:25:49 +0000 (18:25 +0000)]
Import translations. DO NOT MERGE am:
34affa2303 -s ours am:
39c8547b5e -s ours
am:
556931fe58 -s ours
* commit '
556931fe58b57895d351ddeea8355cfdbc1ae669':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 18:19:18 +0000 (18:19 +0000)]
Import translations. DO NOT MERGE am:
34affa2303 -s ours
am:
39c8547b5e -s ours
* commit '
39c8547b5ebb9cfa7a05e788f43eaa77d9de1241':
Import translations. DO NOT MERGE
Abhijith Shastry [Tue, 2 Feb 2016 18:19:06 +0000 (18:19 +0000)]
Merge "Add API in TelecomService to manage blocked numbers."
Geoff Mendal [Tue, 2 Feb 2016 18:16:26 +0000 (18:16 +0000)]
Import translations. DO NOT MERGE
am:
34affa2303 -s ours
* commit '
34affa2303e959275eb66d91e2a416d7a69fc520':
Import translations. DO NOT MERGE
Chong Zhang [Tue, 2 Feb 2016 18:10:18 +0000 (18:10 +0000)]
Merge "Transfer focus from the current focused window for two-finger scroll"
Geoff Mendal [Tue, 2 Feb 2016 18:09:58 +0000 (10:09 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
26887781
Change-Id: I2f77e533633815badf267419addb9d5f7686a200
Anna Galusza [Tue, 2 Feb 2016 18:09:21 +0000 (18:09 +0000)]
Merge "Fix breakage due to incomplete name change."
Ben Kwa [Tue, 2 Feb 2016 18:07:15 +0000 (10:07 -0800)]
Add a config file for linting.
Change-Id: Ic76e8ea1cd2277c2cc1cf9588410bc142378f8a0
Anna Galusza [Tue, 2 Feb 2016 18:06:05 +0000 (10:06 -0800)]
Fix breakage due to incomplete name change.
Change-Id: Ief02bd4a994a4ff3a571fedfead05c732043500d
Adam Powell [Tue, 2 Feb 2016 18:02:17 +0000 (18:02 +0000)]
Merge "Pinning components in ChooserActivity, take 2"
Rubin Xu [Tue, 2 Feb 2016 18:00:28 +0000 (18:00 +0000)]
Call SecurityLog methods via Injector
This is to make sure the unit test can mock them out.
Bug:
26911599
Change-Id: I07a1a8b43ad5716a4b667bc5266b3b03997268c5
Julia Reynolds [Tue, 2 Feb 2016 15:24:30 +0000 (10:24 -0500)]
Allowing querying for apps with blocked topics.
Bug:
26882239
Change-Id: If888cb18891a412067bcb28e575f502c6091f77a
Tyler Gunn [Tue, 2 Feb 2016 17:46:46 +0000 (17:46 +0000)]
Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
am:
8562fb281c
* commit '
8562fb281c37656d9198e6890f5c10e3541f6167':
Add new telephony disconnect cause for video calls when tty enabled.
Tyler Gunn [Tue, 2 Feb 2016 17:42:39 +0000 (17:42 +0000)]
Merge "Add new telephony disconnect cause for video calls when tty enabled." into mm-wireless-dev
Anna Galusza [Tue, 2 Feb 2016 17:36:37 +0000 (17:36 +0000)]
Merge "Allow the drawer to not be shown."
Steve McKay [Tue, 2 Feb 2016 17:29:04 +0000 (17:29 +0000)]
Merge "Decouple SD card from ADVANCED storage toggle."
Steve McKay [Sat, 30 Jan 2016 02:15:39 +0000 (18:15 -0800)]
Decouple SD card from ADVANCED storage toggle.
A variety of related fixes:
- don't force size enable when browsing from device mounted notifications.
- don't show settings menu item as action (put in overflow).
- add sd card icon (not quite yet used, need to suss that out).
Bug:
26880985,
26883578,
26771127
Change-Id: I36f153c42217f8092f157ded2a756c02525593ab
Adam Powell [Fri, 29 Jan 2016 18:21:00 +0000 (10:21 -0800)]
Pinning components in ChooserActivity, take 2
Keep the ChooserActivity in the android:ui process/system.
Change-Id: Ia3ae29a8d629f41a53a066b9fc7ed0b28666b261
Philip P. Moltmann [Tue, 2 Feb 2016 16:36:36 +0000 (16:36 +0000)]
Merge "Also search in description when filtering printers."
Philip P. Moltmann [Tue, 2 Feb 2016 16:34:49 +0000 (16:34 +0000)]
Merge "Allow the PDF Printer to "print" non-locale-default paper sizes."
Geoff Mendal [Tue, 2 Feb 2016 16:29:40 +0000 (16:29 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
ef9f2cbc84 -s ours am:
2335415569 -s ours
am:
1fa556d558 -s ours
* commit '
1fa556d5581b9d2ce316099634dce272737602a9':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:26:10 +0000 (16:26 +0000)]
Import translations. DO NOT MERGE am:
3dab749b31 -s ours am:
21890da2d8 -s ours
am:
3fc87906b7 -s ours
* commit '
3fc87906b76c3aabe0e09f21db65d56ccb4f235a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:21:50 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev am:
ef9f2cbc84 -s ours
am:
2335415569 -s ours
* commit '
23354155699fb1638ae1c4d5d8600200123d6dc5':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:21:48 +0000 (16:21 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev am:
a0cf483a13 -s ours
am:
c7a9540eaa -s ours
* commit '
c7a9540eaa8e59ac98600c446278ed336285477a':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:20:17 +0000 (16:20 +0000)]
Import translations. DO NOT MERGE am:
3dab749b31 -s ours
am:
21890da2d8 -s ours
* commit '
21890da2d808386ec7e8b322f8f033a0b63906d1':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:19:45 +0000 (16:19 +0000)]
Import translations. DO NOT MERGE am:
1aa5b7517d -s ours
am:
2eefc8f648 -s ours
* commit '
2eefc8f6485603a0329a09b02ee0783a361677e5':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:16:48 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
am:
a0cf483a13 -s ours
* commit '
a0cf483a133ad4a0b8c680b1da196266be65150e':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:16:45 +0000 (16:16 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am:
ef9f2cbc84 -s ours
* commit '
ef9f2cbc843c580f6de12aed0a94aeeeadb85ac7':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:14:23 +0000 (16:14 +0000)]
Import translations. DO NOT MERGE
am:
1aa5b7517d -s ours
* commit '
1aa5b7517d55d1c9d43ad5474da238aa3c14a885':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:12:16 +0000 (16:12 +0000)]
Import translations. DO NOT MERGE
am:
3dab749b31 -s ours
* commit '
3dab749b317485bbee345e08cebf91e9ac80b59d':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 2 Feb 2016 16:09:01 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
Geoff Mendal [Tue, 2 Feb 2016 16:04:49 +0000 (16:04 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr2-dev
Geoff Mendal [Tue, 2 Feb 2016 16:03:45 +0000 (08:03 -0800)]
Import translations. DO NOT MERGE
Change-Id: I125fdf9cff416791a54d42450e6ef63ffec48a6f
Auto-generated-cl: translation import
Andreas Gampe [Tue, 2 Feb 2016 16:01:11 +0000 (16:01 +0000)]
Merge "Frameworks/base: Add A/B OTA preopting"
Geoff Mendal [Tue, 2 Feb 2016 16:00:13 +0000 (17:00 +0100)]
Import translations. DO NOT MERGE
Change-Id: If53700bcc5370eda1b87001b00f039a4d5fa016a
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:57:06 +0000 (07:57 -0800)]
Import translations. DO NOT MERGE
Change-Id: I491375fe7c3f4bafb6a310830c12cd1459072670
Auto-generated-cl: translation import
Geoff Mendal [Tue, 2 Feb 2016 15:54:58 +0000 (16:54 +0100)]
Import translations. DO NOT MERGE
Change-Id: If918aa7c054de6b991dbce81ec459d7ca88dc71b
Auto-generated-cl: translation import
Ritesh Reddy [Tue, 2 Feb 2016 14:18:23 +0000 (14:18 +0000)]
Merge "Constrained allowable backup versions"
Narayan Kamath [Tue, 2 Feb 2016 12:08:20 +0000 (12:08 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 12:03:53 +0000 (12:03 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:55:59 +0000 (11:55 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:55:34 +0000 (11:55 +0000)]
Narayan Kamath [Tue, 2 Feb 2016 11:54:01 +0000 (11:54 +0000)]
Track libcore change
f35c08530f77a744646e6e988d330a68f3af6940.
Change-Id: I53bb912e7b7d6510952da8b121402628fa3f922d
Ritesh Reddy [Tue, 2 Feb 2016 11:42:26 +0000 (11:42 +0000)]
Constrained allowable backup versions
Constrained the version on an incoming backup set
to the highest version that the SettingsBackupAgent
can handle. This is to deal with either corrupted backup
sets or newer backup sets (when modifiying/downgrading the
SettingsBackupAgent).
Change-Id: I4d666e8d4541c0b86e656a73744837d03318c4ae
Narayan Kamath [Tue, 2 Feb 2016 11:40:12 +0000 (11:40 +0000)]
Track libcore change
fe6fe17d1ca75ee039df7ab93314f3f1e068794f.
Change-Id: Ib0e5efc903fe522fb2bc314b9000a26e90a4ea57
Victor Chang [Tue, 2 Feb 2016 11:02:07 +0000 (11:02 +0000)]
Merge "Fix that can't launch managed QuickContact in ContactSearch"
Daichi Hirono [Tue, 2 Feb 2016 10:14:27 +0000 (10:14 +0000)]
Merge "Mount appfuse in process namespace."
Narayan Kamath [Tue, 2 Feb 2016 09:41:12 +0000 (09:41 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC" am:
21b2b7306e
am:
7b33488e12
* commit '
7b33488e124bbe2a9fcfa6cd7a78726bc932ac8b':
Alarm: add missing closedir after opendir when searching for RTC
Narayan Kamath [Tue, 2 Feb 2016 09:36:55 +0000 (09:36 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
am:
21b2b7306e
* commit '
21b2b7306e7d0612cdcb90eaa8102b6a7fa3f130':
Alarm: add missing closedir after opendir when searching for RTC
Narayan Kamath [Tue, 2 Feb 2016 09:31:04 +0000 (09:31 +0000)]
Merge "Alarm: add missing closedir after opendir when searching for RTC"
Mykola Kondratenko [Mon, 18 Jan 2016 11:43:30 +0000 (12:43 +0100)]
Alarm: add missing closedir after opendir when searching for RTC
It is mandatory that closedir() is called to deallocate DIR structure
allocated by opendir().
Fix degrade introduced by Google commit
0eb58268.
Change-Id: Ia12154f7f822153b4fc8e6bfb8b2bae17bc45c1a
Jiabin Huang [Tue, 2 Feb 2016 09:22:02 +0000 (09:22 +0000)]
Merge "TIF: Improve android.media.tv.TvContract.Programs.Genres#decode"
Jiabin Huang [Tue, 2 Feb 2016 08:09:05 +0000 (17:09 +0900)]
TIF: Improve android.media.tv.TvContract.Programs.Genres#decode
test results:
random string(1000 channels) decode 1000 times on Nexus Player
6.8 seconds => 1.4 seconds
Bug:
23307587
Change-Id: If309b0819d705d791c8fa9b177e6d2bd0019102e
Jaewan Kim [Tue, 2 Feb 2016 07:46:36 +0000 (07:46 +0000)]
Merge "PIP: Implement the initial version of onboarding screen"
Abhijith Shastry [Tue, 2 Feb 2016 00:39:38 +0000 (16:39 -0800)]
Add API in TelecomService to manage blocked numbers.
BUG:
26917087
Change-Id: I0c13665849994eca28009ed35ba8b13c3585a5ff
Erik Kline [Tue, 2 Feb 2016 04:07:58 +0000 (04:07 +0000)]
Support static IP configuration internally
am:
1e91e4ebb6
* commit '
1e91e4ebb65e63969e6ae45503257852be017aee':
Support static IP configuration internally
Zachary Kuznia [Thu, 21 Jan 2016 21:24:47 +0000 (13:24 -0800)]
Make AccessibilityGestureDetector handle gesture detection start and end.
Change-Id: I2c1861d5d6c5c0dc921e62f03ee6283f1f7a62b6
Jaewan Kim [Wed, 20 Jan 2016 10:21:08 +0000 (19:21 +0900)]
PIP: Implement the initial version of onboarding screen
Redlines and assets will be applied later.
Bug:
26676479
Change-Id: I1a42fad0b918681c64ae84abb1bff8fac3289004
Casey Burkhardt [Tue, 2 Feb 2016 02:47:20 +0000 (02:47 +0000)]
Merge "Exposes accessibility importance on AccessibilityNodeInfo"
Michael Lentine [Tue, 2 Feb 2016 02:44:34 +0000 (20:44 -0600)]
Fix activity thread.
Fix activity thread to not call into the threaded renderer if it is
an isolated process.
Change-Id: I57035f5ff64d134866f9d2e19c60ab99657aea64
Sungsoo Lim [Tue, 2 Feb 2016 02:23:11 +0000 (02:23 +0000)]
Merge "MediaBrowserUtils: Fix NPE"
Sungsoo Lim [Tue, 2 Feb 2016 01:42:47 +0000 (10:42 +0900)]
MediaBrowserUtils: Fix NPE
Bug:
26910471
Change-Id: I134516f6318c34cc5dfdcf04438e6ba00b843607
Tim Murray [Tue, 2 Feb 2016 02:13:33 +0000 (02:13 +0000)]
Merge "Add specific category for TOP_APP in ActivityManager."
Chong Zhang [Tue, 2 Feb 2016 01:54:09 +0000 (17:54 -0800)]
Transfer focus from the current focused window for two-finger scroll
When doing the two-finger scroll, we resize based on the main window.
However, the main window might not have focus (eg. diaglog displayed
on top). We need to grab focus from the window that actually has focus.
bug:
26604036
Change-Id: I05d0ed95c59901c925e242d4b9a856d1ca0a55f3
Hyungtae Kim [Tue, 2 Feb 2016 01:41:48 +0000 (01:41 +0000)]
Merge "Rename instr argument 'repeat' to 'iterations'"
Aga Wronska [Mon, 1 Feb 2016 20:23:48 +0000 (12:23 -0800)]
Add tests for action bar's search icon behavior
- Icon hidden when root doesn't support search
- Icon visible whan root supports search
Bug:
26903635
Change-Id: I7a73d44e83c87be7d25abe55477fa54572833e32
Ryan Bavetta [Tue, 2 Feb 2016 00:53:56 +0000 (00:53 +0000)]
Merge "Allow Generic SoundTrigger Models"
Chong Zhang [Tue, 2 Feb 2016 00:35:41 +0000 (00:35 +0000)]
Merge "Do not draw background if the background drawable is null"
Tao Bao [Tue, 2 Feb 2016 00:08:18 +0000 (16:08 -0800)]
Condionally remove the block map file.
We used to unconditionally remove the block map file on boot. Because
the package might be half-way uncrypt'd in a corrupt state. CL in [1]
changes uncrypt to ensure that block.map only gets created at the end of
a successful uncrypt. So we can change to keep the fully uncrypt'd
package and the block map. This is to reduce the work for GmsCore to
avoid re-downloading everything again.
[1]: commit
25dd0386fe69460cd1d39de116197dd2c7bf9ec2.
Bug:
26883096
Change-Id: I58ca22064141bf5d42fa48146a980712c8ce21d9
Sungsoo Lim [Tue, 2 Feb 2016 00:14:04 +0000 (00:14 +0000)]
Merge "MediaBrowser: Minor fixes"
OSDN Git Service
