Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Monk
6c16d440b2 Merge "QS: Update layout to show gear all the time" into nyc-mr1-dev 
am: cb9446453c

* commit 'cb9446453cee802819498348d265d0217878e47f':
  QS: Update layout to show gear all the time

Change-Id: Icda1fccca3583004f3f58b86e844e7f39b355763
 2016-05-31 14:49:33 +00:00
Jason Monk
cb9446453c Merge "QS: Update layout to show gear all the time" into nyc-mr1-dev 2016-05-31 14:39:06 +00:00
Jason Monk
4bb7b1a3e3 QS: Update layout to show gear all the time 
Because evidently, when you've gotta change something, you've really
gotta change something.

Bug: 28673919
Change-Id: I085a0424c134a7f80316397b04a6b120440d32c8
 2016-05-31 10:37:06 -04:00
Jason Monk
35742d8c31 QS: Followup to scroll fixes 
Change-Id: Icfa8f9e7c2cc563dd1496049b82e4cdb4c4fc922
Fixes: 28671167
 2016-05-31 10:30:46 -04:00
Ian Rogers
edf2f5747b Fix call to equals that could never succeed. 
Caught by Error Prone.
Bug: 27723540

Change-Id: I5901a3ca06e0cc85620f596cfa4178f5ad61d1a7
 2016-05-31 07:22:56 -07:00
Nicolas Geoffray
6ee1b50aa2 Merge "Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 am: ff078da846" into nyc-mr1-dev-plus-aosp 
am: 6d0957aca1

* commit '6d0957aca1692e0878041a975672114c26b253bf':

Change-Id: I916ce4a3eac6c6e2cb6e63e46125da8a36a41823
 2016-05-31 14:01:40 +00:00
Nicolas Geoffray
947e27b0d0 Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e am: 60fa06a793 
am: 5186ea968b

* commit '5186ea968b146c9a3809532ed400b8fd6767b9d8':

Change-Id: Iab8ff7751613a4e82faad256ce73dcc26fe33083
 2016-05-31 14:01:30 +00:00
Nicolas Geoffray
7881aee2c9 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 am: 0063f2c80b 
am: 33c560035e

* commit '33c560035ef437d5d26f6a73563fd7c382738cc9':
  Look at last used app when filtering.

Change-Id: Ie223604802156a50e34eedec1502b1bfcfd0dddd
 2016-05-31 14:01:12 +00:00
TreeHugger Robot
49771cdf64 Merge "resolve merge conflicts of 4b092e4 to master" 2016-05-31 13:58:16 +00:00
Ian Rogers
22101e2f3a Merge "Fix two confusing naming issues" 2016-05-31 13:56:39 +00:00
Ian Rogers
4230c1677f Merge "Fix SuppressWarnings typo." 2016-05-31 13:55:15 +00:00
Nicolas Geoffray
f95fb4fb17 resolve merge conflicts of 4b092e4 to master 
Change-Id: I29a92ce3afe3a7b2851126a921879631e9846a40
 2016-05-31 13:35:41 +01:00
Android Build Merger (Role)
6d0957aca1 Merge "Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e am: 7c34fd3ccd" into nyc-mr1-dev-plus-aosp 2016-05-31 11:53:59 +00:00
Android Build Merger (Role)
5186ea968b Merge "Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 am: ff078da846" into nyc-mr1-dev-plus-aosp 2016-05-31 11:53:48 +00:00
Nicolas Geoffray
ae92f47fa3 Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e 
am: 7c34fd3ccd

* commit '7c34fd3ccdfc2ca6dade22f6ee9cb3a57638b669':
  Look at last used app when filtering.

Change-Id: Ia5adaa95a8d59ab0e777d234e30590c05a605d5b
 2016-05-31 11:53:13 +00:00
Nicolas Geoffray
33c560035e Merge "Look at last used app when filtering." into nyc-dev am: ce289e937e 
am: 60fa06a793

* commit '60fa06a793a7b5c35988f8e21d6fa93aaee09ef2':
  Look at last used app when filtering.

Change-Id: I17fef02d34c44ac95c8c175362e3f0f6793bbdd2
 2016-05-31 11:53:06 +00:00
Nicolas Geoffray
00eec4268f Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 
am: ff078da846

* commit 'ff078da846a8d719d2724bd035d987d8e943afbe':
  Cleanup performDexOpt with instruction sets.

Change-Id: I27003abdb57032999b954e1715afa2230c794492
 2016-05-31 11:53:06 +00:00
Nicolas Geoffray
4b092e47ac Merge "Cleanup performDexOpt with instruction sets." into nyc-dev am: 89f4bff149 
am: 0063f2c80b

* commit '0063f2c80b1d9512fd77ca71faa85737c1fd2424':
  Cleanup performDexOpt with instruction sets.

Change-Id: If15ee5ff3e58d3bf0226bea94707e228c77fbf08
 2016-05-31 11:53:00 +00:00
Nicolas Geoffray
60fa06a793 Merge "Look at last used app when filtering." into nyc-dev 
am: ce289e937e

* commit 'ce289e937ee6b001cd14824e5dec3c6010b51e61':
  Look at last used app when filtering.

Change-Id: Ia1ce20e1645ea5defce3f72011cacd88388cb3df
 2016-05-31 11:36:41 +00:00
Nicolas Geoffray
7c34fd3ccd Merge "Look at last used app when filtering." into nyc-dev 
am: ce289e937e

* commit 'ce289e937ee6b001cd14824e5dec3c6010b51e61':
  Look at last used app when filtering.

Change-Id: I7c1c693cc76d5067733e5b424dbdac1dcb55c288
 2016-05-31 11:36:38 +00:00
Nicolas Geoffray
0063f2c80b Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: I6293cb0c9adf562d69aac59d74edc6540e6a0693
 2016-05-31 11:36:37 +00:00
Nicolas Geoffray
ff078da846 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 
am: 89f4bff149

* commit '89f4bff149c62baf8371118aed2c4e6ac29976c5':
  Cleanup performDexOpt with instruction sets.

Change-Id: Id973c65cbe87f54a743bfcb89fbe7e4aea45d1c8
 2016-05-31 11:36:34 +00:00
TreeHugger Robot
ce289e937e Merge "Look at last used app when filtering." into nyc-dev 2016-05-31 11:29:41 +00:00
TreeHugger Robot
89f4bff149 Merge "Cleanup performDexOpt with instruction sets." into nyc-dev 2016-05-31 11:23:44 +00:00
Nicolas Geoffray
fa78b219b7 Look at last used app when filtering. 
In order to cover cases where a device hasn't been used
for a while.

bug:28969280
Change-Id: I897e833ed83912b848f25a7a81fe59f0ee655be1
 2016-05-31 11:13:51 +01:00
Victor Chang
fc6e729df2 Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: f5464121c0" into nyc-mr1-dev-plus-aosp 
am: e521d70dfa

* commit 'e521d70dfa67cff36f2b34eb3cfe74113a47d587':

Change-Id: I90c50af4bb32623a81723ed059692b8b9ff6b5cf
 2016-05-31 10:12:18 +00:00
Victor Chang
f1de8bb3c6 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: d6d2497ebe 
am: 0075bf312c

* commit '0075bf312c34bc98c3dd26d8233d25bf753a3256':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: Ia65972e192adc0da0403bd0ff317da180c2432a0
 2016-05-31 10:12:13 +00:00
Android Build Merger (Role)
e521d70dfa Merge "Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b am: f5464121c0" into nyc-mr1-dev-plus-aosp 2016-05-31 10:01:43 +00:00
Victor Chang
dc4e0336a0 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b 
am: f5464121c0

* commit 'f5464121c0050bd8926f243a7f84fcc3282864d5':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I79e1c6ecc0a107db616e3bdf0aff50b4358a8373
 2016-05-31 10:01:08 +00:00
Victor Chang
0075bf312c Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev am: 98801e9f2b 
am: d6d2497ebe

* commit 'd6d2497ebe90e74f0ee7ddfdd2a00f4cb2f25dce':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I7a44158b41c20d297e3e1c2869bb0a58549e84a2
 2016-05-31 09:59:59 +00:00
Victor Chang
f5464121c0 Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 
am: 98801e9f2b

* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: I84db62a24c34bf8dea6f99d34e108cbb0fc0517f
 2016-05-31 09:51:58 +00:00
Victor Chang
d6d2497ebe Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 
am: 98801e9f2b

* commit '98801e9f2bec03faf9be0c8bb961150004d309ff':
  Finish ConfirmDialog when another vpn app is always-on

Change-Id: If8de5a6c200953599bc3965da57b0de2b1dfb76e
 2016-05-31 09:51:44 +00:00
Victor Chang
98801e9f2b Merge "Finish ConfirmDialog when another vpn app is always-on" into nyc-dev 2016-05-31 09:43:37 +00:00
Victor Chang
cf4c158e5e Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev am: 76609106b7 am: 76366146c6 
am: 261c10d0fc

* commit '261c10d0fc1d90cacb61a0017eefd4f100d0ded2':

Change-Id: I220ff002d185c77fb6f2c121f4742ae0bf7c9b1a
 2016-05-31 08:46:07 +00:00
Victor Chang
11a37ab585 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev am: 76609106b7 am: 86b4701d7f 
am: 4ad96210a4

* commit '4ad96210a47d4856baf347e6873a1e1412cb2217':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: I763ec5225e0095762eb74c47c02e1ab4380e974f
 2016-05-31 08:40:09 +00:00
Victor Chang
261c10d0fc Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev am: 76609106b7 
am: 76366146c6

* commit '76366146c6c2732a4c5790c36a3a08139b2ada2c':

Change-Id: I790ff24c819dea11c7d0bc4158f1a7bebd2fb0dc
 2016-05-31 08:39:48 +00:00
Victor Chang
4ad96210a4 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev am: 76609106b7 
am: 86b4701d7f

* commit '86b4701d7f7c4f4e7d430daa267316f2e8af04ef':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: I7cae7d4c75f367fa9a08bc4e64ef72265485d1ca
 2016-05-31 08:33:32 +00:00
Victor Chang
76366146c6 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 
am: 76609106b7

* commit '76609106b72e944eb87782f1c622519f98ff490f':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: Ia3d8b743457a03d38f85442b3e66cab1285826c5
 2016-05-31 08:33:08 +00:00
Victor Chang
86b4701d7f Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 
am: 76609106b7

* commit '76609106b72e944eb87782f1c622519f98ff490f':
  Fix VPN Request dialog appearing each time VPN is connecting

Change-Id: I67f2434f144ec1eca21092da8b757507072c937d
 2016-05-31 08:27:50 +00:00
Victor Chang
76609106b7 Merge "Fix VPN Request dialog appearing each time VPN is connecting" into nyc-dev 2016-05-31 08:21:24 +00:00
Victor Chang
aa2e02348a Finish ConfirmDialog when another vpn app is always-on 
Bug:29000925
Change-Id: I1087dbb2c366cebb4583ae0bb97302b3d2caf42c
 2016-05-31 09:11:19 +01:00
Bill Yi
ae1249a1ca Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours am: fc22bd87ff -s ours 
am: f82c5112d4  -s ours

* commit 'f82c5112d456318dd7cb6fbb814a84272c0fc1ad':

Change-Id: I29a6a5982af379c4818308f7136790a3963fa92f
 2016-05-31 05:11:43 +00:00
Bill Yi
8f8a679993 Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours am: 4f6969c7eb -s ours 
am: d26ce761b4  -s ours

* commit 'd26ce761b4fb900c41a0530e0ecce5dec839b06e':

Change-Id: Id6e8e35f7dfa2a295b046458c71fc98d62e94b1c
 2016-05-31 05:11:40 +00:00
Bill Yi
b1cd0c9091 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours am: 3551359739 -s ours 
am: 8bd9f06370  -s ours

* commit '8bd9f063704d8502c9e3f77d9147f99deeed55d3':

Change-Id: I17a8d3090a71871e585757259230e255e6b57cfe
 2016-05-31 05:11:37 +00:00
Roozbeh Pournader
ec6a4ca80c Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 am: 08b6d01ccb 
am: 1bf8716114

* commit '1bf8716114d0149d31f55dc145aaf04260c59142':

Change-Id: I06fae0e0048d9b6fb1d40ede1514ca40a72b82bf
 2016-05-31 05:11:33 +00:00
Bill Yi
65b962db7c Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours am: f35dcdb530 -s ours 
am: 2bba2ebd09  -s ours

* commit '2bba2ebd09c755d2d788a991e8e52b5d8adc1a1c':
  Import translations. DO NOT MERGE

Change-Id: If27f0033072370b8c4d11a7840d323ee525ec046
 2016-05-31 05:05:07 +00:00
Bill Yi
f82c5112d4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: e71cdef7e3 -s ours 
am: fc22bd87ff  -s ours

* commit 'fc22bd87ff22c87eaf7a9dc912f8184a0ce459bd':

Change-Id: I37fee1718ad7261787be24620ccb27f80c90be80
 2016-05-31 05:03:41 +00:00
Bill Yi
d26ce761b4 Merge "Import translations. DO NOT MERGE" into nyc-dev am: ae284e6cb6 -s ours 
am: 4f6969c7eb  -s ours

* commit '4f6969c7eb0c10484d9b4322b28394fd6f88270e':

Change-Id: Ida8cd043cda47a7c8353c4c8827a5690c00bd3d3
 2016-05-31 05:03:22 +00:00
Bill Yi
8bd9f06370 Merge "Import translations. DO NOT MERGE" into nyc-dev am: 5854f2aa07 -s ours 
am: 3551359739  -s ours

* commit '3551359739c760a58fd83179e495b030aea2de83':

Change-Id: I03ef37f09d0779319d7690e056744bc6eb4ae69d
 2016-05-31 05:03:01 +00:00
Roozbeh Pournader
1bf8716114 Merge "Support ellipsizing LocaleHelper.getDisplayLocaleList()" into nyc-dev am: fe524c0e24 
am: 08b6d01ccb

* commit '08b6d01ccb7a23c820fd159a10a2abd5c3ffca2c':

Change-Id: I59e03a7c37e4e06c217395200ed54e3917055ce9
 2016-05-31 05:02:40 +00:00