drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
316,317 Commits 1 Branch 0 Tags
Commit Graph

1560 Commits

Author SHA1 Message Date
Sundeep Ghuman
f509d526b8 Merge "Synchronously update APs in during forceUpdate." into oc-dev am: 6bdbc4abec 
am: 17bc64597c

Change-Id: I02b3ff391b10ed1f2ced5b7149c77b68b90fa63e
 2017-04-17 16:52:31 +00:00
Sundeep Ghuman
17bc64597c Merge "Synchronously update APs in during forceUpdate." into oc-dev 
am: 6bdbc4abec

Change-Id: Ib98d02c5e40de0f245fb303041a665b8ade6a4f3
 2017-04-17 16:42:31 +00:00
TreeHugger Robot
6bdbc4abec Merge "Synchronously update APs in during forceUpdate." into oc-dev 2017-04-17 16:35:00 +00:00
Alan Viverette
14b3375e43 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev am: 7c8ab2651b 
am: efc602c307

Change-Id: Id991d413933d8435a05b129bf13e917941371c01
 2017-04-14 18:25:53 +00:00
Jesse Evans
632e4afb1a Merge "Fix instant app filtering in ApplicationsState" into oc-dev am: 9bdaa9c9fa 
am: 783026710d

Change-Id: Id5a474354f69264a6959e8334f014860f6c98c8e
 2017-04-14 17:41:47 +00:00
Alan Viverette
efc602c307 Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 
am: 7c8ab2651b

Change-Id: I82826b63a3d6bc527c696158bfab98fe438f9847
 2017-04-14 17:04:19 +00:00
TreeHugger Robot
7c8ab2651b Merge "Remove unnecessary casts on calls to findViewById" into oc-dev 2017-04-14 16:56:28 +00:00
Daniel Nishi
58e291f1a5 Merge "Don't crash in background after app uninstall." into oc-dev am: 74037d1287 
am: f110127aef

Change-Id: Id0c46b2669af8386792dccd12407d8de6dc66d05
 2017-04-14 16:47:12 +00:00
Lei Yu
f69156ff95 Merge "Refine BatteryInfo and battery drawable" into oc-dev am: 57af565fb7 
am: 24638307c2

Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
 2017-04-14 16:18:02 +00:00
Alan Viverette
51efddbd3b Remove unnecessary casts on calls to findViewById 
Just frameworks/ this time. More paths to come.

Bug: 24137209
Test: make -j32
Change-Id: Iff27abd26fa43296ac2fff8f534fc6742d2ae80c
 2017-04-14 11:15:50 -04:00
Benoit Lamarche
309335e727 resolve merge conflicts of 57fb5872d19c to master 
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
 2017-04-14 15:59:04 +02:00
Jesse Evans
783026710d Merge "Fix instant app filtering in ApplicationsState" into oc-dev 
am: 9bdaa9c9fa

Change-Id: I1f3b4dfe6c6f9f53c9af5483ab4b31726026d219
 2017-04-14 04:56:33 +00:00
Jesse Evans
ad2b77565c Fix instant app filtering in ApplicationsState 
This fixes instant apps showing up as installed apps in the settings
UI where they should not be (namely the opening links page).

Test: Added tests for the filter
      runtest -x packages/SettingsLib/tests/integ

Bug: 37108030
Change-Id: I0fc6cfd237d470a1f4dde7b2db38d8b3643ee6f7
 2017-04-13 19:48:48 -07:00
Sundeep Ghuman
9c0b97ea66 Synchronously update APs in during forceUpdate. 
This helps with jank in the Wifi Picker.

Bug: b/36406983
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/android/settingslib/wifi/WifiTrackerTest.java

Change-Id: Ia667940dd12dc910f7658da445637268132a0058
 2017-04-13 18:18:40 -07:00
Daniel Nishi
f110127aef Merge "Don't crash in background after app uninstall." into oc-dev 
am: 74037d1287

Change-Id: I261336a0d6b729dfba31a812cfa106ffc01f9931
 2017-04-14 01:07:18 +00:00
Daniel Nishi
74037d1287 Merge "Don't crash in background after app uninstall." into oc-dev 2017-04-14 00:56:19 +00:00
Lei Yu
24638307c2 Merge "Refine BatteryInfo and battery drawable" into oc-dev 
am: 57af565fb7

Change-Id: Ie9fce326b23293e9f66d71f4be4b166aae310eb0
 2017-04-13 21:52:40 +00:00
Lei Yu
57af565fb7 Merge "Refine BatteryInfo and battery drawable" into oc-dev 2017-04-13 21:43:37 +00:00
Jack He
aadf525e1a Merge "Add developer setting and system API for inband ringing support" into oc-dev 2017-04-13 19:43:54 +00:00
Daniel Nishi
57fb5872d1 Merge changes from topic 'cp-movies' into oc-dev 
am: ff97ea2eef

Change-Id: Ife4f6fb260439003a46e6510af41f8bb6c542cb7
 2017-04-13 18:44:53 +00:00
Daniel Nishi
ff97ea2eef Merge changes from topic 'cp-movies' into oc-dev 
* changes:
  Use the real filters when determining Other Apps.
  Add support for movies & tv apps querying.
 2017-04-13 18:39:57 +00:00
Sundeep Ghuman
6f00ddf0ad Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev am: 56fcd408e6 
am: 2dfbfc3134

Change-Id: I32c1b3f0e3c5ba921a71e233b6dbbab1d9e0d6cd
 2017-04-13 17:55:26 +00:00
Sundeep Ghuman
2dfbfc3134 Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev 
am: 56fcd408e6

Change-Id: If4d14ff4f69b86af16e65736b32e3e01d06eeaf5
 2017-04-13 17:37:57 +00:00
TreeHugger Robot
56fcd408e6 Merge "Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker." into oc-dev 2017-04-13 17:08:04 +00:00
TreeHugger Robot
9e8fa5ec61 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-13 15:26:29 +00:00
TreeHugger Robot
af05d3952f Merge "Import translations. DO NOT MERGE" 2017-04-13 15:25:35 +00:00
Bill Yi
ca0db87f3e Import translations. DO NOT MERGE 
Change-Id: Iaf188ae0fe780b83f7caa70e8221126d1ffed110
Auto-generated-cl: translation import
 2017-04-13 04:43:14 -07:00
Bill Yi
5abca930e9 Import translations. DO NOT MERGE 
Change-Id: Id329600f78755d176ebdd08ab38dd82cb89f2ef9
Auto-generated-cl: translation import
 2017-04-13 04:34:42 -07:00
Tadashi G. Takaoka
53042fc5b2 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev am: d280bfea23 
am: 6c8c498b5b

Change-Id: I2da5392ab850cdf9053cfd16d216feffe9afada5
 2017-04-13 08:03:37 +00:00
Tadashi G. Takaoka
6c8c498b5b Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 
am: d280bfea23

Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
 2017-04-13 07:53:39 +00:00
Tadashi G. Takaoka
d280bfea23 Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev 2017-04-13 07:41:34 +00:00
TreeHugger Robot
36fd86fa09 Merge "expose visibility of PbapClientProfile. The use case is that the Car head unit will be consuming the data instead of providing it" 2017-04-13 07:05:30 +00:00
Sundeep Ghuman
8c79288093 Listen to RSSI_CHANGED_ACTION broadcasts in WifiTracker. 
This solves issues where the phone status bar and connected AP in the
picker are out of date.

Bug: 35971425
Test: runtest --path
frameworks/base/packages/SettingsLib/tests/integ/src/com/and
roid/settingslib/wifi/WifiTrackerTest.java

Change-Id: I2a7c50de6c754623fd262aac4e9e21d6bd7fc5cf
 2017-04-12 18:10:13 -07:00
Jack He
76cd53a953 Add developer setting and system API for inband ringing support 
* Add 1 system API to check inband ringing flag in config.xml
	static isInbandRingingSupported(Context)
* Add developer menu options to enable this feature

Bug: 19171297
Test: mm -j 40, HFP regression testing, testplans/82144
Change-Id: Iaf56ea41911f546bbc7ae1f82e399d0f8d48f75f
(cherry picked from commit e86bdcaed1372aa05bdfba175007b05613aecd9b)
 2017-04-12 22:24:37 +00:00
Jason Monk
6f23256544 Merge "Make QS light" into oc-dev am: 755138bb1c 
am: 5881209cac

Change-Id: Ife0be0ed4dade96bb42a64c39d022e0b84517d91
 2017-04-12 21:42:00 +00:00
Jason Monk
5881209cac Merge "Make QS light" into oc-dev 
am: 755138bb1c

Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
 2017-04-12 20:50:32 +00:00
TreeHugger Robot
755138bb1c Merge "Make QS light" into oc-dev 2017-04-12 20:43:16 +00:00
jackqdyulei
ff5bd948b0 Refine BatteryInfo and battery drawable 
1. Remove "m" prefix for all public field
2. Change logic about field "discharging", now it only controlled
   by whether it is plugged in.
3. Change Paint in drawable to protected
Bug: 36862496
Test: RunSettingsLibTests
Change-Id: I2908ae6868dc877d3ce6a8a63ec17826a6dcca1d
 2017-04-12 12:57:55 -07:00
TreeHugger Robot
7b7a99d9e3 Merge "Import translations. DO NOT MERGE" 2017-04-11 22:48:12 +00:00
Jason Monk
824ffffcc4 Make QS light 
Test: visual
Change-Id: I873bc44647d509bad0ac035058ea13ac57717416
Fixes: 37213814
Fixes: 37008758
 2017-04-11 15:49:06 -04:00
TreeHugger Robot
e62e9a274a Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-11 17:49:39 +00:00
Fan Zhang
77ad5781d7 Merge "Update string description and char limits" into oc-dev am: 3151a09dac 
am: 5e56569cdf

Change-Id: I2a2dc3574fdad77c7aac0f38736d9f2fdf7b3805
 2017-04-11 16:42:06 +00:00
Fan Zhang
5e56569cdf Merge "Update string description and char limits" into oc-dev 
am: 3151a09dac

Change-Id: Id3b6af3b66959fb2d8311a7bad646c52ae4b4fe7
 2017-04-11 16:27:09 +00:00
Fan Zhang
3151a09dac Merge "Update string description and char limits" into oc-dev 2017-04-11 16:11:36 +00:00
Bill Yi
c639a10e1d Import translations. DO NOT MERGE 
Change-Id: I8152cc56a3626db7cbafd758eeabf55a275acadc
Auto-generated-cl: translation import
 2017-04-10 19:18:58 -07:00
Bill Yi
fba9c8986c Import translations. DO NOT MERGE 
Change-Id: I6a8ea9c1997c95f57a7c3abbe5c552304f001527
Auto-generated-cl: translation import
 2017-04-10 18:16:02 -07:00
Daniel Nishi
dcc92a8a0a Merge "Fix crash when measuring storage." into oc-dev am: a6bd937c93 
am: fcf746b27c

Change-Id: I0166afbce7f3c058680ac5cb5dd025455d387625
 2017-04-10 23:53:49 +00:00
Jack He
cf6b2528d1 Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd am: d86c1fca76 am: 25c086b7e2 
am: b111c6f753

Change-Id: Iee048785ebe566fcb8e80c5e97bb61a78b4afde2
 2017-04-10 23:31:55 +00:00
Daniel Nishi
fcf746b27c Merge "Fix crash when measuring storage." into oc-dev 
am: a6bd937c93

Change-Id: I33eaab3e22b9e3de0db3e5a9328cb52bf93113ab
 2017-04-10 23:27:51 +00:00
Jack He
b111c6f753 Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd am: d86c1fca76 
am: 25c086b7e2

Change-Id: I7bf3b83c55a2b1dfaf23af65780529cc5a5fa8d4
 2017-04-10 23:20:08 +00:00