Commit Graph

56652 Commits

Author SHA1 Message Date
Todd Kennedy
703df7f0fa Merge "dump apk signing version" into nyc-dev am: 40a6e6a10e
am: 8b25c1ba29

* commit '8b25c1ba294f2249e1cf16be87d97460248c3422':
  dump apk signing version
2016-03-04 18:39:28 +00:00
Todd Kennedy
8b25c1ba29 Merge "dump apk signing version" into nyc-dev
am: 40a6e6a10e

* commit '40a6e6a10e0b411fd7434d586f2323674b11b757':
  dump apk signing version
2016-03-04 18:37:39 +00:00
Todd Kennedy
40a6e6a10e Merge "dump apk signing version" into nyc-dev 2016-03-04 18:34:00 +00:00
Michal Karpinski
b04e2ada12 Merge "Rework of remote bugreports UX" into nyc-dev am: bf8f1cc3c0
am: 7371f4c9e6

* commit '7371f4c9e61948a13d654b3e10109c01b60feb8b':
  Rework of remote bugreports UX
2016-03-04 09:59:51 +00:00
Michal Karpinski
7371f4c9e6 Merge "Rework of remote bugreports UX" into nyc-dev
am: bf8f1cc3c0

* commit 'bf8f1cc3c0d9931828d166aea585b6b29d4c6664':
  Rework of remote bugreports UX
2016-03-04 09:57:55 +00:00
Michal Karpinski
bf8f1cc3c0 Merge "Rework of remote bugreports UX" into nyc-dev 2016-03-04 09:52:32 +00:00
Wale Ogunwale
65219c9a79 Clear app token mAppStopped when app resumes. am: 8d5a542f66
am: 439381fdbc

* commit '439381fdbcc8f6136fd991482466f95ef2b18cbd':
  Clear app token mAppStopped when app resumes.
2016-03-04 03:10:08 +00:00
Wale Ogunwale
439381fdbc Clear app token mAppStopped when app resumes.
am: 8d5a542f66

* commit '8d5a542f66beae774354038f15dd1afe7fcf754b':
  Clear app token mAppStopped when app resumes.
2016-03-04 03:08:16 +00:00
Wale Ogunwale
8d5a542f66 Clear app token mAppStopped when app resumes.
It is possible for an activity to be in the stopped state without
setting it's visiblility to false in window manager.
For example, the home acitivty behind the lock screen. Since the
lock screen isn't an activity it doesn't affect the visiblity set
of the home activity, so AM doesn't tell WM to hide the app token.
However, AM uses another channel to detect that the device is locked
and moves the activity into stopped state. WM on the other hand also
detects that the device is locked and hides the window surfaces of
all windows behind the lock screen. So, at this point AM has also
told WM that the activity is stopped. Once you unlock the screen
AM resumes the activity but doesn't report any visiblility changes to WM
since it's internal state didn't change. So, if you go from the home
activity to another app the home activity window will be destroyed
before the activity is stopped because mAppStopped is set to true.
We now set mAppStopped to false when the activity is resumed.

Bug: 27286867
Change-Id: Ic75456d30abd582fa44f932f5aeeb449950157ee
2016-03-03 18:59:26 -08:00
Steve McKay
49890efeb8 Merge "Make COLUMN_CAPACITY_BYTES public." into nyc-dev am: 75b19dd208
am: 1f1e4bd8d0

* commit '1f1e4bd8d02cf2717ab3692eb315d657588b730f':
  Make COLUMN_CAPACITY_BYTES public.
2016-03-04 02:20:27 +00:00
Steve McKay
1f1e4bd8d0 Merge "Make COLUMN_CAPACITY_BYTES public." into nyc-dev
am: 75b19dd208

* commit '75b19dd20843eebc5691eb1d2cdb794abb61693c':
  Make COLUMN_CAPACITY_BYTES public.
2016-03-04 02:16:58 +00:00
Steve McKay
75b19dd208 Merge "Make COLUMN_CAPACITY_BYTES public." into nyc-dev 2016-03-04 02:12:02 +00:00
The Android Automerger
1ccd57a91c Merge commit '22e01d5611d14cc04055b8abcbd1e8c114a0853c' 2016-03-04 01:05:11 +00:00
Keisuke Kuroyanagi
22e01d5611 Merge "Refresh action mode always when selection is modified." into nyc-dev
am: bd4b217a28

* commit 'bd4b217a289edca382b63f2bf5d1dd2017e9cf2e':
  Refresh action mode always when selection is modified.
2016-03-04 00:57:48 +00:00
Keisuke Kuroyanagi
bd4b217a28 Merge "Refresh action mode always when selection is modified." into nyc-dev 2016-03-04 00:53:59 +00:00
George Mount
9b9cfdf1c2 Merge "Remove animation listener while paused." into nyc-dev am: 7d09ca79f1
am: 2c141416a2

* commit '2c141416a2e6835de41121e03927adf4ac81fe1a':
  Remove animation listener while paused.
2016-03-04 00:47:23 +00:00
Todd Kennedy
84e7e7c02f Merge "Splits without restart" into nyc-dev am: e8498cd006
am: 75c1fb0f48

* commit '75c1fb0f482e26ace2e4c6163ed3c48312f6bbef':
  Splits without restart
2016-03-04 00:45:02 +00:00
Adam Lesinski
732112e37e Merge "Move the guts of Resources to ResourcesImpl" into nyc-dev
am: c4dd2e7d52

* commit 'c4dd2e7d525fc41081ab9138535cd1cf153c4bc6':
  Move the guts of Resources to ResourcesImpl
2016-03-04 00:21:18 +00:00
Robert Carr
7b8cedc4fc Merge "Reimplement PIP animation to not use drag resizing." into nyc-dev am: adef831761
am: 10312fdfc6

* commit '10312fdfc623b0e1b368b1af10e0cfb1f9c87161':
  Reimplement PIP animation to not use drag resizing.
2016-03-04 00:19:27 +00:00
Adam Lesinski
c4dd2e7d52 Merge "Move the guts of Resources to ResourcesImpl" into nyc-dev 2016-03-04 00:16:47 +00:00
Roozbeh Pournader
f144fc50a7 Merge "Unhide LocaleList.getAdjustedDefault()" into nyc-dev
am: fa207d6097

* commit 'fa207d609719712904dc9c565f836c0489c6447b':
  Unhide LocaleList.getAdjustedDefault()
2016-03-04 00:16:46 +00:00
Robert Carr
b9ef3476de Merge "Fix pinned stack frame computation." into nyc-dev am: acd7a22cd7
am: de3d71955b

* commit 'de3d71955b0cd01259d2545719cd592e2ef4b0a7':
  Fix pinned stack frame computation.
2016-03-04 00:11:24 +00:00
Ji Yang
06af8cd84f Merge "New CarrierMessagingService API for sms filtering" into nyc-dev am: 456b9620f0
am: 20771666db

* commit '20771666db3b55ad912816e4f195169cd0bb5fb5':
  New CarrierMessagingService API for sms filtering
2016-03-04 00:06:15 +00:00
Todd Kennedy
66c5553c2e dump apk signing version
bug: 26905579
Change-Id: I5c2682904f2fb83ffce572fe2eb35c38e1b72f01
2016-03-03 15:49:17 -08:00
Roozbeh Pournader
fa207d6097 Merge "Unhide LocaleList.getAdjustedDefault()" into nyc-dev 2016-03-03 23:46:57 +00:00
Keisuke Kuroyanagi
dfd1beda70 Merge "Supress SuggestionPopup for original field." into nyc-dev
am: c1cd17f918

* commit 'c1cd17f91843decf8e8ced6546cbbd634798c525':
  Supress SuggestionPopup for original field.
2016-03-03 23:43:41 +00:00
Keisuke Kuroyanagi
c1cd17f918 Merge "Supress SuggestionPopup for original field." into nyc-dev 2016-03-03 23:34:51 +00:00
Todd Kennedy
c989b5b109 Merge "Fix javadoc" into nyc-dev
am: 39428c1337

* commit '39428c1337e007f393780546d80e5201b68f9943':
  Fix javadoc
2016-03-03 23:34:23 +00:00
Todd Kennedy
39428c1337 Merge "Fix javadoc" into nyc-dev 2016-03-03 23:30:10 +00:00
Felipe Leme
6bff65f657 Merge "Created a firewall chain for power save mode." into nyc-dev
am: 578f19453a

* commit '578f19453a27102358877a1f61076ad1e4ea5ca9':
  Created a firewall chain for power save mode.
2016-03-03 23:29:55 +00:00
Todd Kennedy
dfa93abf2f Fix javadoc
Make referenced constants @SystemApi and change argument name to
match its actual meaning.

bug: 25441401
Change-Id: I4277799b95f394edb4305be05f57437717a86691
2016-03-03 15:24:33 -08:00
Felipe Leme
578f19453a Merge "Created a firewall chain for power save mode." into nyc-dev 2016-03-03 23:20:29 +00:00
Roozbeh Pournader
5a06c663b5 Unhide LocaleList.getAdjustedDefault()
Apps/libraries/widgets that wish to display text their own way (think
WebView/Chrome) or do some resource management themselves should be
able to use LocaleList.getAdjustedDefault(), the same way we use it
in Paint and Resources.

Bug: 26988869
Change-Id: I4b6aac7adb5da15459dca92574923f33f0702433
2016-03-03 14:20:52 -08:00
George Mount
2c141416a2 Merge "Remove animation listener while paused." into nyc-dev
am: 7d09ca79f1

* commit '7d09ca79f158e1fc48a4531b027a5dc549c84084':
  Remove animation listener while paused.
2016-03-03 22:03:34 +00:00
Todd Kennedy
75c1fb0f48 Merge "Splits without restart" into nyc-dev
am: e8498cd006

* commit 'e8498cd0066113068f2b0294144837546f213bd1':
  Splits without restart
2016-03-03 21:52:59 +00:00
Robert Carr
10312fdfc6 Merge "Reimplement PIP animation to not use drag resizing." into nyc-dev
am: adef831761

* commit 'adef831761017d6d84d7bd4a388714a04fb73d66':
  Reimplement PIP animation to not use drag resizing.
2016-03-03 21:50:11 +00:00
Robert Carr
de3d71955b Merge "Fix pinned stack frame computation." into nyc-dev
am: acd7a22cd7

* commit 'acd7a22cd7fe1c2d1a1ba6ed8e97e4e21dd31a1d':
  Fix pinned stack frame computation.
2016-03-03 21:44:08 +00:00
George Mount
7d09ca79f1 Merge "Remove animation listener while paused." into nyc-dev 2016-03-03 21:38:25 +00:00
Ji Yang
20771666db Merge "New CarrierMessagingService API for sms filtering" into nyc-dev
am: 456b9620f0

* commit '456b9620f0bbd91adf18a4f3e1cf8b1ee21faa5c':
  New CarrierMessagingService API for sms filtering
2016-03-03 21:37:01 +00:00
Steve McKay
7542f751e3 Make COLUMN_CAPACITY_BYTES public.
So providers can tell us total capacity.

Change-Id: Id990c417fcae4c6beee3e09dcb633b22e875e08f
2016-03-03 13:35:30 -08:00
Todd Kennedy
e8498cd006 Merge "Splits without restart" into nyc-dev 2016-03-03 21:34:57 +00:00
Seigo Nonaka
1e99420e74 Merge "Fix unexpected ellipsize for long suggestion text." into nyc-dev am: 71208d6f7b
am: e40ab5d564

* commit 'e40ab5d564168bd7e0c5e24b12b4b3b05c650663':
  Fix unexpected ellipsize for long suggestion text.
2016-03-03 21:26:46 +00:00
Rob Carr
adef831761 Merge "Reimplement PIP animation to not use drag resizing." into nyc-dev 2016-03-03 21:23:55 +00:00
Rob Carr
acd7a22cd7 Merge "Fix pinned stack frame computation." into nyc-dev 2016-03-03 21:23:01 +00:00
Ji Yang
456b9620f0 Merge "New CarrierMessagingService API for sms filtering" into nyc-dev 2016-03-03 21:10:46 +00:00
Ji Yang
a8c9c6c593 New CarrierMessagingService API for sms filtering
Add a new sms filtering method to let the carrier app tell
the platform to keep the message while keep it invisible to
the end user.

BUG: 27292180
Change-Id: I306a7dbde6dcb9929e358b3d1bbda9807ef35943
2016-03-03 13:07:13 -08:00
Seigo Nonaka
e40ab5d564 Merge "Fix unexpected ellipsize for long suggestion text." into nyc-dev
am: 71208d6f7b

* commit '71208d6f7b1a56dd6a1af101a65c944109a2bbb4':
  Fix unexpected ellipsize for long suggestion text.
2016-03-03 20:47:33 +00:00
Dianne Hackborn
04d1031b8d Merge "Add APIs to find out the time when a process was created." into nyc-dev am: ef1971ffc5
am: 623ebce5fb

* commit '623ebce5fb9041968c324b418e029df85b13b61e':
  Add APIs to find out the time when a process was created.
2016-03-03 20:43:17 +00:00
Steve McKay
b245d109b2 Merge "Show proper icons for SD and USB attached storage." into nyc-dev am: eef85e0c02
am: f3322fccfa

* commit 'f3322fccfa21ce251055b1051788a5b411c28f26':
  Show proper icons for SD and USB attached storage.
2016-03-03 20:38:07 +00:00
Seigo Nonaka
71208d6f7b Merge "Fix unexpected ellipsize for long suggestion text." into nyc-dev 2016-03-03 20:20:45 +00:00