Commit Graph

2339 Commits

Author SHA1 Message Date
Deepanshu Gupta
616141bdcc am d9a137bd: am 77048379: Add view cookies for action bar menus. [DO NOT MERGE]
* commit 'd9a137bd84a0ebbcd34801da1442f8a6b0413c3e':
  Add view cookies for action bar menus. [DO NOT MERGE]
2014-05-13 01:52:25 +00:00
Deepanshu Gupta
7704837947 Add view cookies for action bar menus. [DO NOT MERGE]
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

The change also contains a bugfix where a method wasn't renamed
properly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
(cherry-picked from commit 5ba2f230fa)
2014-05-02 17:33:05 -07:00
Deepanshu Gupta
288d32b92b am 17e0eebd: am 465cb53b: Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
* commit '17e0eebdc6223de1f94b5ee538919adda9f58a9a':
  Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
2014-05-02 19:30:43 +00:00
Deepanshu Gupta
5a94ac6289 am 63a6de79: am 20e0695b: Action bar rendering in layoutlib [DO NOT MERGE]
* commit '63a6de79476e0d95a9bba2cc3599fc97a52bf6d5':
  Action bar rendering in layoutlib [DO NOT MERGE]
2014-05-02 19:30:33 +00:00
Deepanshu Gupta
465cb53ba4 Use ApplicationInfo only when not in edit mode [DO NOT MERGE]
When running in edit mode, do not use the application info to get the
icon, since it will be null.

Change-Id: I174e6126ddca341d06c5f04939470ef52f0e771c
2014-04-25 20:48:46 -07:00
Deepanshu Gupta
20e0695b55 Action bar rendering in layoutlib [DO NOT MERGE]
This also makes a couple of changes to the framework:
1. ShareActionProvider - Use edit mode to execute activity chooser code.
2. ActionBarImpl - add a new constructor for use by layoutlib.

This also relies on some changes to the plugin to pass the correct params.

Change-Id: Ia30fef816afd91ec1e439734d56b59b1323bfee2
(cherry-picked from 4ccc4bd54f)
2014-04-25 19:22:14 -07:00
Dianne Hackborn
c8911ddd48 am 373a2f15: am 607b414d: Add new app ops method to reset all op modes.
* commit '373a2f15667956ff8a00ba59b42972b9c930af92':
  Add new app ops method to reset all op modes.
2013-08-02 19:32:13 -07:00
Dianne Hackborn
607b414d04 Add new app ops method to reset all op modes.
Change-Id: I5ee6764de8dc31d812e5a788914ab0099bbef4c0
2013-08-02 19:06:25 -07:00
Elliott Hughes
e964387466 am 0bad5370: Merge "Handle missing and invalid numeric values in XmlUtils."
* commit '0bad537093ed5b493e4c2af778cf802a2cf2c15f':
  Handle missing and invalid numeric values in XmlUtils.
2013-07-18 10:41:41 -07:00
Elliott Hughes
0bad537093 Merge "Handle missing and invalid numeric values in XmlUtils." 2013-07-18 17:38:57 +00:00
Jean-Baptiste Queru
6cd4281dae am 65ba6d11: am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '65ba6d11e1f3ecf33a5b6e68ab8a6322e993b4d8':
  Fix typo in AlertController.java
2013-07-08 14:42:56 -07:00
Jean-Baptiste Queru
65ba6d11e1 am 1e7276ce: Merge "Fix typo in AlertController.java"
* commit '1e7276ce35f68c2df10b52c8adf8adc2882b8671':
  Fix typo in AlertController.java
2013-07-08 14:25:06 -07:00
Jean-Baptiste Queru
1e7276ce35 Merge "Fix typo in AlertController.java" 2013-07-08 21:22:18 +00:00
Vladimir Marko
2ddce3226e Handle missing and invalid numeric values in XmlUtils.
Convert these errors to XmlPullParserException.

Bug: 8584433
Change-Id: I070ed517682e7f047ec00271db26110da2bebb09
2013-07-02 10:21:31 +01:00
Elliott Hughes
b8292830f7 resolved conflicts for merge of a920f25f to jb-mr2-dev-plus-aosp
Change-Id: I3349f8d2e6715171e2677c1385122ceb2810c1f6
2013-06-28 16:50:13 -07:00
Elliott Hughes
a920f25fe5 resolved conflicts for merge of fca0f92e to stage-aosp-master
Change-Id: I4791f0ffa324a313b8390fbde6d8f82f716ecf74
2013-06-28 16:41:19 -07:00
Elliott Hughes
d396a448b2 Switch frameworks/base over from @hidden Charsets to public StandardCharsets.
Bug: 3484927
Change-Id: I5d136d2ee629588538602766a182ae14ce5fc63c
2013-06-28 16:24:48 -07:00
Jeff Sharkey
ffbbe94506 am d293d229: Merge "Create missing Uids when recording network stats." into jb-mr2-dev
* commit 'd293d229493a2d661ebb1776a0915297927a5ca6':
  Create missing Uids when recording network stats.
2013-06-04 16:57:51 -07:00
Jeff Sharkey
51797ed706 Create missing Uids when recording network stats.
Bug: 5543387
Change-Id: I138c8d2f84e6fd737f2f6ef0945e75ca31256e3d
2013-06-04 14:09:31 -07:00
Jeff Brown
6474d8407c am 636af7a1: Merge "Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity." into jb-mr2-dev
* commit '636af7a1cb90bb2f422bc85356d30f5b4e9342e6':
  Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
2013-05-30 18:00:08 -07:00
Jeff Brown
14507e257a Rename CALLBACK_FLAG_ACTIVE_SCAN for clarity.
Bug: 9210033
Change-Id: I973c03b3a37e12af72a27c46d7da7fb59a30b606
2013-05-30 14:44:18 -07:00
Michael Wright
4759c35e42 am bf0d561c: Merge "Pipe through bounding box information (DO NOT MERGE)" into jb-mr2-dev
* commit 'bf0d561c73abd97a1a3794e9aa62b21911279a12':
  Pipe through bounding box information (DO NOT MERGE)
2013-05-24 13:53:47 -07:00
Michael Wright
5e025eb1dc Pipe through bounding box information (DO NOT MERGE)
Bug: 9110236
Change-Id: I7aefe6589fbaf92e5c71a0ba5425623578bafe95
2013-05-23 15:06:47 -07:00
Dianne Hackborn
e8c9b39ec9 am 83d6df27: Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev
* commit '83d6df27d40aed18a7dc42c9320f83656cc81ea0':
  Help on issue #8863955: Google Services keeping phone awake...
2013-05-09 23:40:28 -07:00
Dianne Hackborn
83d6df27d4 Merge "Help on issue #8863955: Google Services keeping phone awake..." into jb-mr2-dev 2013-05-09 23:47:22 +00:00
Jeff Brown
da58f92bfa am b2f6842d: Merge "Add an API to allow a callback to request active scans." into jb-mr2-dev
* commit 'b2f6842d5528345e02a91218fbe58c3e0ca8bafb':
  Add an API to allow a callback to request active scans.
2013-05-09 16:23:43 -07:00
Dianne Hackborn
af17baa271 Help on issue #8863955: Google Services keeping phone awake...
...because of Google Play Services

Raise the limit on the number of wake locks we track per uid.

Get rid of the separate limit for the system process, since it
now isn't any larger than the new limit for regular processes.

Change-Id: Ic10c81cad7d4ad4aabf1f53f78191a0973a1d784
2013-05-09 15:27:47 -07:00
Jeff Brown
66f3b39ec4 Add an API to allow a callback to request active scans.
This API is needed by the support library media router to ensure
that wifi display routes can be discovered while the route
chooser dialog is open.

Bug: 8175766
Change-Id: I3773773d93384aa4a3c009e71a5444ee8ce37caf
2013-05-09 14:44:08 -07:00
Adam Powell
f581b533cf am 2b662e8e: Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev
* commit '2b662e8ef96c645e38a3debc29afa7454664f6cb':
  Fix a NPE in MenuItemImpl when setting null ActionProvider
2013-05-06 08:44:33 -07:00
Adam Powell
2b662e8ef9 Merge "Fix a NPE in MenuItemImpl when setting null ActionProvider" into jb-mr2-dev 2013-05-03 18:58:35 +00:00
Satoshi Kataoka
ee0a5fafa7 am 245a3e1c: Merge "Change the initial disabled state of disabled IMEs" into jb-mr2-dev
* commit '245a3e1c1ed265a13d07000ef6e786ec321b85c4':
  Change the initial disabled state of disabled IMEs
2013-05-03 11:19:01 -07:00
Adam Powell
dcc55855bc Fix a NPE in MenuItemImpl when setting null ActionProvider
Change-Id: I00be010b2197d0f41d0e45b3814474d3ad0c3295
2013-05-03 11:03:10 -07:00
Satoshi Kataoka
ed1cdb24ba Change the initial disabled state of disabled IMEs
Bug: 8365223

This change is a supplement for I77f01c70610d82ce9070d4a
The disabled state of disabled pre-installed imes should be changed
to ENABLED_STATE_DISABLED_UNTIL_USED on boot or user switch.

Change-Id: If8ff1b2b95c36d33148def2ab87bd006aa520cc0
2013-05-02 17:53:17 +09:00
Casey Burkhardt
dd7d8ec17e am 203aa72e: Merge "Rebuilds ActionBar accessibility description as needed" into jb-mr2-dev
* commit '203aa72e747794a64a8262ceb6c9cdc8381e77cb':
  Rebuilds ActionBar accessibility description as needed
2013-04-30 17:20:12 -07:00
Casey Burkhardt
8452a7f2f6 Rebuilds ActionBar accessibility description as needed
Previously, ActionBarView only updated the contentDescription for the navigate
up/home affordance when it is enabled or disabled.  This causes that description
to be rebuilt and applied whenever the title or subtitle of the view is changed.
This also inadvertantly removes whitespace in ActionBarView.

Bug: 8757286
Change-Id: I1ea02cad20e0d5c0c57d071727cc647c4dd52d44
2013-04-30 16:05:56 -07:00
Alex Klyubin
50289346b3 am a6436526: Merge "Human-readable POSIX capabilities for SystemServer."
* commit 'a643652680486bd1009248d1bd8fcea7da92d661':
  Human-readable POSIX capabilities for SystemServer.
2013-04-23 23:46:25 -07:00
Alex Klyubin
48a06e7407 Human-readable POSIX capabilities for SystemServer.
Change-Id: I8fecdc55b2cf0041ceed643eb48df53d22ecd600
2013-04-22 14:29:23 -07:00
Adam Powell
2eeb419e55 Fix ActionBar#setHomeActionContentDescription(0)
This call should be analogous to calling
setHomeActionContentDescription(null) and not throw an exception.

Bug 8657256

Change-Id: Ifa9c7b999f4bf1a31fba43f869e234b1f1861512
2013-04-18 13:56:22 -07:00
Jim Miller
b1e5137a80 Merge "Move owner info from Settings.Secure to LockSettings" into jb-mr2-dev 2013-04-17 20:39:58 +00:00
Jim Miller
187ec581c6 Move owner info from Settings.Secure to LockSettings
Fixes bug 8512972

Change-Id: Ic046aff0332b78489dda08b1e9e71f4c16154f10
2013-04-16 18:33:43 -07:00
Jamie Gennis
6ad0452e63 Disable tracing from Zygote
This change disables all atrace tracing in Zygote immediately after it is
initialized.  This is necessary because Zygote has no way to receive
notifications that the enabled trace tags have been changed.  Tracing is
re-enabled when other processes fork from Zygote.

Change-Id: If2983858fb0c4890ba9ab041849b1c4d98f66c13
2013-04-16 22:15:21 +00:00
Svetoslav Ganov
ad435ba7ff Merge "Send tab selection event from ScrollingTabContainerView." into jb-mr2-dev 2013-04-16 21:41:09 +00:00
Wink Saville
03812c7894 Add mHasQuit to fix an NPE in StateMachine.
After quiting mStateStack and other variables become
null so ignore all messages.

Bug: 8627228
Change-Id: I60150fb8023340768b38c2e72a8cbc982a59e0a8
2013-04-16 13:21:00 -07:00
Alan Viverette
b9f2e99f26 Send tab selection event from ScrollingTabContainerView.
BUG: 8185409
Change-Id: I37c59906d2950d09e0e39ca91ffad34279dd9526
2013-04-15 16:16:11 -07:00
Jim Miller
eec68e55cc Merge "Fix keyguard pattern invalidate bug" into jb-mr2-dev 2013-04-11 22:37:59 +00:00
Benjamin Poiesz
39f96f95c3 Adding LocalePicker support for the zz_ZZ pseudolocale
Bug #8556677

Change-Id: I47244765b240f1ba66eadbef4ac712cf4367566e
2013-04-11 13:49:54 -07:00
Jim Miller
9ddfeb83aa Fix keyguard pattern invalidate bug
The framework used to invalidate both the previous invalidate
region and the current one. However, with change I9fb96f99
this is no longer the case (it was always true for software
rendering, but never showed because most platforms use
acceleration).

The fix is to invalidate the union of the old region and
the new region ourselves.

Fixes bug 8503031

Change-Id: If303e0892772dd9d6915efa55118d054a742c1a5
2013-04-10 18:15:30 -07:00
Adam Powell
daa1d56726 Fix for ActionBar#setSelectedNavigationItem() in collapsed tab mode
Make sure the selected item is properly propagated to the collapsed
spinner.

Bug 6754308

Change-Id: Iaa4e331b00106b31c5984980d33e3ac88853ae4d
2013-04-09 13:57:22 -07:00
Dianne Hackborn
bc94810104 Merge "Have audio service clean up new receivers in crashing processes." into jb-mr2-dev 2013-04-08 20:10:37 +00:00
Dianne Hackborn
79f7ec70eb Have audio service clean up new receivers in crashing processes.
The new media button receiver with only a pending intent (no
component name) could be left hanging if the process that
registered it went away.  These semantically need to be tied
to the calling process's lifetime; we now clean them up when
the calling process goes away.

Also added some additional cleanup of media button receivers
when packages change (updated, cleared).

And on top of that, a new "media" command for doing media
things.  Currently lets you send media keys and monitor
remote display data.

Oh and finally added a new BaseCommand base class for
implementing these command line utilities.

Change-Id: Iba1d56f10bab1eec4a94a7bb1d1c2ae614c8bcf5
2013-04-08 13:08:37 -07:00