Commit Graph

49670 Commits

Author SHA1 Message Date
Yohei Yukawa
f487e0e395 Normalize deprecated 2-letter language code when necessary.
This is a follow up CL for I7d932e60311b80c05be8f02c9e803f18da0e0054,
which revealed that we could not use deprecated 2-letter code like "in"
to query subtype which has new language codes like "id".

This CL addresses the above issue by normalizing the language code
with Locale#Locale(String, String) before comparing one to another.

Change-Id: I26e3aa0333aa3c76c80a3c1c9090cc2b368c8e10
2015-02-21 02:26:40 +09:00
Yohei Yukawa
e55524ef04 Merge "Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0" 2015-02-20 15:28:35 +00:00
Yohei Yukawa
e72d1c8274 Add tests for Ibb9eb9f65323795d139 and I6571d464a46453934f0
This CL adds several unit tests for following CLs, both of which enabled
InputMethodUtils (and dependent IMF logic) to handle 3 letter language codes
and conversion from deprecated two-letter codes to new ones correctly.
- Ibb9eb9f65323795d139b16d76b7e7e36a4e0568c
- I6571d464a46453934f0a8f5e79018a67a9a3c845

As described in tests, the input method framework has already been able to
recognize 3 letter language codes.  However, there remain inconsistencies
when we use deprecated 2-letter code to query subtype like "in" but the
subtype has new language codes like "id".  Subsequent CLs are supposed to
address remaining issues.

bug: 10090157
Change-Id: I7d932e60311b80c05be8f02c9e803f18da0e0054
2015-02-20 23:41:36 +09:00
Clara Bayarri
7415d6667e Merge "Floating Toolbars: Wrap the ActionMode creation in DecorView" 2015-02-20 10:26:15 +00:00
Santos Cordon
c86703f575 Merge "Add PHONE_ACCOUNT_ADDRESS to the call log DB." 2015-02-20 08:45:49 +00:00
Santos Cordon
d4ceaf6167 Add PHONE_ACCOUNT_ADDRESS to the call log DB.
Also update some javadoc comments.

Change-Id: If0f8fa0148b3aed74ed434b1017a279ce29b3842
2015-02-19 23:43:12 -08:00
Dianne Hackborn
5f83382c40 Merge "Add some detailed data as part of battery history." 2015-02-20 01:41:29 +00:00
Dianne Hackborn
d1eccbea38 Add some detailed data as part of battery history.
Every time the battery level changes, a new extended
detailed use data structure is written to the history.
This currently only contains delta CPU use since the
last detailed entry (total CPU and to three uids), but
it gives us the infrastructure for adding more detailed
data in the future.

A detail entry for regular history looks like:

     Details: cpu=15730u+2307s (u0a57=11312u+502s, 1000=2344u+701s, 0=473u+991s)
              /proc/stat=15377 usr, 1797 sys, 197 io, 0 irq, 8 sirq, 23103 idle (42.9% of 6m 44s 820ms)

u is user-space cpu time, s is system/kernel time.

The equivalent check-in output is:

9,h,0,Dcpu=15730:2307/10057:11312:502/1000:2344:701/0:473:991
9,h,0,Dpst=15377,1797,197,0,8,23103

Also add a new "unplug" command to the battery service,
to easily put it into a state where it always considers
the device to be running on battery.

Change-Id: Ic76d966f11e592b9dd671879977bf999ebc11eef
2015-02-19 17:37:12 -08:00
Craig Mautner
4f9796e028 Merge changes Ib2def344,Ifd15736b
* changes:
  Permit layout when stopped if reporting draw
  Refactor computeScreenConfigurationLocked and more.
2015-02-20 01:35:17 +00:00
Craig Mautner
72d6f21943 Permit layout when stopped if reporting draw
When a device was woken up in a different orientation than what it
went to sleep in, the window manager would force a resize to get it to
predraw in the new orientation. The predraw was done in the old
orientation however because layouts are skipped when the activity was
stopped.

This change allows layouts to proceed when the activity is stopped if
the flag to report resize events is true.

Fixes bug 18444400.

Change-Id: Ib2def3449dd67918f6fb838bdb1fe5cc6ec57f8e
2015-02-19 16:51:26 -08:00
Scott Kennedy
d390401373 Merge "Mark Service#onBind() @Nullable" 2015-02-19 23:54:03 +00:00
Scott Kennedy
7db73ed198 Mark Service#onBind() @Nullable
Change-Id: I6e600dd018e1cb2b51b666ec5acf56b2885c0083
2015-02-19 15:31:11 -08:00
Scott Kennedy
004a46eb17 Merge "Annotate the parameter in TextUtils#isEmpty() as @Nullable" 2015-02-19 23:19:07 +00:00
Clara Bayarri
ed2a54cfd3 Floating Toolbars: Wrap the ActionMode creation in DecorView
This change will allow us to create ActionMode representations on the
fly after onCreateActionMode by using the Decorator pattern. The new
ActionModeWrapper will be responsible for the creating the
appropriate ActionMode depending on the type chosen by the client,
and setting it up.

Things pending that are NOT addressed by this CL:
- ActionModes created by callback.onWindowStartingActionMode(). This
includes all current usages in an existing ActionBar, as it is
handled by Activity. This requires some additional refactoring.
- Representing the floating type
- Moving the view creation code specific to StandaloneActionMode
from DecorView to ActionModeWrapper, decoupling DecorView from
StandaloneActionMode completely
- Supporting two ActionModes in parallel in DecorView, one of each type

Change-Id: I1a8db711f53b771eac74f0e6496106acf1ca2727
2015-02-19 22:40:31 +00:00
Narayan Kamath
01b50bb06b am 907bcd96: am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server forking."
* commit '907bcd96d7f54adaf3b3df6f476e09c636c646cf':
  Fix a couple of issues with system_server forking.
2015-02-19 20:27:11 +00:00
James Cook
c20f54aff6 Merge "Add basic support for Ctrl-Z to editable TextViews" 2015-02-19 18:36:19 +00:00
Scott Kennedy
6cd132fef2 Annotate the parameter in TextUtils#isEmpty() as @Nullable
Change-Id: Iaccf7f568952399d5eb48c15a5428317dd75052a
2015-02-19 10:36:12 -08:00
James Cook
9201e79783 Add basic support for Ctrl-Z to editable TextViews
* Add an UndoManager to the Editor for each editable TextView
* Record operations as being owned by that Editor
* Parcel the undo state
* Wire hardware keyboard shortcuts Ctrl-Z for undo and Ctrl-Shift-Z
  for redo into TextView shortcut handling.
* Expose IDs for "undo" and "redo" for symmetry with cut/copy/paste.

Tests in CTS TextViewTest will land separately in ag/635321

Bug: 19332904
Change-Id: Ibd23843f86b4cd556751faa0b3ad1f35d6d49785
2015-02-19 10:32:14 -08:00
John Spurlock
0a7269bbaf Merge "AudioAttributes: introduce new flags to bypass audio restrictions." 2015-02-19 18:24:24 +00:00
Nicolas Prevot
3558752ec7 Merge "Improve the documentation of DISALLOW_CONFIG_BLUETOOTH." 2015-02-19 11:19:32 +00:00
Narayan Kamath
907bcd96d7 am 644ebc88: am 0a7936b7: Merge "Fix a couple of issues with system_server forking."
* commit '644ebc8800ad5e2fa1c239bd65a2cf6a88e6556b':
  Fix a couple of issues with system_server forking.
2015-02-19 10:30:46 +00:00
Narayan Kamath
0a7936b7c5 Merge "Fix a couple of issues with system_server forking." 2015-02-19 10:17:32 +00:00
John Spurlock
bbfd31a5d4 AudioAttributes: introduce new flags to bypass audio restrictions.
- New @hidden @SystemApi FLAG_BYPASS_INTERRUPTION_POLICY, request
   to ignore any current audio restrictions, such as zen mode
   content-based notification filtering.
 - Wire up FLAG_BYPASS_INTERRUPTION_POLICY to the existing
   audio restriction checks in the framework.

 - New @hidden @SystemApi FLAG_BYPASS_MUTE, request to play
   audibly, even if the underlying stream is muted.
 - Wiring up to audio framework TBD.

 - Use both of these new flags on the inline volume slider
   controls used in Settings, ensuring playback is heard
   regardless of the current device filter state.

Bug: 19407114
Change-Id: I3d44394931592ccbc1b61ddd9a4d1cc984da17cc
2015-02-18 20:48:26 -05:00
Wale Ogunwale
9176a30d36 Merge "Set compatInfo to default if unset in ContextImpl constructor." 2015-02-19 01:05:29 +00:00
Wale Ogunwale
9cf9954432 Set compatInfo to default if unset in ContextImpl constructor.
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.

Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
2015-02-18 16:31:34 -08:00
Mohamad Ayyash
97ae891df2 Merge "AlsaCardsParser: Ensure line is not NULL when reading Cards File." 2015-02-18 21:31:38 +00:00
Adrian Roos
a187960989 Merge "Set the light status flag based on right window" 2015-02-18 20:37:57 +00:00
Mohamad Ayyash
f98e1c72fc AlsaCardsParser: Ensure line is not NULL when reading Cards File.
Change-Id: I5136bbb776bbbf97229b2d96975b819a94232d66
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-02-18 12:35:48 -08:00
Nicolas Prevot
1c4c442e45 Improve the documentation of DISALLOW_CONFIG_BLUETOOTH.
BUG:19315055

Change-Id: Ic92a7b79f8113cad0474d62b0c615a1ada91838b
2015-02-18 19:28:21 +00:00
Tor Norbye
a42d2eaf2d Merge "Add @ResourceInt annotations on APIs" 2015-02-18 19:24:01 +00:00
Adrian Roos
cd3884dfb2 Set the light status flag based on right window
The flag needs to be set based on the top window that is either
reaching beneath the status bar or is dimming.

Bug: 19233606
Change-Id: I7b97f6869e3b7d5ae2b7030122b311ee9e13871f
2015-02-18 20:09:42 +01:00
Adrian Roos
7478de1e87 Merge "Decouple package manager lock and bitmap decoding" 2015-02-18 18:09:09 +00:00
Tor Norbye
7b9c912f53 Add @ResourceInt annotations on APIs
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
2015-02-18 07:49:03 -08:00
Adrian Roos
44bc07d874 Fix typo
Change-Id: If59381862e3332675fd7b929bcee2928ecd0da21
2015-02-18 15:03:37 +00:00
Wale Ogunwale
0233aee840 Merge "Fixed NPE in ResourceManager when Activity.recreate is called." 2015-02-18 03:23:39 +00:00
Svetoslav
1b71ea9b09 Remove unnecessary volume validators
Change-Id: I5f13016fa23978c8d35e9b85ec0ebecdf40a3d74
2015-02-17 18:35:02 -08:00
Wale Ogunwale
93f543ca98 Fixed NPE in ResourceManager when Activity.recreate is called.
Bug: 19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
2015-02-17 16:55:03 -08:00
Marco Nelissen
8c98b8eb68 am 2fddfea3: am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '2fddfea3e5311bb5503d148d7ad18240a13ee033':
  Fix NPE
2015-02-18 00:40:19 +00:00
Alan Viverette
7a94dcfb71 am 7286d1ff: am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '7286d1ff3747d3a71aeb2c8724947b35cc77d2d5':
  Fix year picker initial range
2015-02-18 00:30:15 +00:00
Marco Nelissen
2fddfea3e5 am a3404263: am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit 'a3404263c08c711fa5f2d73a92ec7c6f366b9338':
  Fix NPE
2015-02-18 00:15:00 +00:00
Marco Nelissen
a3404263c0 am 2f71ee24: am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit '2f71ee24c5d982ccaa490c7a3e1390473909fbf0':
  Fix NPE
2015-02-18 00:07:58 +00:00
Marco Nelissen
2f71ee24c5 am ffaee8bd: Merge "Fix NPE" into lmp-mr1-dev
* commit 'ffaee8bda9c8d22af17098fec0e6626301d91844':
  Fix NPE
2015-02-18 00:01:02 +00:00
Marco Nelissen
ffaee8bda9 Merge "Fix NPE" into lmp-mr1-dev 2015-02-17 23:54:30 +00:00
Craig Mautner
2007a630d4 am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:53:11 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:43:33 +00:00
Craig Mautner
ab8f60e425 am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'a94e42970d4e664e193cde0cf2700cb7e15961c9':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:36:51 +00:00
Craig Mautner
a94e42970d Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev 2015-02-17 23:30:34 +00:00
Alan Viverette
7286d1ff37 am 157c75e4: am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '157c75e4b55d34d0426d08044130d74c2369be07':
  Fix year picker initial range
2015-02-17 22:51:53 +00:00
Alan Viverette
157c75e4b5 am 504c77e1: am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit '504c77e1ae2fdd3608cd7878a4b0ba4c9eac91de':
  Fix year picker initial range
2015-02-17 22:41:15 +00:00
Alan Viverette
504c77e1ae am d611fc4e: Merge "Fix year picker initial range" into lmp-mr1-dev
* commit 'd611fc4ea648e23ed3a6b311a07a5bd8b3e2927c':
  Fix year picker initial range
2015-02-17 22:36:06 +00:00