Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
246,497 Commits 3 Branches 0 Tags
ffe7746437e8f06cc7dd2571c3354973791c8a8a
Commit Graph

246497 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cheryl Potter
b7b1e22d82 Merge "docs: Attach debugger to process 2.0 update and corrections" into mnc-mr-docs 
am: 97f8b66

* commit '97f8b667920cb9ca0da4b048c3a46f0643d4472c':
  docs: Attach debugger to process 2.0 update and corrections

Change-Id: Ic80acf4c733b06d89641562e09347e2fd0d14641
 2016-04-19 16:03:52 +00:00
Baligh Uddin
e68cb3c03f Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 30fc04a  -s ours

* commit '30fc04a99cb84058319abdf16b8c5f144c9b1924':
  Import translations. DO NOT MERGE

Change-Id: I41d8de22a1800edd3f050372c8fda3a36da0b9c1
 2016-04-19 15:55:01 +00:00
Cheryl Potter
97f8b66792 Merge "docs: Attach debugger to process 2.0 update and corrections" into mnc-mr-docs 2016-04-19 15:50:40 +00:00
Baligh Uddin
30fc04a99c Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-19 15:45:36 +00:00
Baligh Uddin
6e1f3bddc7 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: f2a87aa  -s ours

* commit 'f2a87aa9c32e3aef50e7ba3eda44299559da1056':
  Import translations. DO NOT MERGE

Change-Id: I3869c4ab4b79841057b8244fb3d57e88320ae013
 2016-04-19 15:45:03 +00:00
Baligh Uddin
70219a5b72 Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 4a19326  -s ours

* commit '4a19326d9166f02b01f341ef338ee88ef29335bc':
  Import translations. DO NOT MERGE

Change-Id: Ia8930286364cdbcd8105866eb0e2506abd00fda4
 2016-04-19 15:45:01 +00:00
Baligh Uddin
7527dee8ff Merge "Import translations. DO NOT MERGE" into nyc-dev 
am: 451dc7e  -s ours

* commit '451dc7e146551c09d5d199113d484f07923d7086':
  Import translations. DO NOT MERGE

Change-Id: Iab53fea7693b353e7c934efcc036eb159b9f7ef6
 2016-04-19 15:44:59 +00:00
Calin Juravle
244c98e8aa Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev 
am: f016d3a

* commit 'f016d3aef7711bf6703d9ef053c40afabdaf71a9':
  Move profile registration from bindApplication to LoadedApk

Change-Id: Id98e772f1f8917062b3b28dbb4032c7aacfed105
 2016-04-19 15:38:40 +00:00
Jason Monk
8b54cade4f Collapse QS panel after details if we expanded it before 
Change-Id: I7de2ec3b304649fbce688ef6d54573cc7c2f4b64
Fixes: 27747650
 2016-04-19 11:38:03 -04:00
Baligh Uddin
f2a87aa9c3 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-19 15:36:58 +00:00
Baligh Uddin
4a19326d91 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-19 15:36:50 +00:00
Baligh Uddin
451dc7e146 Merge "Import translations. DO NOT MERGE" into nyc-dev 2016-04-19 15:36:46 +00:00
TreeHugger Robot
f016d3aef7 Merge "Move profile registration from bindApplication to LoadedApk" into nyc-dev 2016-04-19 15:29:19 +00:00
Jason Monk
f7d9285331 Merge "No QS hotspot unless supported" into nyc-dev 
am: 93e742b

* commit '93e742b58818b3c8130c6cf7ccaba2d0a77d3a72':
  No QS hotspot unless supported

Change-Id: I141c636c23907d19ee33444239afea3239d7e656
 2016-04-19 15:26:09 +00:00
Tony Mak
b4c3c1fcfe Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev 
am: 95a127c

* commit '95a127cbf49f8fb6496e4b81b2f0d716d7f8cfbc':
  Set lock screen to be in public mode if one of its profile is secure

Change-Id: Ibeaf86c324644aa088eafe47171c5dab811201d4
 2016-04-19 15:20:09 +00:00
Jason Monk
93e742b588 Merge "No QS hotspot unless supported" into nyc-dev 2016-04-19 15:19:46 +00:00
Adarsh Fernando
58cd6d4d03 Docs: Background optimizations 'foreground' -> 'running app' fix. 
Change-Id: I2ad646f09303a8472a00a1132d50cfa9a8c8409a
 2016-04-19 08:16:03 -07:00
Tony Mak
95a127cbf4 Merge "Set lock screen to be in public mode if one of its profile is secure" into nyc-dev 2016-04-19 15:15:22 +00:00
John Reck
609bfc3966 Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev 
am: 28e284b

* commit '28e284bd0678a7044b1d23879ef32018b1ca7384':
  Make surfaceRedrawNeeded forgiving

Change-Id: I78dee0cdb4cb8d867c4209834226a1b7d1ab1a54
 2016-04-19 14:53:30 +00:00
John Reck
797c4344bd Merge "Don\'t reuse LOST_SURFACE for stopped" into nyc-dev 
am: 9110429

* commit '9110429f0d8acac0d621d805050103fa58953fb9':
  Don't reuse LOST_SURFACE for stopped

Change-Id: I7f0f0e0a5d01991f0bce38ded4a5f2430499a07e
 2016-04-19 14:53:28 +00:00
John Reck
28e284bd06 Merge "Make surfaceRedrawNeeded forgiving" into nyc-dev 2016-04-19 14:45:33 +00:00
John Reck
9110429f0d Merge "Don't reuse LOST_SURFACE for stopped" into nyc-dev 2016-04-19 14:45:16 +00:00
Alan Viverette
55f0a99076 Use adjusted popup window position when calculating best-fit 
Bug: 28194522
Bug: 28175404
Change-Id: I5685b397908f64559d0ec5fea5820bdea69f422c
 2016-04-19 10:17:00 -04:00
Jason Monk
28680c61c9 No QS hotspot unless supported 
Fixes: 27438917
Change-Id: Iadeee5a87ebb9b881e04ac706547004e186215ea
 2016-04-19 09:49:28 -04:00
Eric Tang
2dd2557c06 Merge "update string "Work profile" to "All work apps"" into nyc-dev 
am: 2f87f1d

* commit '2f87f1d1c57bd423d6928f9ff46accbea51e8645':
  update string "Work profile" to "All work apps"

Change-Id: I937afe6e6bb414c9f1589e51a6a9f1870991c82b
 2016-04-19 13:42:11 +00:00
Alan Viverette
60dfa7646d Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev 
am: 8940a5b

* commit '8940a5b286295b164ccdd7fd5b1b04171e62e6d1':
  Revert FrameLayout.LayoutParams default gravity to -1

Change-Id: I24fee978d8f9277031eb3e3f41ab3f490b81e787
 2016-04-19 13:42:09 +00:00
Eric Tang
2f87f1d1c5 Merge "update string "Work profile" to "All work apps"" into nyc-dev 2016-04-19 13:38:07 +00:00
Alan Viverette
8940a5b286 Merge "Revert FrameLayout.LayoutParams default gravity to -1" into nyc-dev 2016-04-19 13:36:26 +00:00
Alan Viverette
30b57b6bd2 Call OnTimeChangedListener on AM/PM change in clock-style TimePicker 
Bug: 28257554
Change-Id: I25aabac783ea2b6e68be4b6c60f0d55a4c37af26
 2016-04-19 09:29:20 -04:00
Rubin Xu
f8451b9815 Kill foreground apps when turning off work 
While work apps will all be killed as we stop the profile user when
turning off work, this can sometimes take a while. So let's kill the
foreground apps as soon as work profile is being turned off to make
the user experience nicer.

Bug: 27631526
Change-Id: Icdd3799385a98ee531b0b4247e8ede78f6f10da8
 2016-04-19 14:23:33 +01:00
Tony Mak
92c989dc4c Set lock screen to be in public mode if one of its profile is secure 
Change-Id: I7d819c7d4a52ff45705b1a1b9e215faf0957cccb
Fix: 27118634
 2016-04-19 14:03:51 +01:00
Julia Reynolds
a9f54d8fe5 Merge changes I01afb5e9,I90d1adaf into nyc-dev 
am: 3da3d7f4

* commit '3da3d7f455761b73309bf5a02bef5eba816df5cd':
  Add content intent to autogroup summary.
  Logging for ranker bundling.

Change-Id: Iaa904aedcb852e1e4b41f60e40d56da3d42afbd5
 2016-04-19 12:55:51 +00:00
Julia Reynolds
3da3d7f455 Merge changes I01afb5e9,I90d1adaf into nyc-dev 
* changes:
  Add content intent to autogroup summary.
  Logging for ranker bundling.
 2016-04-19 12:50:34 +00:00
Tony Mak
2e1f4eb947 Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev 
am: 882a080

* commit '882a0802a7f7268750b15adb8747dd3904f935b0':
  User action should only stop lock task mode if it is in pinned mode

Change-Id: Id2a1e5cfc512c352aaeb93f570a8f6c288a4ee3b
 2016-04-19 10:37:54 +00:00
Tony Mak
882a0802a7 Merge "User action should only stop lock task mode if it is in pinned mode" into nyc-dev 2016-04-19 10:32:33 +00:00
Andrei Stingaceanu
eb5c745c38 Merge "Keyboard shortcuts: UI polish 2" into nyc-dev 
am: bf8207e

* commit 'bf8207e270b1af908278b7a58c33a3e16d425cac':
  Keyboard shortcuts: UI polish 2

Change-Id: Ib29a196f93f25cecf744623678f888b010032a21
 2016-04-19 10:04:53 +00:00
Andrei Stingaceanu
bf8207e270 Merge "Keyboard shortcuts: UI polish 2" into nyc-dev 2016-04-19 09:59:53 +00:00
Seigo Nonaka
3675d3cd84 Delete emojis before and after ZWJ at the same time. 
Vendor may want to introduce their own ZWJ emoji sequence. To delete
them by one back space as the same behavior of Unicode emoji sequence,
use all emoji as the zwj emoji.

Bug: 28248662
Change-Id: I572dad42ee108476962d4b3fe9f3a6019cb50098
 2016-04-19 18:54:50 +09:00
Keisuke Kuroyanagi
abb12ed4f2 Allow switching keyboard layout to null. 
Previously, PersistentDataStore#switchKeyboardLayout doesn't allow
switching keyboard layout to null, which means default layout.
As a result, when no keyboard layout is corresponding to the new
subtype, previous keyboard layout continues to be used on switching
subtpyes.

Bug: 27750850
Change-Id: Ie5c6ef7944ade48907a5b92986578f9f40b0f499
 2016-04-19 18:13:44 +09:00
Trevor Johns
682c24e228 Resolve merge conflicts of a5060ee to nyc-dev 
This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.

Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
 2016-04-19 02:03:59 -07:00
Insun Kang
82c2ce1d16 ExifInterface: Fix a bug to return only a JPEG-compressed thumbnail 
Bug: 26923978
Change-Id: I929802ae7ff878a80a43058d3c6fa922c706edf6
 2016-04-19 17:56:10 +09:00
Tomasz Mikolajewski
76572d6f19 Restrict selection to 1000 items in DocumentsUI. 
Bug: 27208679
Change-Id: I5e500724a3fb9af5b8f59e0c959523da5066b1fd
 2016-04-19 08:51:46 +00:00
Tomasz Mikolajewski
4759c9f03f Cancel band selection on directory change. 
This is a workaround for N. Ideally we should keep the band selection,
as directory may change very often, eg. during loading, or downloading
a file (every second).

Bug: 27224277
Change-Id: I40cfb12c4f7928c4e0d6e675e91ba30ab3a6ab52
 2016-04-19 17:51:05 +09:00
Baligh Uddin
13d8bb403a Import translations. DO NOT MERGE 
Change-Id: I4de249a3fbf0c6d3faad2b3bb233be596c5ca815
Auto-generated-cl: translation import
 2016-04-19 01:37:35 -07:00
Diego Perez
e4ad64b486 Merge "Separate measure so it can only run inflate if needed" into nyc-dev 
am: 3874597

* commit '38745971c266f5fca692ef284e1e3b4d38af1a41':
  Separate measure so it can only run inflate if needed

Change-Id: Ie986d0631c55552248c1c7d5ae9bdbe59b9d3b1d
 2016-04-19 07:38:40 +00:00
Diego Perez
38745971c2 Merge "Separate measure so it can only run inflate if needed" into nyc-dev 2016-04-19 07:34:17 +00:00
Hugo Benichi
8c9722575c Merge "Remove unused DHCP timeout event tag." into nyc-dev 
am: 6e1d1db

* commit '6e1d1dbdd4d48e7997eb0998128ccaa9f8eeee5b':
  Remove unused DHCP timeout event tag.

Change-Id: I642b7095c950406d75079e3a55b4c06a520e467d
 2016-04-19 07:12:27 +00:00
TreeHugger Robot
6e1d1dbdd4 Merge "Remove unused DHCP timeout event tag." into nyc-dev 2016-04-19 07:08:06 +00:00
Jorim Jaggi
7f57ea31b7 Merge "Optimize some binder calls when recents configuration changes" into nyc-dev 
am: 6783384

* commit '6783384eb1abebaa349a6e8b4d774e394f08adb2':
  Optimize some binder calls when recents configuration changes

Change-Id: I0c8941365a7b91c4e5a267d712e6c98042228c38
 2016-04-19 06:16:15 +00:00
TreeHugger Robot
6783384eb1 Merge "Optimize some binder calls when recents configuration changes" into nyc-dev 2016-04-19 06:09:38 +00:00