Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
217,097 Commits 3 Branches 0 Tags
2fd7cc5ba593c47cb9028faced8fa64905a16121
Commit Graph

57490 Commits

Author SHA1 Message Date
Wale Ogunwale
2fd7cc5ba5 Merge "Ignore empty locale list when diffing Configuration objects" 2015-09-03 22:55:41 +00:00
Wale Ogunwale
b1a4bf2c4b Ignore empty locale list when diffing Configuration objects 
b46fdd4 introduced the concept of locale list to Configuration objects.
However, the change alway returned a locale difference when the delta
object locale list is set to the defualt (empty). We now don't return
a difference if the delta object as an empty locale list which is
consistent with what we did before the change and in line with how we
diff other configuration fields.

Bug: 23744091
Change-Id: I8c2c39d9a7e91e6a3a283312b745c4fdf6874396
 2015-09-03 15:08:51 -07:00
Adrian Roos
c0c140a136 am 5b92de04: am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '5b92de04b7ff9954a50e54a86f11443a904fa547':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 22:06:08 +00:00
Alan Viverette
a0a4f474c8 Merge "Minor clean up in ActivityThread, mostly final usage" 2015-09-03 21:39:26 +00:00
Alan Viverette
f22e290e2f Merge "Postpone loading app context until instrumentation is set up" 2015-09-03 21:39:07 +00:00
Adrian Roos
5b92de04b7 am 6bd2f87e: am bd2ad550: am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '6bd2f87ee4eac554646c5b04c44b6e3402bac84e':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 20:07:30 +00:00
Adrian Roos
bd2ad550c5 am 34411e8f: Merge "Don\'t disable fingerprint when entering wrong credential" into mnc-dr-dev 
* commit '34411e8fecab310a0402bd77e8fe5a5a488a783a':
  Don't disable fingerprint when entering wrong credential
 2015-09-03 19:46:45 +00:00
Adrian Roos
34411e8fec Merge "Don't disable fingerprint when entering wrong credential" into mnc-dr-dev 2015-09-03 19:42:39 +00:00
Adrian Roos
af4ab3e2d3 Don't disable fingerprint when entering wrong credential 
Bug: 23748205
Change-Id: I0ee2a0562d5ef2992a6a4b40d235601b19dcef16
 2015-09-03 12:34:12 -07:00
Alan Viverette
be64eae333 Minor clean up in ActivityThread, mostly final usage 
Change-Id: Ic98103cb8b2ac6fb9b37fc9457366ded2bfbb7a8
 2015-09-03 14:56:04 -04:00
Alan Viverette
2107d69d35 Postpone loading app context until instrumentation is set up 
The application context needs instrumentation data to be in place
prior to construction so that the class loader is initialized using
the correct paths.

Removes unnecessary clearClassLoader() workaround that was previously
added to fix instrumentation tests.

Bug: 22627299
Change-Id: Ibf8e69e037189a9a563f0b68cfe333461726b71d
 2015-09-03 14:55:27 -04:00
Michael Wright
56dafdb5ae am 7f7ffa37: am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '7f7ffa3722ef90a7bf5611221c4a4c9d06823a38':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 17:37:10 +00:00
Xiaohui Chen
e2796c216e Merge "Cleanup USER_OWNER in a11y manager and tests" 2015-09-03 17:24:47 +00:00
Michael Wright
7f7ffa3722 am 87e4c951: am 59c1a0e1: am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '87e4c951bf876faefad9f4223f6a568777425ae7':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 14:30:27 +00:00
Michael Wright
59c1a0e1cb am 8ae90587: Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 
* commit '8ae90587a510f72a176119b1f23add8bc36285b9':
  Add TabletModeChangedListener for SystemUI.
 2015-09-03 14:10:05 +00:00
Michael Wright
8ae90587a5 Merge "Add TabletModeChangedListener for SystemUI." into mnc-dr-dev 2015-09-03 14:00:52 +00:00
Daniel Estrada Alva
3916e7e757 am 429b020e: am 280b4495: am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit '429b020e615eebd244208373c2a3e81c59da36ec':
  Add SUPL-specific network bcast
 2015-09-03 06:40:03 +00:00
Clara Bayarri
13612c332a am 3b60f72f: am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit '3b60f72fbaaeb7c52f5e86ff9f8d5dade0d0b444':
  Fix Custom action mode menu item onclick is not working
 2015-09-03 06:39:13 +00:00
Daniel Estrada Alva
429b020e61 am 280b4495: am 967c8816: am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit '280b4495bd492f68e955ea8e1649abe832ced974':
  Add SUPL-specific network bcast
 2015-09-03 06:23:10 +00:00
Clara Bayarri
3b60f72fba am 9b126882: am 01232c50: am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit '9b126882e61f2a1c3b0d1876c2bea3b38bbbafed':
  Fix Custom action mode menu item onclick is not working
 2015-09-03 06:21:25 +00:00
Daniel Estrada Alva
967c8816e5 am cfd45ae4: Merge "Add SUPL-specific network bcast" into mnc-dr-dev 
* commit 'cfd45ae4718934d403a17410ab6a7c722bdd01fc':
  Add SUPL-specific network bcast
 2015-09-02 21:11:38 +00:00
Daniel Estrada Alva
cfd45ae471 Merge "Add SUPL-specific network bcast" into mnc-dr-dev 2015-09-02 21:04:19 +00:00
Alan Viverette
102d45209c Actually fix docs build breakage this time 
Change-Id: I980544b65342cc37cdc1cfcb589f32eae6b1b354
 2015-09-02 16:50:42 -04:00
Alan Viverette
735eeb2cd2 Merge "Fix docs build breakage" 2015-09-02 20:18:46 +00:00
Alan Viverette
ed63b3a504 Fix docs build breakage 
Change-Id: Ibea95d06443f5bf42bd62b649bd02a3b9b644910
 2015-09-02 16:16:54 -04:00
Xiaohui Chen
9daa916a4d Cleanup USER_OWNER in a11y manager and tests 
Bug: 19913735
Change-Id: Icc2b55e685e7f9c212326bf2317ea9a7afce0359
 2015-09-02 13:15:33 -07:00
Oren Blasberg
c2dde0ae78 Merge "MenuPopupHelper: Factor out a MenuPopup interface." 2015-09-02 19:25:30 +00:00
Oren Blasberg
b23976efdd MenuPopupHelper: Factor out a MenuPopup interface. 
Move much of the responsibility into implementations of this interface.
Delegate functionality to it where appropriate.
Provide a standard (non-cascading) implementation for this interface.

This CL should have NO BEHAVIOR CHANGES.

A follow-up CL will provide a cascading implementation, whereby a
config variable will enable submenus to open side by side with their
parent menus. That CL will be the first with functional/ actual behavior
changes.

Bug: 20127825
Change-Id: Iecac2d340dd8750ebe4e99162d447c9411f09227
 2015-09-02 11:52:24 -07:00
Alan Viverette
458e7589dd Merge "Add note that getContentDescription() should not be overridden" 2015-09-02 17:32:30 +00:00
Yasuhiro Matsuda
6d444185e5 resolved conflicts for merge of fcf9ab5a to master 
Change-Id: I69ad6e525430c5c4fc3c274b8bf6ebf653716124
 2015-09-03 00:12:30 +09:00
Yasuhiro Matsuda
fcf9ab5ab3 am ebf9465d: resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
* commit 'ebf9465d213336819b15e3b21d02afce64470d4f':
  Add trace code to system server.
 2015-09-02 14:31:26 +00:00
Yasuhiro Matsuda
ebf9465d21 resolved conflicts for merge of ef57e5e0 to stage-aosp-master 
Change-Id: I1c31b38936dc74619dea27f0d5eecab43360bb8c
 2015-09-02 22:57:53 +09:00
Yasuhiro Matsuda
ef57e5e03b Merge "Add trace code to system server." 2015-09-02 12:54:23 +00:00
Clara Bayarri
01232c508e am 582b186c: am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit '582b186cd3b41c5c67649ae2ba9176c3860ab1ec':
  Fix Custom action mode menu item onclick is not working
 2015-09-02 10:10:47 +00:00
Clara Bayarri
582b186cd3 am f7b220ab: Merge "Fix Custom action mode menu item onclick is not working" into mnc-dev 
* commit 'f7b220ab9f62be3d279e3fa7923c249ff0fa09f3':
  Fix Custom action mode menu item onclick is not working
 2015-09-02 09:59:36 +00:00
Nicolas Prévot
4c82053a76 Merge "Fix documentation of EXTRA_PROVISIONING_DEVICE_ADMIN_PACKAGE_NAME" 2015-09-02 09:25:57 +00:00
Oren Blasberg
ddc453a342 Add a new submenu arrow for popup menu items. 
This arrow is shown when the item corresponds to a submenu.

Bug: 20127825
Change-Id: Ida70d7707e00e1cda84ed6135333f09a511cd6c5
 2015-09-01 16:38:06 -07:00
Robert Greenwalt
e94a6ff5dc Add SUPL-specific network bcast 
Move SUPL CONNECTIVITY_ACTION bcasts to a different, hidden intent
to reduce the churn of apps when SUPL comes/goes.

Short term hack until SUPL moves to use the new APIs and there's
no bcast.

bug:23350688
Change-Id: I3dc14b42afa72465260aa41ccedfe1df27baabd9
 2015-09-01 15:06:04 -07:00
Roozbeh Pournader
008d6d034e Merge "Add LocaleList support to Paint and TextView." 2015-09-01 21:14:11 +00:00
Roozbeh Pournader
a23748a9ff Add LocaleList support to Paint and TextView. 
This keeps the existing single-locale APIs working (and adds
parameter annotations to them), while adding an API for setting and
getting the whole locale list.  At the moment, the implementation
ignores the actual data in the locale list except for its primary
locale.

Also add a method to LocaleList to return the system's default locale
list. (Currently a one-member list just containing the system
default locale.)

Change-Id: Icea9d164ddae51f50dd71e18b5d91c96f233b8b8
 2015-09-01 14:12:40 -07:00
Oren Blasberg
6b49d30034 Merge "Pull out widget helpers into their own classes." 2015-09-01 21:11:04 +00:00
Alan Viverette
8056e41324 Merge "Reset class loader after updating instrumentation paths" 2015-09-01 21:00:15 +00:00
Tim Kilbourn
62062cf0d1 Merge "Fix input device listener registration in InputManager" 2015-09-01 20:40:43 +00:00
Tim Kilbourn
9ddb864bab Fix input device listener registration in InputManager 
If registerInputDeviceListener is called without enumerating input
devices, the InputManager will never register itself with the input
service.

Bug: 10415556
Change-Id: I0ae50bd1d4b8264ffe308b96e75c01cd47cf2387
 2015-09-01 13:28:18 -07:00
Alan Viverette
bea0c7daa6 Keep local run queue in View to avoid posting to wrong thread 
Previously any call to post() while a view was detached would stash the
runnable on a thread-local RunQueue. If the post() call happened off the
UI thread to which the view would later be attached, this would result
in the runnable either failing to run or running on some other UI thread.

Bug: 22828132
Change-Id: I5289ee91ea4b56c45f003a387a9f7f0e6dc050f9
 2015-09-01 16:00:20 -04:00
Roozbeh Pournader
cdc5673633 Merge "Make res.Configuration support locale lists." 2015-09-01 17:55:49 +00:00
Alan Viverette
346296bd7d Reset class loader after updating instrumentation paths 
Bug: 23688983
Change-Id: I9a0f81b422b5e29f3f8707b987e40c65965e0223
 2015-09-01 13:08:05 -04:00
Nick Kralevich
26637cb3fd am 1293b953: am 712205ba: am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '1293b953c4c82dfc8738ba1dfc48f7739df78c69':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 17:06:15 +00:00
Nick Kralevich
1293b953c4 am 712205ba: am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '712205bac075dc59a1ccd79a860d553ba31402f0':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 16:51:19 +00:00
Nick Kralevich
712205bac0 am 9d586927: Merge "Automatically assign default seinfo labels using the string "default"." 
* commit '9d586927102b597845607ccc82661e350821de82':
  Automatically assign default seinfo labels using the string "default".
 2015-09-01 16:37:59 +00:00