Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
251,337 Commits 3 Branches 0 Tags
3bc625a30af39a25a2dec5a5e70fb3fbd38c98ca
Commit Graph

64531 Commits

Author SHA1 Message Date
Hans Boehm
3bc625a30a Merge "Improve grammar in startService() documentation." am: e3a25ad692 am: cc9c83dbd4 
am: 1a72cf2e4f

* commit '1a72cf2e4f7d94f004979ee140fbe3f17c5e350a':
  Improve grammar in startService() documentation.

Change-Id: Ifd50bd9f2b8c83e657bc6df419e70b30532649d0
 2016-05-06 17:47:23 +00:00
Hans Boehm
1a72cf2e4f Merge "Improve grammar in startService() documentation." am: e3a25ad692 
am: cc9c83dbd4

* commit 'cc9c83dbd4123cf4677cd351fd0b96d9d04ffbee':
  Improve grammar in startService() documentation.

Change-Id: I7a7296839c0b9ec89002dead994cc346e1969567
 2016-05-06 17:41:18 +00:00
Hans Boehm
cc9c83dbd4 Merge "Improve grammar in startService() documentation." 
am: e3a25ad692

* commit 'e3a25ad692cf88455222522542fe374a41024ccf':
  Improve grammar in startService() documentation.

Change-Id: Iaa95eb5d01d45b8352f1eeb0a7f1519b1958ddd4
 2016-05-06 17:36:11 +00:00
Tony Mak
a31f37dc1c Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev am: 13532bdd2e 
am: ecab71c9f7

* commit 'ecab71c9f77cb0386a1be1c78e73bedf2524a536':
  Fix enterprise contacts APIs naming and docs

Change-Id: Idad8e3ee643ba955951a58185f4a8640579db206
 2016-05-06 12:23:58 +00:00
Ricky Wai
de1e4a1048 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 
am: 13532bdd2e

* commit '13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
  Fix enterprise contacts APIs naming and docs

Change-Id: I22bd5f8f3d71ae19a2fcac139531243f2546033e
 2016-05-06 12:19:00 +00:00
Ricky Wai
ecab71c9f7 Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 
am: 13532bdd2e

* commit '13532bdd2ea63c1b8a5a8d4f95346f3d1e7ecbb5':
  Fix enterprise contacts APIs naming and docs

Change-Id: I2305b72e0e3a1d5625d9016ffefed16fd7493c3e
 2016-05-06 12:18:58 +00:00
Tony Mak
13532bdd2e Merge "Fix enterprise contacts APIs naming and docs" into nyc-dev 2016-05-06 12:06:29 +00:00
Chris Craik
555271d3ae Merge "Fix status bar background flicker" into nyc-dev am: d0fa4d3aaf 
am: fa050d6355

* commit 'fa050d635590328fc787fb14d964585a5641461f':
  Fix status bar background flicker

Change-Id: Ia8f181646bbd1943fb7a8e04cc9571a56a5051f7
 2016-05-06 01:59:05 +00:00
Chris Craik
d482c7703a Merge "Fix status bar background flicker" into nyc-dev 
am: d0fa4d3aaf

* commit 'd0fa4d3aafa42da696c006ab96a11ed54deec14c':
  Fix status bar background flicker

Change-Id: Ifee7d5aaa5ffb9fe7c7c822eb9805c4c71d36fc0
 2016-05-06 01:57:00 +00:00
Chris Craik
fa050d6355 Merge "Fix status bar background flicker" into nyc-dev 
am: d0fa4d3aaf

* commit 'd0fa4d3aafa42da696c006ab96a11ed54deec14c':
  Fix status bar background flicker

Change-Id: I8cb0909f952aa0e8bf7705d753fd1bc0953187ba
 2016-05-06 01:56:56 +00:00
TreeHugger Robot
d0fa4d3aaf Merge "Fix status bar background flicker" into nyc-dev 2016-05-06 01:49:34 +00:00
Adam Lesinski
77acaf86b3 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev am: c1ff12eccd 
am: 3297250b9c

* commit '3297250b9cc068715d36c039133db5bf0083b9cc':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1f9dfebf5deb3d1a9cf49cc9042a02a90c3c7a68
 2016-05-05 23:40:25 +00:00
Adam Lesinski
3297250b9c Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I1b411b89dae0aa623d796ab2ab7dabb52a6e28c0
 2016-05-05 23:35:31 +00:00
Adam Lesinski
001f8c57a8 Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 
am: c1ff12eccd

* commit 'c1ff12eccd0e48ff7feab62387e60ae4010a3cc9':
  Fix issue where existing Activity Resources references would not update

Change-Id: I91cecfc1b5942d7e1c069e739be72a23472f6d47
 2016-05-05 23:35:28 +00:00
Adam Lesinski
c1ff12eccd Merge "Fix issue where existing Activity Resources references would not update" into nyc-dev 2016-05-05 23:23:43 +00:00
Chris Craik
867b812eff Fix status bar background flicker 
Fixes: 28533578

Change-Id: I075f49b7d20e0e95e790a9755d104a0a51575054
 2016-05-05 16:22:21 -07:00
Vladislav Kaznacheev
cae475563a Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev am: 7d2a0a0571 
am: f1febf2700

* commit 'f1febf27006a98adc5de584e7703338b85208ed3':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I13c413b1f0520262c271a397751a1a055e464655
 2016-05-05 23:21:04 +00:00
Vladislav Kaznacheev
f1febf2700 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I7996b43fa80b5965feb69028be2526faa379a134
 2016-05-05 23:16:07 +00:00
Vladislav Kaznacheev
46d24970ed Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 
am: 7d2a0a0571

* commit '7d2a0a05715841b582cbaefa3fd0e0a542064556':
  Add @TestApi to ActivityOptions.setLaunchStackId

Change-Id: I51b1329b14754fa9f765452769a4e311a69ae6bb
 2016-05-05 23:16:04 +00:00
Adam Lesinski
8ce4e12c73 Fix issue where existing Activity Resources references would not update 
When relaunching an Activity, the DecorView and ViewRootImpl is re-used,
along with the IBinder activity token. This means that when we create
new resources, we end up just updating the base Activity resources.

However, we would set the configuration to the new requested override
config and then proceed to update existing Resources references, which
would return immediately due to the equality check for configuration
updates.

This change pushes the setting of the new override config to the
updateResourcesForActivity method, which will properly update Resources
references that are held in the re-used DecorView.

Bug:27915587
Change-Id: I113007a40fa464b8a234b073dcf851e16fee0177
 2016-05-05 23:08:09 +00:00
Vladislav Kaznacheev
7d2a0a0571 Merge "Add @TestApi to ActivityOptions.setLaunchStackId" into nyc-dev 2016-05-05 23:04:49 +00:00
Christopher Tate
fb74b50b19 Correct docs about what is ignored in full-data backup am: c5be8f8a4b 
am: 3f0db943c5

* commit '3f0db943c589738fc09e7bb45c10a319b41955fa':
  Correct docs about what is ignored in full-data backup

Change-Id: I00bb2ffdb52af988d9b7c231864b629fb2e27dbd
 2016-05-05 22:36:42 +00:00
Christopher Tate
3f0db943c5 Correct docs about what is ignored in full-data backup 
am: c5be8f8a4b

* commit 'c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
  Correct docs about what is ignored in full-data backup

Change-Id: If70b6d247126758dcc82ec7780060ad99253a32d
 2016-05-05 22:31:54 +00:00
Christopher Tate
f4f2ef5162 Correct docs about what is ignored in full-data backup 
am: c5be8f8a4b

* commit 'c5be8f8a4b9946f26f43201a06e7ec3f9b34857e':
  Correct docs about what is ignored in full-data backup

Change-Id: Id1618de0e4027135a320cd133c244ba33d2960aa
 2016-05-05 22:31:53 +00:00
Joe Onorato
068061ff06 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev am: 47384f90b4 
am: 67af8a12ae

* commit '67af8a12ae20444f108f75c077b12821af52c909':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: Ia87d4db58bbdf4695b280edf6b6a79ad5425eea7
 2016-05-05 22:27:01 +00:00
Joe Onorato
67af8a12ae Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I0bfd7f8967e828500fbae93673ec2bbf31d42b1c
 2016-05-05 22:22:02 +00:00
Joe Onorato
cad814b9bf Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 
am: 47384f90b4

* commit '47384f90b4adb6dc4a005a7870e0ec6841042151':
  Add the individual wakeup alarm counts to the batterystats checkin.

Change-Id: I86640737d6f188b6b00901937d498ce1148ec10f
 2016-05-05 22:21:49 +00:00
Christopher Tate
c5be8f8a4b Correct docs about what is ignored in full-data backup 
You can't back up content in e.g. getNoBackupFilesDir() even if your
app explicitly tries to.

Bug 28321431

Change-Id: Ifa2a4bc518de03aba4c8809e60d8bb90fce767f8
 2016-05-05 22:20:46 +00:00
Joe Onorato
47384f90b4 Merge "Add the individual wakeup alarm counts to the batterystats checkin." into nyc-dev 2016-05-05 22:11:57 +00:00
Yohei Yukawa
e16d2f8a29 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev am: 9f76abc8ab 
am: 94c9aadc99

* commit '94c9aadc99655de225f0ee8f302aa36a1f59f043':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: I86c0709e2cacce9275b886a523b37fef6b6b49ce
 2016-05-05 22:07:05 +00:00
Dianne Hackborn
9b560795e2 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev am: d90be6cccc 
am: 9071cacdbe

* commit '9071cacdbe6896e332994b3c2948ffb93019938a':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: If21e0b4af5f22d989df64e9785ea28fc24e89fd8
 2016-05-05 22:06:58 +00:00
Yohei Yukawa
94c9aadc99 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 
am: 9f76abc8ab

* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: If27212387cd76bb6cc7f1cd1d844bd3ca07915e8
 2016-05-05 22:02:30 +00:00
Yohei Yukawa
117facb300 Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 
am: 9f76abc8ab

* commit '9f76abc8ab9db3306c8061e9719dbe2a998031f3':
  Fix stale InputMethodManager#mFullscreenMode.

Change-Id: I09eb284cb9a9b0dea96e3092a5f81ab894ee902b
 2016-05-05 22:02:22 +00:00
Dianne Hackborn
9071cacdbe Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev 
am: d90be6cccc

* commit 'd90be6cccca683e34566f5550ebb34f1c8e75b69':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: I2671260e69f3a3b07fd183fa97c274bea7520aca
 2016-05-05 22:02:22 +00:00
Dianne Hackborn
1f1291cbe3 Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev 
am: d90be6cccc

* commit 'd90be6cccca683e34566f5550ebb34f1c8e75b69':
  Fix issue #28602068: Add count to job scheduler stats

Change-Id: I60628c4c2150b51b34ad192bbca29bfd420e4b2f
 2016-05-05 22:02:18 +00:00
Yohei Yukawa
9f76abc8ab Merge "Fix stale InputMethodManager#mFullscreenMode." into nyc-dev 2016-05-05 21:55:50 +00:00
Joe Onorato
1476d32b87 Add the individual wakeup alarm counts to the batterystats checkin. 
Bug: 28601365
Change-Id: I94ad69eeb575f75d62bd45076184f521bd11052d
 2016-05-05 14:53:25 -07:00
Dianne Hackborn
d90be6cccc Merge "Fix issue #28602068: Add count to job scheduler stats" into nyc-dev 2016-05-05 21:53:23 +00:00
Hans Boehm
fb9f6acd6f Improve grammar in startService() documentation. 
Change-Id: If72f710caa2e85512636d6f7ddacff2426cfb835
 2016-05-05 13:09:28 -07:00
Robert Carr
45c6eb2164 Merge "Prepare to replace windows across recreate()." into nyc-dev am: ea162c3c79 
am: b9d2502eac

* commit 'b9d2502eac428ee8021bcfa43977479032a88bfc':
  Prepare to replace windows across recreate().

Change-Id: Ia144fd6e15340d062d659903548e48121c43f8c4
 2016-05-05 19:52:27 +00:00
Robert Carr
b9d2502eac Merge "Prepare to replace windows across recreate()." into nyc-dev 
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: I3f78aa81d76e0a71f616037c531e7755760b41cf
 2016-05-05 19:47:36 +00:00
Robert Carr
0bca8d3508 Merge "Prepare to replace windows across recreate()." into nyc-dev 
am: ea162c3c79

* commit 'ea162c3c7992b01d8d56766a94e56a0cee3fe3b2':
  Prepare to replace windows across recreate().

Change-Id: If97dc53f59b5dbc7cb06c29e6aec9ff0fe52db76
 2016-05-05 19:47:31 +00:00
TreeHugger Robot
ea162c3c79 Merge "Prepare to replace windows across recreate()." into nyc-dev 2016-05-05 19:38:17 +00:00
Alan Viverette
91aefd574c Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev am: 3a3fb73c75 
am: ff71f781a3

* commit 'ff71f781a369dd1e5231dbbd13981bbb320d49ab':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I9bc9d812b9e08f73d53f8243bf0ae78d7853d72b
 2016-05-05 18:58:59 +00:00
Alan Viverette
27dfd971b0 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I221eb10696601ed4aff0f0876c07d3d9a24ff4de
 2016-05-05 18:54:38 +00:00
Alan Viverette
ff71f781a3 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 
am: 3a3fb73c75

* commit '3a3fb73c753efb2114693b1943246bc6c47f9470':
  Revert "Always assign leftover pixels to last weighted child"

Change-Id: I292d86c36049afe621f559d01a12976c9f6068ca
 2016-05-05 18:54:34 +00:00
Alan Viverette
3a3fb73c75 Merge "Revert "Always assign leftover pixels to last weighted child"" into nyc-dev 2016-05-05 18:37:43 +00:00
Alan Viverette
61c41bf617 Revert "Always assign leftover pixels to last weighted child" 
This reverts commit cc26636f08.

Bug: 27690033
Change-Id: Ib7084dd8961cd486de4e6b13e36da7be887b1835
 2016-05-05 17:54:36 +00:00
Jason Monk
ef8fd63228 Merge "Add action to launch webview implementation settings" into nyc-dev am: c91f5e2971 
am: eb435a3a4c

* commit 'eb435a3a4cd186ada82fae4dcd3083d65ceab603':
  Add action to launch webview implementation settings

Change-Id: I29656ef85a9dda4988ff85e99eda883995538d61
 2016-05-05 17:11:00 +00:00
Jason Monk
eb435a3a4c Merge "Add action to launch webview implementation settings" into nyc-dev 
am: c91f5e2971

* commit 'c91f5e297135f9601c7fa6ebe3f4bdc9ad9af112':
  Add action to launch webview implementation settings

Change-Id: I26fb9e07522ed522ad551e7f39a66b2f9ad93748
 2016-05-05 17:07:12 +00:00