Commit Graph

6319 Commits

Author SHA1 Message Date
Oren Blasberg
84fa55e84a Merge "Show cascading popup menus if screen is big enough." into nyc-dev am: c71b630 am: 6ba6820
am: 2e63b8f

* commit '2e63b8fdd908f91d508f7fe95eb8599ee5d08b88':
  Show cascading popup menus if screen is big enough.

Change-Id: Iddd564294d1f075819225ed60fe48ff71204d6b5
2016-04-27 01:24:51 +00:00
Oren Blasberg
f6a02c4cda Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0 am: 1fab8d9
am: 306ceb8

* commit '306ceb84b4c8833eaa46093fbba7638378eee456':
  Accommodate NaN in new context menu methods.

Change-Id: Iddd48717534ab7ce5ef93aab0016190a50c42e9b
2016-04-27 01:23:54 +00:00
Oren Blasberg
dc9a368d5c Merge "Don\'t show icons for top level menus unless forced." into nyc-dev am: 0967da3 am: bddf236
am: f7f2360

* commit 'f7f23601df96ca0be4dc678699628874d2fbfeb9':
  Don't show icons for top level menus unless forced.

Change-Id: Iab013f2331781f8b0a6edf23119333ffb23fc1c7
2016-04-27 01:22:35 +00:00
Oren Blasberg
2e63b8fdd9 Merge "Show cascading popup menus if screen is big enough." into nyc-dev am: c71b630
am: 6ba6820

* commit '6ba68207a3474bed3333038cd59120ab924ca967':
  Show cascading popup menus if screen is big enough.

Change-Id: I91bebc9226ab008ccd42256928641d671ac2d448
2016-04-26 23:16:21 +00:00
Oren Blasberg
306ceb84b4 Merge "Accommodate NaN in new context menu methods." into nyc-dev am: a86d1e0
am: 1fab8d9

* commit '1fab8d995e74de2128b45d9cae294c8d5ccf2fc6':
  Accommodate NaN in new context menu methods.

Change-Id: Ifaf625d13b5dc57cf69f10ef1af99aef4acfecb6
2016-04-26 23:16:14 +00:00
Oren Blasberg
f7f23601df Merge "Don\'t show icons for top level menus unless forced." into nyc-dev am: 0967da3
am: bddf236

* commit 'bddf236208aa083cc1b29a1da6f8edc9ef3deec6':
  Don't show icons for top level menus unless forced.

Change-Id: I5e6fe8e0ed308cbdec7038111be4c3e7ca0e721a
2016-04-26 23:16:10 +00:00
Oren Blasberg
c71b6302fe Merge "Show cascading popup menus if screen is big enough." into nyc-dev 2016-04-26 22:43:39 +00:00
Oren Blasberg
a86d1e0b59 Merge "Accommodate NaN in new context menu methods." into nyc-dev 2016-04-26 22:41:01 +00:00
Oren Blasberg
0967da3989 Merge "Don't show icons for top level menus unless forced." into nyc-dev 2016-04-26 22:38:58 +00:00
Chris Banes
6c9bed0224 Merge "Fix onPrepareActionMode() not being called" into nyc-dev am: 9412176 am: 6ade4d1
am: fb24d4f

* commit 'fb24d4f07793df29d999819d5394b6000d140c0a':
  Fix onPrepareActionMode() not being called

Change-Id: I933be0d2b28dd9d2f1dce17e2b746dadf3b9e764
2016-04-26 19:33:43 +00:00
Chris Banes
6ade4d1067 Merge "Fix onPrepareActionMode() not being called" into nyc-dev
am: 9412176

* commit '94121762ff47728fd8080f45f04cafb55b92079d':
  Fix onPrepareActionMode() not being called

Change-Id: Ic6f51f65f9d82b490ef26c89725b228f0568bdd9
2016-04-26 19:26:57 +00:00
Jaewan Kim
9ea37b9bee Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev am: bdc4700 am: 0f360d8
am: 8416446

* commit '8416446ef78d6e51069027f7e8f8148b340b4332':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: I3ac695a7729ceb8e8c06e6df150fe3be1c351d7f
2016-04-26 16:07:31 +00:00
Chris Banes
3cff56b678 Fix onPrepareActionMode() not being called
Happens because mActionMode was set at the end
of the call, which means that invalidate() doesn't
actually do anything.

BUG: 28392319
Change-Id: Ifdc97c03dc43bfbe74790f90764d1575bd9ca951
2016-04-26 12:53:59 +01:00
Jaewan Kim
0f360d80ad Merge "PIP: Send KEYCODE_WINDOW to app first if PIP isn\'t exist" into nyc-dev
am: bdc4700

* commit 'bdc4700155f5ff89e213cb0e9efe49897b888f7d':
  PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist

Change-Id: Ic77538cac9562acf878c7c56f443a691e9d0b45f
2016-04-26 06:08:59 +00:00
Jaewan Kim
f0fd218382 PIP: Send KEYCODE_WINDOW to app first if PIP isn't exist
Bug: 27954955
Change-Id: I517e378d5c1672ac0eb87bdf4375b7d733276e58
2016-04-26 13:06:21 +09:00
Oren Blasberg
7b457455c4 Don't show icons for top level menus unless forced.
Prior to this CL, the cascading implementation would evaluate the
contents of the menu to determine whether to show an icon for this case.
However, the policy we have upheld is that top level menus should
never show an icon for this case. (Unless setForceShowIcon(true) was
called.)

Bug: 28275346
Change-Id: I09423596d49742aa7a9ba7245702c099581c0b48
2016-04-25 16:17:18 -07:00
Oren Blasberg
93c195894d Show cascading popup menus if screen is big enough.
...even if in split screen mode.

Bug: 28175404
Change-Id: I63ff60090e299e48f2273477dc3b820d4d95db8d
2016-04-25 15:58:46 -07:00
Tobias Thierer
8eb2e9d6e5 Merge "Avoid instantiations of Boolean that are immediately unboxed." into nyc-dev-plus-aosp am: cc0eaf4
am: 334a936

* commit '334a936e154fd18a301f7df860322e456ec0486e':
  Avoid instantiations of Boolean that are immediately unboxed.

Change-Id: I626df98f9cea04e782e837e6ddf0d37690306b70
2016-04-25 10:04:05 +00:00
Tobias Thierer
b0800dce4a Avoid instantiations of Boolean that are immediately unboxed.
Replaced Boolean.valueOf() -> parseBoolean() across frameworks/base
(not including Am.java, which I'm leaving for a separate change).

Also fixed a couple of other valueOf()s in SyncStorageEngine.

Bug: 28289401
(cherry-picked from commit ca01820735)
Change-Id: I2c6fb39a465885e7e625ed8894b1b9f8a30da5bc
2016-04-25 10:47:02 +01:00
Adam Lesinski
042799c06d Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev am: 1a8a717 am: 8414b87
am: 34e3a5f

* commit '34e3a5f72daa73f69956aace6583370d82902171':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: I08d997bc9c0fc96c54eee8dda69e3c62005b38e5
2016-04-23 00:29:37 +00:00
Adam Lesinski
8414b87f6c Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev
am: 1a8a717

* commit '1a8a717ab517e7b5ace00bb4d3370e0f3a2677b2':
  BatteryStats: Fix up semantics of SamplingTimer

Change-Id: Iaab0fd5bf59399a3ef2bfe2eb3904ec13691e186
2016-04-23 00:23:56 +00:00
Adam Lesinski
1a8a717ab5 Merge "BatteryStats: Fix up semantics of SamplingTimer" into nyc-dev 2016-04-23 00:20:11 +00:00
Adam Lesinski
d49dbec96a Merge "Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev am: 6a4d9a3 am: fc6f395" into nyc-mr1-dev-plus-aosp
am: 5acf0f0

* commit '5acf0f071da967926d8e473df13d4404f3b98a9b':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: I81f64a0d5bea38b8426e96eb7a52da05fea36d8f
2016-04-22 22:35:45 +00:00
Adam Lesinski
fc6f395d33 Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev
am: 6a4d9a3

* commit '6a4d9a3c9f7cbd30a7093f5088a72271a5e504c7':
  BatteryStats: use the same timestamp for comparing intervals

Change-Id: I0c32c75176bd1e154ed0286f8426807d0221204a
2016-04-22 22:24:39 +00:00
Adam Lesinski
6a4d9a3c9f Merge "BatteryStats: use the same timestamp for comparing intervals" into nyc-dev 2016-04-22 22:20:36 +00:00
Adam Powell
f19c1c6634 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev am: d2285b1 am: e849829
am: 9aff58d

* commit '9aff58d6204d58c04b4257519f8dfeab1fd00033':
  Remove dependencies on Activity from common Fragment superclasses

Change-Id: I6c6e35c552fb7699e3d44a364f18624b888011df
2016-04-22 22:10:38 +00:00
Adam Powell
e849829569 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev
am: d2285b1

* commit 'd2285b1f40a714a49602dab5645c194af0eac880':
  Remove dependencies on Activity from common Fragment superclasses

Change-Id: Ic0da5094cae15e03f139eae6ed2760a6cd126e0c
2016-04-22 21:49:30 +00:00
Adam Lesinski
757c6eacc8 BatteryStats: Fix up semantics of SamplingTimer
SamplingTimer has been losing some data, as well as not correctly handling
entries that have gone away and come back with less data (reset).

This change correctly ends a SamplingTimer sample by adding the accumulated amount
to the total, then reseting the running counter to accept new values.

This is also triggered automatically when the incoming data is less than what is currently
recorded.

Bug:25695597
Change-Id: I6b540906e6be527578d1003485384a75ba211b52
2016-04-22 14:48:18 -07:00
Adam Powell
d2285b1f40 Merge "Remove dependencies on Activity from common Fragment superclasses" into nyc-dev 2016-04-22 21:43:16 +00:00
Adam Powell
31479e33e6 Remove dependencies on Activity from common Fragment superclasses
Allow common Fragments to be used in non-Activity hosts.

Bug 28337394

Change-Id: Id3baa3ef19ea41ff43ca76be89ced7530fbadfab
2016-04-22 12:11:28 -07:00
Jeff Hao
e1d41fcc0d Merge "Support to pass <uses-library> option through to dex2oat." 2016-04-22 18:20:13 +00:00
Andrei Stingaceanu
9e16d11683 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev
am: 1a83df8ba7

* commit '1a83df8ba716d027ac26c9198ed3d3b8d2b98ad1':
  Keyboard shortcuts: dismiss when activities start via shortcut

Change-Id: I90368ac50ef49535bda0f4babfc80e120fe72f89
2016-04-22 17:01:46 +00:00
Andrei Stingaceanu
1a83df8ba7 Merge "Keyboard shortcuts: dismiss when activities start via shortcut" into nyc-dev 2016-04-22 16:46:31 +00:00
Andrei Stingaceanu
0bf096f1b4 Keyboard shortcuts: dismiss when activities start via shortcut
* introduced a new intent DISMISS_KEYBOARD_SHORTCUTS and
and new public API in Activity (which sends a broadcast
to KeyboardShortcutsReceiver) which applications can
use to dismiss the keyboard shortcuts.

* plumbing and implementation for a new call to dismiss
keyboard shortcuts from PhoneWindowManager and used it:
** when starting activities invoked via Search+key
** when starting activities invoked via META
** when starting activities via application launch keys

* removed unused variable in
Activity#onProvideKeyboardShortcuts

Note that for apps started via touch (aka non-shortcut)
like tapping the Settings gear icon from the notification
bar the menu is not automatically dismissed.

Bug: 28012198
Change-Id: I83a8d4f342bb8a08115a648648834d0d2bac19fd
2016-04-22 16:57:25 +01:00
Vladislav Kaznacheev
45b1e14468 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev
am: 729c640cc8

* commit '729c640cc887da9fe7a1b57121167a7bf83fee97':
  Rename DropPermissions to DragAndDropPermissions

Change-Id: I4a43cc10586d548befffa182d89382071ba412e7
2016-04-21 21:43:08 +00:00
Vladislav Kaznacheev
729c640cc8 Merge "Rename DropPermissions to DragAndDropPermissions" into nyc-dev 2016-04-21 21:34:26 +00:00
Alan Viverette
37ab66ab37 Merge "Don\'t overwrite vertical and horizontal offsets unless explicit" into nyc-dev
am: e84393674d

* commit 'e84393674da0f5ecce2ee1074fc79c856f549623':
  Don't overwrite vertical and horizontal offsets unless explicit

Change-Id: I9cd87f63c07748ba4d53b1e8326900c1efeb04ee
2016-04-21 21:27:03 +00:00
Alan Viverette
e84393674d Merge "Don't overwrite vertical and horizontal offsets unless explicit" into nyc-dev 2016-04-21 21:21:35 +00:00
Mihai Nita
f3aa91d9a4 Merge "Framework: change the TTS text to use the current locale" into nyc-dev
am: 344bd5c63d

* commit '344bd5c63dfbe9a6aaef68144d04d3613563c080':
  Framework: change the TTS text to use the current locale

Change-Id: I23d1acfd0b53fddeec4e9ad183d90d1cf7a9708e
2016-04-21 20:01:18 +00:00
Mihai Niță
344bd5c63d Merge "Framework: change the TTS text to use the current locale" into nyc-dev 2016-04-21 19:55:43 +00:00
Yohei Yukawa
1f79c0fea1 Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev
am: d67a1ca49b

* commit 'd67a1ca49b138056d53490322ffdadef61d95fec':
  Accept null subtype in InputMethodSubtypeHandle.

Change-Id: I8eb560fa0176836894164a9e7856d44bd0b91a09
2016-04-21 17:16:19 +00:00
Yohei Yukawa
d67a1ca49b Merge "Accept null subtype in InputMethodSubtypeHandle." into nyc-dev 2016-04-21 17:11:55 +00:00
Christopher Tate
11c07421da Merge "Only invoke k/v helpers during k/v operations" into nyc-dev
am: 157ae98762

* commit '157ae987627ce93939c40dc6f1f3913b243973ae':
  Only invoke k/v helpers during k/v operations

Change-Id: I802010298db254ffb659b68ec4ac2ac569741a5b
2016-04-21 01:20:17 +00:00
Christopher Tate
c9e584b422 Only invoke k/v helpers during k/v operations
In particular, don't try to call the k/v wallpaper restore helper's
onRestoreFinished() if we are actually doing a full-data restore.

Bug 28132784

Change-Id: I2eaf748f6d54601f0ca195ae2781aa177daf0b93
2016-04-21 01:11:06 +00:00
Adam Lesinski
051b810da6 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev
am: c708cf6340

* commit 'c708cf6340e623202e562992e6ef4062ace84cab':
  BatteryStatsHelper: Include screen on baseline power draw

Change-Id: I6ba6f66ebc9d4ffebc8e6f5444957d0a345da4fd
2016-04-21 00:50:07 +00:00
Jeff Hao
7b331b6a8a Support to pass <uses-library> option through to dex2oat.
This change takes an app's shared libraries specified by <uses-library>
and passes it through to dex2oat to be used during compilation.

Part of a multi-project change.

Bug: 26880306
Change-Id: I26ac0e055ee71eb6e2d92598115c46d3ca364d03
2016-04-20 17:49:52 -07:00
Adam Lesinski
c708cf6340 Merge "BatteryStatsHelper: Include screen on baseline power draw" into nyc-dev 2016-04-21 00:39:59 +00:00
Tim Murray
b16a93f955 Merge "Increase the max binder thread pool size for system_server." into nyc-dev
am: 150553756f

* commit '150553756f89a51cc70b24cd9dbab4bdfba0fc59':
  Increase the max binder thread pool size for system_server.

Change-Id: I8312e28eac4b6b00b94af85d0e887448ec849652
2016-04-21 00:39:06 +00:00
Tim Murray
150553756f Merge "Increase the max binder thread pool size for system_server." into nyc-dev 2016-04-21 00:32:47 +00:00
Yohei Yukawa
46ac35d09b Accept null subtype in InputMethodSubtypeHandle.
There are two types of IMEs:
 A. IMEs that have one or more subtypes
 B. IMEs that have no subtype

The initial implementation to update hardware keyboard layout per
subtype change of layout (See Bug 25752812) has supported IMEs in the
category A only, and IMEs in the category B are just ignored in both
system and Settings app.

In order to support IMEs in the category B, InputMethodSubtypeHandle and
related methods need to accept null InputMethodSubtype. Technically
this is a straightforward change, because in InputMethodManagerService
we have already used InputMethodUtils.NOT_A_SUBTYPE_ID for those IMEs in
the category B.  We also need to update Setting App, which will be done
by a different CL [1].

  [1]: I46b9c5b018f08e3eaa4614a0893db0be91652f3c

Bug: 28182650
Change-Id: Ia013784a594ad3beaf30976d047f5ac0fa8185be
2016-04-20 16:59:45 -07:00