222198 Commits

Author SHA1 Message Date
Alan Viverette
1ca1860f97 Merge "Clean up PopupMenu" 2015-11-16 22:24:29 +00:00
Alan Viverette
1a6436c9ea Merge "Clean up TimePicker" 2015-11-16 22:24:12 +00:00
Michael Kwan
8d6630b87c DO NOT MERGE ANYWHERE - Hack to disable MTP mode on Clockwork devices.
Android currently forces USB into MTP mode if there was no modes
specified. This causes issues on Clockwork devices as they do not
support MTP.

The hack stops this behaviour, and also sets MTP mode back to none.

Bug: 25547826
Bug: 25582050
Bug: 25244201
Change-Id: I772e35d0a5db51b17e9d71c59e6a157dabb1d296
2015-11-16 14:05:29 -08:00
Alan Viverette
7323810898 Clean up PopupMenu
No functional changes, only refactoring:
- remove unused mShowCascadingMenus member variable
- move private interface implementations to anonymous inner classes
- move interfaces to end of class
- clean up docs formatting

Change-Id: Ib82ca0d3a3ff49207959a17b77c4ff4f11a1afc2
2015-11-16 16:55:58 -05:00
Philip P. Moltmann
354bd63726 Merge "Show "select a printer" as "destination" the first the the user prints" 2015-11-16 21:43:22 +00:00
Rom Lemarchand
152d353e87 Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
am: 5032e49f9e

* commit '5032e49f9e8ec8307dbc265a78649c2b49e4e5ad':
  resolved conflicts for 7de7e0b0 to stage-aosp-master
  BatteryService: Add Max charging voltage
  Stop setting swappiness.
2015-11-16 21:43:06 +00:00
Alan Viverette
3b7e2b9102 Update the TimePicker hour format when toggling 24-hour mode
Bug: 25615007
Change-Id: I47a9f6b07e0cf7c86ca6d25c835a06878878d483
2015-11-16 16:38:38 -05:00
Adam Lesinski
2c23271c75 Merge "AAPT2: Be more strict parsing references" 2015-11-16 21:36:54 +00:00
Adam Lesinski
dcdf08ff4c Merge "AAPT2: Minor fixes to SymbolTable and diagnostic output" 2015-11-16 21:36:14 +00:00
Rom Lemarchand
5032e49f9e Merge changes I4e45e5bb,Ibeba97eb,I8e8b892b into mnc-dr2-dev
* changes:
  resolved conflicts for 7de7e0b0 to stage-aosp-master
  BatteryService: Add Max charging voltage
  Stop setting swappiness.
2015-11-16 21:33:48 +00:00
Alan Viverette
4420ae875d Clean up TimePicker
No functional changes, only refactoring:
- shorten method and variable names
- remove unused validation callback
- avoid using return in setters

Change-Id: Ie7c19cfe3c5cb515695f943c534899d37ad032bb
2015-11-16 16:10:56 -05:00
Wale Ogunwale
3cd48043a3 Set-up dummy animation when setting a replacing window token
Set-up dummy animation so we can start treating windows associated
with the replacing app token like they are in transition before the
new app window is ready for us to run the real transition animation.
This allows us to make the right decisions at various call points
where an animation is expected to be running for a replacing window
but the real animation isn't set yet.

Also, removed unused field indicating if an app token is animating
a replacement window since it was always set to true and checked/set
to the same value as AppWindowToken.mWillReplaceWindow.

Bug: 25645069
Change-Id: Ie216ed5bd60fb2a15da61c7050c9344c48b1c5fb
2015-11-16 13:09:29 -08:00
Eino-Ville Talvala
07437cbc9c Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0 am: 579cc90e61
am: e1cbe99e5f

* commit 'e1cbe99e5ff222f5d017af83466793209e668ed7':
  Camera: Minor documentation update
2015-11-16 20:59:58 +00:00
Fyodor Kupolov
11c5b0aff7 Merge "Reduce excessive locking in UserManager" 2015-11-16 20:52:05 +00:00
Eino-Ville Talvala
e1cbe99e5f Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9 am: c24b39e0c0
am: 579cc90e61

* commit '579cc90e61598c57a8225cbea4bfe035e5e1963c':
  Camera: Minor documentation update
2015-11-16 20:51:32 +00:00
Chad Brubaker
fd0d31a3f4 Add NetworkSecurityConfigProvider.install
This method is not currently called.

Change-Id: I73fd166b03009526868e0d9b5b209a9adaa4232f
2015-11-16 12:49:36 -08:00
Eino-Ville Talvala
579cc90e61 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c am: 784f0f15a9
am: c24b39e0c0

* commit 'c24b39e0c0f760ac6a53d4fbbf1ed1885fd64529':
  Camera: Minor documentation update
2015-11-16 20:44:44 +00:00
Alan Viverette
c45b1d4ae4 Use correct rounding in View for potentially negative values
Fast rounding doesn't work for negative values, so use Math.round()
where we might encounter negative values. Use Math.floor() and ceil()
for rounding down and up, respectively.

Bug: 25695621
Change-Id: I94831b8eb7552fc24cbe5808e923de1674d8ba6d
2015-11-16 15:38:59 -05:00
John Reck
f286822aad Merge "Extensions must load in ctor" 2015-11-16 20:36:01 +00:00
Eino-Ville Talvala
f5b98ee1dc Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c
am: 784f0f15a9

* commit '784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
  Camera: Minor documentation update
2015-11-16 20:35:51 +00:00
Eino-Ville Talvala
c24b39e0c0 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759 am: 062c629e5c
am: 784f0f15a9

* commit '784f0f15a9a2026ee1acd57f9fca4e3dff28c090':
  Camera: Minor documentation update
2015-11-16 20:35:48 +00:00
Adam Lesinski
7298bc9c85 AAPT2: Be more strict parsing references
Change-Id: I3d54a519687fff1e66acb8e395ef99ba01a1b845
2015-11-16 12:31:52 -08:00
Alex Klyubin
00245ffce4 Merge "Insert Android Keystore JCA Provider at the correct position." am: 887d348d7e
am: 5995579f5f

* commit '5995579f5ff1511f4a089dd0537cd634fb615465':
  Insert Android Keystore JCA Provider at the correct position.
2015-11-16 20:31:36 +00:00
Eino-Ville Talvala
784f0f15a9 Camera: Minor documentation update am: 0b6e1bfae8 am: 0691d16759
am: 062c629e5c

* commit '062c629e5c6270da232bbd2800966ab5dc6c615f':
  Camera: Minor documentation update
2015-11-16 20:27:03 +00:00
Alex Klyubin
5995579f5f Merge "Insert Android Keystore JCA Provider at the correct position."
am: 887d348d7e

* commit '887d348d7ed5e1c2a1687eb774db46d571a8f43d':
  Insert Android Keystore JCA Provider at the correct position.
2015-11-16 20:22:51 +00:00
Eino-Ville Talvala
062c629e5c Camera: Minor documentation update am: 0b6e1bfae8
am: 0691d16759

* commit '0691d16759bf58a93209d4ab156e96f96fed7092':
  Camera: Minor documentation update
2015-11-16 20:16:45 +00:00
Philip P. Moltmann
ca3f938326 Merge "Switch add icons to the default menu add icon" 2015-11-16 20:16:23 +00:00
Alex Klyubin
887d348d7e Merge "Insert Android Keystore JCA Provider at the correct position." 2015-11-16 20:14:43 +00:00
Philip P. Moltmann
5e54896d0b Show "select a printer" as "destination" the first the the user prints
The Spinner does not support a prompt, hence temporarily hijack the
first element and install an alternate view. Once the Spinner is touched
revert to the old behavior.

If we showed a prompt the views in the spinner cannot be recycled.

Bug: 24132864
Change-Id: Iaf97878f85388a8c6351e716117b16f34919ad84
2015-11-16 12:14:18 -08:00
Filip Gruszczynski
608797e210 Remove unnecessary DisplayContent.mDisplaySizeLock synchronization.
All operations are performed with WindowManagerService.mWindowMap lock
held, therefore the second lock is not necessary.

Change-Id: I762fb322ddeb8b45191a3d297de0d33a10674f8a
2015-11-16 12:12:15 -08:00
Eino-Ville Talvala
0691d16759 Camera: Minor documentation update
am: 0b6e1bfae8

* commit '0b6e1bfae848b7b177bba9c8119ad44cdc05684a':
  Camera: Minor documentation update
2015-11-16 20:07:02 +00:00
Adam Lesinski
e352b990e1 AAPT2: Minor fixes to SymbolTable and diagnostic output
The SymbolTable lookup relied on the configuration, which we NEVER
want. Now we rely solely on the symbols defined in the ResTable
and no specific configuration or value of that symbol.

Also added some better source logging.

Change-Id: I983855c283493e924b2e92a9fd8e4cb841769349
2015-11-16 11:59:14 -08:00
Philip P. Moltmann
7dfe4f64dc Switch add icons to the default menu add icon
Also use the material search icon.

Bug: 22563699
Change-Id: Iff7c6b5cac8a9f0bf282e061d2ed09c4c0fb480a
2015-11-16 11:58:46 -08:00
Steve McKay
c89cc4419e Merge "Add test size annotations to docsui tests." 2015-11-16 19:47:53 +00:00
Jeffrey Vander Stoep
25bfb2b3d8 Merge "pm: selinux support for AutoPlay apps" 2015-11-16 19:38:33 +00:00
Erik Wolsheimer
fa17e61291 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c am: 7698dd970f
am: ae4ab3501a

* commit 'ae4ab3501a0400940ace2d0bfdf0d7021c740603':
  Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:26:12 +00:00
Chris Craik
98787e6c9b Finish shadow support in new reorderer/renderer
Now passes alphas and light radius, and correctly transforms light
center for layers.

Also fixes begin-frame/layer clears to be damage rect aware.

Change-Id: I3b1415cd7bf1518c510145ebebdb745f494a2542
2015-11-16 11:21:18 -08:00
Erik Wolsheimer
ae4ab3501a Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e am: 529893f84c
am: 7698dd970f

* commit '7698dd970fbfb81fcdc700827c1620440c6e81a1':
  Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:20:35 +00:00
Erik Wolsheimer
7698dd970f Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9 am: b45defae8e
am: 529893f84c

* commit '529893f84cc62893ad6111816954b0bc7c829cee':
  Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:12:17 +00:00
Erik Wolsheimer
2fba776ee0 Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
  Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:03:53 +00:00
Erik Wolsheimer
529893f84c Log errno when dup fd cannot be allocated BUG: 25165471 am: 211abad3b9
am: b45defae8e

* commit 'b45defae8e61a4fa3aba9dd08480861d10f5982a':
  Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 19:03:52 +00:00
Erik Wolsheimer
b45defae8e Log errno when dup fd cannot be allocated BUG: 25165471
am: 211abad3b9

* commit '211abad3b92b70dd094949c79f67e686c940fa0c':
  Log errno when dup fd cannot be allocated BUG: 25165471
2015-11-16 18:55:29 +00:00
Selim Cinek
54d8539d09 Merge "Fixed a crash with the heads up manager" 2015-11-16 18:52:32 +00:00
Selim Cinek
81831c9cd3 Merge "Fixed error in GroupManager" 2015-11-16 18:46:33 +00:00
Selim Cinek
f5fae39a55 Merge "Fixed a bug where a notification could get removed" 2015-11-16 18:44:56 +00:00
Todd Kennedy
3b91bd2173 resolved conflicts for 7de7e0b0 to stage-aosp-master
(cherry picked from commit 9f8602644418ecfb1a5c9555792ceed285fa72bd)

Change-Id: I4e45e5bbaebb98b0e740167eaf7517f99d917f30
2015-11-16 10:43:53 -08:00
Badhri Jagan Sridharan
4f72447fbf BatteryService: Add Max charging voltage
Bug: 25229483
Change-Id: Ibeba97eb145c3d59a763bd8632ab7fcc43118e4b
(cherry picked from commit f92fcfe36ad841cba4774e7f2129e8dab7ac784a)
2015-11-16 10:43:52 -08:00
Martijn Coenen
75603fb707 Stop setting swappiness.
We're re-enabling memory cgroups on Ariel
to use user-space lmkd. As a side-effect, this
code will start setting swappiness again. Since the
benefit of swappiness is unknown at this point
(see b/18248535 for details), disable it until
we have good data it helps.

Change-Id: I8e8b892ba0db27469f2d47615f71ce1d2712acbf
2015-11-16 10:43:52 -08:00
Selim Cinek
d18a45743f Merge "Allow clicking fullscreen intent notifications now" 2015-11-16 18:43:33 +00:00
John Reck
1540153198 Extensions must load in ctor
Because Caches is terrible

Change-Id: I91e2442d97664759ee2c7602eb7172f009b20d53
2015-11-16 10:42:36 -08:00