OSDN Git Service
Svet Ganov [Thu, 16 Jul 2015 19:27:18 +0000 (19:27 +0000)]
am
db8fa48e: Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
* commit '
db8fa48ed0864125a07f2bbe078fd60abd875ac7':
Return a result from Fragment#shouldShowRequestPermissionRationale
Svet Ganov [Thu, 16 Jul 2015 19:16:54 +0000 (19:16 +0000)]
Merge "Return a result from Fragment#shouldShowRequestPermissionRationale" into mnc-dev
Robert Schaub [Thu, 16 Jul 2015 19:10:48 +0000 (19:10 +0000)]
am
081649c2: am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
081649c2b5ffc1d9ea7a389cc9687659544a535e':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Robert Schaub [Thu, 16 Jul 2015 18:57:39 +0000 (18:57 +0000)]
am
f4db2de8: am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
f4db2de881d197db0dfd76645dfd7a95b1f8f0de':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Dianne Hackborn [Thu, 16 Jul 2015 18:45:37 +0000 (18:45 +0000)]
am
8983420d: Merge "Don\'t spam the system with unique wake lock names." into mnc-dev
* commit '
8983420d30d3e962c519d7f9a5d8b8ea4bc3f42c':
Don't spam the system with unique wake lock names.
Robert Schaub [Thu, 16 Jul 2015 18:40:37 +0000 (18:40 +0000)]
am
1b29a957: Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
* commit '
1b29a95789c29174d5e4d526f6449c2c354ef3b3':
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Dianne Hackborn [Thu, 16 Jul 2015 18:31:14 +0000 (18:31 +0000)]
Merge "Don't spam the system with unique wake lock names." into mnc-dev
Robert Schaub [Thu, 16 Jul 2015 18:21:19 +0000 (18:21 +0000)]
Merge "docs: Added "location" before "gps" in list under "Declaring hardware ..."" into mnc-preview-docs
Todd Kennedy [Thu, 16 Jul 2015 18:09:51 +0000 (18:09 +0000)]
am
a4911ed9: Merge "Verfiy global apps with device owner" into mnc-dev
* commit '
a4911ed97102b638a373adcdae7e4c9b3c64cc30':
Verfiy global apps with device owner
Todd Kennedy [Thu, 16 Jul 2015 17:59:32 +0000 (17:59 +0000)]
Merge "Verfiy global apps with device owner" into mnc-dev
Wale Ogunwale [Thu, 16 Jul 2015 17:16:10 +0000 (17:16 +0000)]
am
11813232: Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
* commit '
1181323230478e3027bbabbbaf769dcd4a11a0e4':
Animate app exit for cases where the app is already hidden before transition
John Reck [Thu, 16 Jul 2015 17:01:22 +0000 (17:01 +0000)]
am
ba4f0757: Merge "Don\'t crash on makeCurrent fail" into mnc-dev
* commit '
ba4f0757779d6e91e52ebee0fd4c847b673a69e2':
Don't crash on makeCurrent fail
Wale Ogunwale [Thu, 16 Jul 2015 17:00:58 +0000 (17:00 +0000)]
Merge "Animate app exit for cases where the app is already hidden before transition" into mnc-dev
Svet Ganov [Thu, 16 Jul 2015 16:58:38 +0000 (09:58 -0700)]
Return a result from Fragment#shouldShowRequestPermissionRationale
bug:
22523342
Change-Id: Ibacedec952316db705c57204fa448dbcada1c3e6
John Reck [Thu, 16 Jul 2015 16:50:28 +0000 (16:50 +0000)]
Merge "Don't crash on makeCurrent fail" into mnc-dev
Wale Ogunwale [Thu, 16 Jul 2015 16:45:35 +0000 (09:45 -0700)]
Animate app exit for cases where the app is already hidden before transition
It is possible for an app token to be marked as hidden and exiting
because the previous activity destory is completed before we are
good-to-go with app transition since we are still waiting for the
opening app to be done drawing. In this case we don't apply the
exiting animation since the token is not changing visibility state
during the app transition (it is already hidden and we are telling
it to hide...).
We now allow the animation to load if the token is already hidden
and marked as exiting.
Bug:
22381703
Change-Id: I5c27b6c3c1f810f05b2d716122055c6f12d0a167
Todd Kennedy [Thu, 16 Jul 2015 16:44:31 +0000 (09:44 -0700)]
Verfiy global apps with device owner
Applications installed for a specific user must be verfied as that user. However,
apps that are installed globally [i.e. UserHandle.ALL] should not be verified by
every user on the device. Instead, they should be verified by the device owner.
Bug:
21901423
Change-Id: I5fd3f690d08e7e911a3c86f09bbfcd4eb635b418
John Reck [Thu, 16 Jul 2015 16:17:59 +0000 (09:17 -0700)]
Don't crash on makeCurrent fail
Bug:
22444755
WindowManager may decide to yank the surface at any point, so
attempt to kinda handle this
Change-Id: Id2f665d2f0f93bccd4ec977fbf52dca4dc1ec891
Tony Mak [Thu, 16 Jul 2015 15:03:56 +0000 (15:03 +0000)]
am
532737df: Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
* commit '
532737df65330200dc55ae42d31140d19c4024be':
Fix calendar reminder notification is not shown in idle state
Tony Mak [Thu, 16 Jul 2015 14:50:16 +0000 (14:50 +0000)]
Merge "Fix calendar reminder notification is not shown in idle state" into mnc-dev
George Mount [Thu, 16 Jul 2015 14:29:42 +0000 (14:29 +0000)]
am
bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev
* commit '
bd87b6b5b0c478c45d0dd5725cbc59995e751c64':
Make additional shared elements a version-checked feature.
George Mount [Thu, 16 Jul 2015 14:29:38 +0000 (14:29 +0000)]
am
30c8245a: Merge "Add data binding to built javadoc." into mnc-dev
* commit '
30c8245afc8d9558b76e5c86f917c22e02f6e820':
Add data binding to built javadoc.
George Mount [Thu, 16 Jul 2015 14:24:06 +0000 (14:24 +0000)]
Merge "Make additional shared elements a version-checked feature." into mnc-dev
George Mount [Thu, 16 Jul 2015 14:19:08 +0000 (14:19 +0000)]
Merge "Add data binding to built javadoc." into mnc-dev
George Mount [Wed, 15 Jul 2015 23:30:20 +0000 (16:30 -0700)]
Make additional shared elements a version-checked feature.
Bug
22505481
ag/684544 added a feature to allow shared elements that weren't
shared into an Activity to be shared back. However, if you are
targeting an older version of the SDK, you may get an unexpected
shared element back. This change in behavior has been locked
behind a target version check.
Change-Id: I7162e24f3b14fedd6b308e89e9d04ac67660f7d6
Nicolas Prevot [Thu, 16 Jul 2015 11:12:30 +0000 (11:12 +0000)]
am
dbdf7c45: Don\'t send app links to the parent if status = never (part 2)
* commit '
dbdf7c45380f7701e029a279932d2c97bf55fdc9':
Don't send app links to the parent if status = never (part 2)
Nicolas Prevot [Wed, 15 Jul 2015 13:54:45 +0000 (14:54 +0100)]
Don't send app links to the parent if status = never (part 2)
To qualify for cross-profile app linking, an intent should resolve
with a better status than "NEVER". Moved this check from canForwardTo
into the source method, getCrossProfileDomainPreferredLpr, to stop
bad resolutions leaking out.
BUG:
22287521
Change-Id: I195979d78a783864d841a81f358780912bbf168e
Vineeta Srivastava [Thu, 16 Jul 2015 07:16:34 +0000 (07:16 +0000)]
am
47e04090: Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
* commit '
47e0409062a2ac5a480fc1a57e443b75ce0f1dab':
Remove redundant cancel events from FingerprintService
Vineeta Srivastava [Thu, 16 Jul 2015 07:06:52 +0000 (07:06 +0000)]
Merge "Remove redundant cancel events from FingerprintService" into mnc-dev
Sanket Padawe [Thu, 16 Jul 2015 05:14:13 +0000 (05:14 +0000)]
am
ea975b12: Merge "Add new API for handling DB query per subId." into mnc-dev
* commit '
ea975b122fee3ac0fe766d2b58bb420b82e5dd95':
Add new API for handling DB query per subId.
Sanket Padawe [Thu, 16 Jul 2015 05:01:06 +0000 (05:01 +0000)]
Merge "Add new API for handling DB query per subId." into mnc-dev
Yohei Yukawa [Thu, 16 Jul 2015 03:51:09 +0000 (03:51 +0000)]
am
c0aa9744: Merge "PopupWindow position must be specified in window coordinates." into mnc-dev
* commit '
c0aa9744dc0ba9470aea6a973d955fd21de21c92':
PopupWindow position must be specified in window coordinates.
Yohei Yukawa [Thu, 16 Jul 2015 03:44:04 +0000 (03:44 +0000)]
am
ebbe7706: Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev
* commit '
ebbe77061c010596f79e61c3f1f7be12a3164b81':
Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
Yohei Yukawa [Thu, 16 Jul 2015 03:42:17 +0000 (03:42 +0000)]
Merge "PopupWindow position must be specified in window coordinates." into mnc-dev
Yohei Yukawa [Thu, 16 Jul 2015 03:31:52 +0000 (03:31 +0000)]
Merge "Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3." into mnc-dev
Yohei Yukawa [Thu, 16 Jul 2015 02:01:32 +0000 (19:01 -0700)]
PopupWindow position must be specified in window coordinates.
This CL addresses TODOs in Ib641dda49f7ab1c7d60207c36a47767bb408.
With this CL the position of PopupWindow is always specified in
window-local coordinates even if FloatingToolbar#mParent is not a
decor view.
Bug:
22335001
Change-Id: I0cdd63a00051fa30981e517c07682075467ac598
Yohei Yukawa [Thu, 16 Jul 2015 02:00:18 +0000 (19:00 -0700)]
Fix comment bug in I71a8d356e868dc7715b030ca1078da4ec39368c3.
This is a coment-only follow up CL for I71a8d356e868dc7715b030ca,
which wrongly changed coordinates from window-local to view-local
(relative to FloatingToolbar#mParent) when showing PopupWindow.
The position of PopupWindow still needs to be specified in
window-local coordinates as we had done before
I71a8d356e868dc7715b030ca1078da4ec39368c3.
Currently the problem might not be visible to users because
1. FloatingToolbar is not a public API hence all the instances
are under our controll.
2. FloatingToolbar#mParent is alwasy initialized with
PhoneWindow#getDecorView() for now.
Bug:
22335001
Change-Id: Ib641dda49f7ab1c7d60207c36a47767bb408971c
Jim Miller [Thu, 16 Jul 2015 01:57:14 +0000 (18:57 -0700)]
Remove redundant cancel events from FingerprintService
This fixes a bug where the framework was sending repeat cancel
events in response to terminal status (onAuthenticated(), onError())
which causes the underlying HAL implementation to get into a weird state.
Now, only client-initiated events like an explicit cancellation
or starting another authentication/enrollment invokes fingerprintd's
cancel() method.
Fixes bug
22438498
Change-Id: I762bab1c8635924848f9f4334db47a07130d5ae3
Chris Tate [Thu, 16 Jul 2015 01:28:59 +0000 (01:28 +0000)]
am
a36c5580: Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
* commit '
a36c5580c503da98c137c5bf9f52a719a131d2a9':
Fix a bug disappearing installerPackageName info of packages after reboot.
Chris Tate [Thu, 16 Jul 2015 01:18:02 +0000 (01:18 +0000)]
Merge "Fix a bug disappearing installerPackageName info of packages after reboot." into mnc-dev
Deepanshu Gupta [Thu, 16 Jul 2015 01:03:40 +0000 (01:03 +0000)]
am
a6ad75fb: Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev
* commit '
a6ad75fbe0944f236e27986c23ca75b7db8cdfd8':
Add tools:openDrawer to open a DrawerLayout.
Deepanshu Gupta [Thu, 16 Jul 2015 01:03:32 +0000 (01:03 +0000)]
am
43286266: Merge "Change tools:list_item to listitem." into mnc-dev
* commit '
432862667643cf8966a0c727b6772a6bae787da1':
Change tools:list_item to listitem.
Robert Schaub [Thu, 16 Jul 2015 01:03:27 +0000 (01:03 +0000)]
am
a73face3: am
8c5f34de: am
b53568f2: docs: Added word "video" to tv app quality guidelines.
* commit '
a73face3f43d191f8e9b6e8597043be47f86374e':
docs: Added word "video" to tv app quality guidelines.
Deepanshu Gupta [Thu, 16 Jul 2015 00:59:33 +0000 (00:59 +0000)]
Merge "Add tools:openDrawer to open a DrawerLayout." into mnc-dev
Deepanshu Gupta [Thu, 16 Jul 2015 00:59:15 +0000 (00:59 +0000)]
Merge "Change tools:list_item to listitem." into mnc-dev
Robert Schaub [Thu, 16 Jul 2015 00:54:04 +0000 (00:54 +0000)]
am
8c5f34de: am
b53568f2: docs: Added word "video" to tv app quality guidelines.
* commit '
8c5f34de91fc1fb148bbee9f868d32ff6103a70a':
docs: Added word "video" to tv app quality guidelines.
Robert Schaub [Thu, 16 Jul 2015 00:43:26 +0000 (00:43 +0000)]
am
b53568f2: docs: Added word "video" to tv app quality guidelines.
* commit '
b53568f27c384523dae58af9f4ad355a6c72d6d7':
docs: Added word "video" to tv app quality guidelines.
Jun Mukai [Thu, 16 Jul 2015 00:41:35 +0000 (00:41 +0000)]
am
8703e50d: Merge "Allow selecting quick setting items by keyboard." into mnc-dev
* commit '
8703e50d130351ef45d1ac88755ec58d8ecac737':
Allow selecting quick setting items by keyboard.
Oren Blasberg [Thu, 16 Jul 2015 00:41:31 +0000 (00:41 +0000)]
am
84f8a096: Merge "Make "dismiss all" button keyboard accessible." into mnc-dev
* commit '
84f8a0969322b2d5f40ea1eac0db9996e1876138':
Make "dismiss all" button keyboard accessible.
Jun Mukai [Thu, 16 Jul 2015 00:37:13 +0000 (00:37 +0000)]
Merge "Allow selecting quick setting items by keyboard." into mnc-dev
Adrian Roos [Thu, 16 Jul 2015 00:31:23 +0000 (00:31 +0000)]
am
fc8e923d: Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev
* commit '
fc8e923d5e551862fe1abaac2256925d6955ca07':
Fix wrong tint mode on airplane and vpn icons
Christopher Tate [Thu, 16 Jul 2015 00:31:18 +0000 (00:31 +0000)]
am
3b1f8607: Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
* commit '
3b1f8607fdc416a87e608499698719f3234ecc90':
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Oren Blasberg [Thu, 16 Jul 2015 00:29:33 +0000 (00:29 +0000)]
Merge "Make "dismiss all" button keyboard accessible." into mnc-dev
Adrian Roos [Thu, 16 Jul 2015 00:27:48 +0000 (00:27 +0000)]
Merge "Fix wrong tint mode on airplane and vpn icons" into mnc-dev
Billy Lau [Thu, 16 Jul 2015 00:21:44 +0000 (00:21 +0000)]
am
008409a2: Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
* commit '
008409a2ea1feed095d53ce51429e4fed964c50c':
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW...
Christopher Tate [Thu, 16 Jul 2015 00:20:55 +0000 (00:20 +0000)]
Merge "Intent filters need CATEGORY_BROWSABLE to be app-linking eligible" into mnc-dev
hyemin.hwang [Thu, 9 Jul 2015 00:16:12 +0000 (09:16 +0900)]
Fix a bug disappearing installerPackageName info of packages after reboot.
If user install apps from playstore, system has installerPackageName attribute of app.
but, after reboot, some apps(have sharedUserID) installerPackageName attribute disappearing.
because lack of copy routine.
So, I added copy routine(installerPackageName).
Testcase :
1. Install app(has sharedUserId, ex Lync2013) from market.
2. Confirm package info from packages.xml(exist installer info).
3. reboot.
4. Re-confirm package info from packages.xml(not exist installer info).
Cherry-pick from AOSP master.
Bug
22513758
Change-Id: I3fea3e573c056f6c2f574715d2ebef4df8b75a68
Robert Schaub [Thu, 16 Jul 2015 00:13:11 +0000 (17:13 -0700)]
docs: Added "location" before "gps" in list under "Declaring hardware ..."
Bug:
20106795
Change-Id: I13e7be98722ac56a9175b1456fc018ff665b77ab
Billy Lau [Thu, 16 Jul 2015 00:04:32 +0000 (00:04 +0000)]
Merge "Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW..." into mnc-dev
Christopher Tate [Wed, 15 Jul 2015 23:56:58 +0000 (16:56 -0700)]
Intent filters need CATEGORY_BROWSABLE to be app-linking eligible
Bug
22504009
Change-Id: I565b2ba4d1e5deeee8ede3363819deec206dbf58
Robert Schaub [Wed, 15 Jul 2015 23:41:22 +0000 (16:41 -0700)]
docs: Added word "video" to tv app quality guidelines.
Bug:
21737663
Change-Id: Ia4edcae6f2089f15156a857da295e89265f56d5d
Dianne Hackborn [Wed, 15 Jul 2015 23:39:32 +0000 (23:39 +0000)]
am
f6586cbd: Merge "Implement issue #
22403908: Enable assistant to refuse context sharing" into mnc-dev
* commit '
f6586cbde7d4612963eb2e8a2413235630676b83':
Implement issue #
22403908: Enable assistant to refuse context sharing
Dianne Hackborn [Wed, 15 Jul 2015 23:39:27 +0000 (23:39 +0000)]
am
67e02e60: Merge "Fix issue #
22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
* commit '
67e02e60ca58db95b397fde7bfeeebb012e8aff8':
Fix issue #
22487155: Device unresponsive (deadlock in system_server)
Dianne Hackborn [Wed, 15 Jul 2015 23:39:20 +0000 (23:39 +0000)]
am
c4e2bcd4: Merge "Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
* commit '
c4e2bcd4dca0401ca38a45dce04d29b92231d677':
Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always...
Dianne Hackborn [Wed, 15 Jul 2015 23:39:16 +0000 (23:39 +0000)]
am
c1a49b50: Merge "Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev
* commit '
c1a49b50bf7638484d32ed6dbf863546a47f0e50':
Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with...
Dianne Hackborn [Wed, 15 Jul 2015 23:39:12 +0000 (23:39 +0000)]
am
1cf8b0b6: Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
* commit '
1cf8b0b6bfbbf867512fcd7bbb4763692821ed36':
Fix issue #
22124996: VI: Command Request not Active
Deepanshu Gupta [Sat, 11 Jul 2015 00:38:29 +0000 (17:38 -0700)]
Add tools:openDrawer to open a DrawerLayout.
Store a list of drawer layouts with tools:openDrawer encountered and
call openDrawer on them during the post-inflation processing.
Change-Id: Idee299a9af1bb106509a03bb2e8424c372b93dc5
Billy Lau [Wed, 15 Jul 2015 21:29:19 +0000 (22:29 +0100)]
Bug:
21589105 Rescoping SYSTEM_ALERT_WINDOW...
AppOpsManager:
Changed the default mode for SYSTEM_ALERT_WINDOW to MODE_DEFAULT instead of
MODE_ALLOWED. Otherwise, an app that did not declare for this permission will
actually be allowed to perform OP_SYSTEM_ALERT_WINDOW, which is undesirable.
This change also allows callers to make their own decision based on the
current policy (M vs pre-M apps).
policy/PhoneWindowManager:
Added additional checks that will handle MODE_DEFAULT - this happens when an app
is newly installed but not yet configured.
wm/WindowManagerService:
Enriched some checks to include the treatment of MODE_DEFAULT - this will allow
pre-M apps uninterupted capability to draw on top of other apps.
Change-Id: I8de77730e158c97587427820cfba721bd5607bea
Jim Miller [Wed, 15 Jul 2015 23:32:29 +0000 (23:32 +0000)]
Merge "Fix the build" into mnc-dr-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:31:09 +0000 (23:31 +0000)]
Merge "Implement issue #
22403908: Enable assistant to refuse context sharing" into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:30:49 +0000 (23:30 +0000)]
Merge "Fix issue #
22487155: Device unresponsive (deadlock in system_server)" into mnc-dev
Deepanshu Gupta [Wed, 8 Jul 2015 19:47:46 +0000 (12:47 -0700)]
Change tools:list_item to listitem.
The listitem is already in use for ListView. Reuse the same attribute
for RecyclerView rather than creating a new one.
Change-Id: I82aabe7d04fbe3e61645bc427a81c14c454d03c5
Dianne Hackborn [Wed, 15 Jul 2015 23:30:16 +0000 (23:30 +0000)]
Merge "Fix issue #
22460110: AssistStructure.ViewNode.isAssistBlocked() always..." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:30:06 +0000 (23:30 +0000)]
Merge "Fix issue #
22479881: Nexus 6 randomly rebooting every few hours with..." into mnc-dev
Dianne Hackborn [Wed, 15 Jul 2015 23:29:53 +0000 (23:29 +0000)]
Merge "Fix issue #
22124996: VI: Command Request not Active" into mnc-dev
Jim Miller [Wed, 15 Jul 2015 23:29:30 +0000 (16:29 -0700)]
Fix the build
Build broken due to a bad merge.
Change-Id: Id10b3db5d1bde2a2c9e8995e35b4fc58c5468544
Svetoslav [Wed, 15 Jul 2015 23:13:03 +0000 (23:13 +0000)]
am
08dda27b: Merge "Make sure we get valid package name or fail." into mnc-dev
* commit '
08dda27be4678f2ab5bdc7e210d511ec105c158c':
Make sure we get valid package name or fail.
Christopher Tate [Wed, 15 Jul 2015 23:12:59 +0000 (23:12 +0000)]
am
06476508: Merge "Resolve based on the correct user\'s default browser" into mnc-dev
* commit '
06476508c4aae6b9bb5affdc7470abf159ef9eda':
Resolve based on the correct user's default browser
Svetoslav [Wed, 15 Jul 2015 23:03:45 +0000 (23:03 +0000)]
Merge "Make sure we get valid package name or fail." into mnc-dev
Svetoslav [Wed, 15 Jul 2015 22:58:01 +0000 (15:58 -0700)]
Make sure we get valid package name or fail.
bug:
22492225
Change-Id: I7b7dce9a8e398c4615bcb700de80241e94c4320c
Christopher Tate [Wed, 15 Jul 2015 22:57:49 +0000 (22:57 +0000)]
Merge "Resolve based on the correct user's default browser" into mnc-dev
Abodunrinwa Toki [Wed, 15 Jul 2015 22:50:16 +0000 (22:50 +0000)]
am
6a401410: Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
* commit '
6a4014104e85bf4154b353cd0be337f7967cdaeb':
Let the ActionBar handle keyboard shortcuts.
Abodunrinwa Toki [Wed, 15 Jul 2015 22:38:55 +0000 (22:38 +0000)]
Merge "Let the ActionBar handle keyboard shortcuts." into mnc-dev
Miao Wang [Wed, 15 Jul 2015 22:34:47 +0000 (22:34 +0000)]
am
ad904cf3: Merge "fix BNNM docs" into mnc-dev
* commit '
ad904cf34219897da731eb65f9de53176cc39b20':
fix BNNM docs
Svet Ganov [Wed, 15 Jul 2015 22:28:10 +0000 (22:28 +0000)]
am
75f6b94a: Merge "Grant default permissions to the setup app robustly." into mnc-dev
* commit '
75f6b94a5d5cadb218725011729466e8e438b231':
Grant default permissions to the setup app robustly.
Geoff Mendal [Wed, 15 Jul 2015 22:28:06 +0000 (22:28 +0000)]
am
78b6e6c7: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
78b6e6c742a7872ba23c3684c47ff714dbd80cf6':
Import translations. DO NOT MERGE
Adrian Roos [Wed, 15 Jul 2015 22:28:02 +0000 (22:28 +0000)]
am
3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev
* commit '
3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
Show correct locked orientation on phones
Geoff Mendal [Wed, 15 Jul 2015 22:27:58 +0000 (22:27 +0000)]
am
4155d9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
4155d9f37762a6a91d47c383f9c3a9fd3aa7f884':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:54 +0000 (22:27 +0000)]
am
197e7381: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
197e7381576bee4b8e2e7195811fe94d1b1b28ec':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:44 +0000 (22:27 +0000)]
am
6e149a25: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
6e149a2537167f90b1db2430c19ccdf064548b91':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:39 +0000 (22:27 +0000)]
am
a5516e80: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
a5516e80ad76fb5cfe520ddd0c5babf2dccf2e5a':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:35 +0000 (22:27 +0000)]
am
ff994bd3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
ff994bd31b2768eb38efb6c623f0fb6e13d9d61b':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:31 +0000 (22:27 +0000)]
am
36c103d6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
36c103d685a6ba0f04c52bad2cb666789f5179dc':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 15 Jul 2015 22:27:26 +0000 (22:27 +0000)]
am
e2a0d44c: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
e2a0d44c8a837ac44dfc627ef3ca8d5242e78959':
Import translations. DO NOT MERGE
Jorim Jaggi [Wed, 15 Jul 2015 22:27:07 +0000 (22:27 +0000)]
am
eea8be53: Adjust assist disclosure stroke width to spec
* commit '
eea8be533874f279016279cd68618a6592b3dbed':
Adjust assist disclosure stroke width to spec
Roshan Pius [Wed, 15 Jul 2015 22:26:55 +0000 (22:26 +0000)]
am
4e9c63cb: Merge "Handle exceptions when accessing Content providers." into mnc-dev
* commit '
4e9c63cbe1712f750d5eaaa044e957c7f7696bf8':
Handle exceptions when accessing Content providers.
Felipe Leme [Wed, 15 Jul 2015 22:26:47 +0000 (22:26 +0000)]
am
68fd7c79: Merge "Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created." into mnc-dev
* commit '
68fd7c798d213bbe304775b13d775ee868abb448':
Set last modified timestamp for the bugreport entry in the zipped file from original file, otherwise it uses the date the zip was created.
Dianne Hackborn [Wed, 15 Jul 2015 22:26:42 +0000 (22:26 +0000)]
am
d193916c: Merge "Fix build." into mnc-dev
* commit '
d193916c83015d54466ad998fb9373f15da754a7':
Fix build.
Jeff Brown [Wed, 15 Jul 2015 22:26:38 +0000 (22:26 +0000)]
am
76c4c666: Add USB port manager.
* commit '
76c4c6668a1486bc003ab0c585bb1f41d16e27a7':
Add USB port manager.
Jeff Brown [Wed, 15 Jul 2015 22:26:34 +0000 (22:26 +0000)]
am
2dbccc19: Clean up USB Manager dump.
* commit '
2dbccc1926ea2d3e27c5cfd2d61d2b3d5ed787c0':
Clean up USB Manager dump.