1501 Commits

Author SHA1 Message Date
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
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
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
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
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
Bill Yi
ca0db87f3e Import translations. DO NOT MERGE
Change-Id: Iaf188ae0fe780b83f7caa70e8221126d1ffed110
Auto-generated-cl: translation import
2017-04-13 04:43:14 -07: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
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
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
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
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
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
Daniel Nishi
a6bd937c93 Merge "Fix crash when measuring storage." into oc-dev 2017-04-10 23:12:21 +00:00
Jack He
25c086b7e2 Merge "Add developer setting and system API for inband ringing support" am: 1da38b2bcd
am: d86c1fca76

Change-Id: I711f396cbf1a63177fc8e61956264c3d7ce5a375
2017-04-10 23:11:15 +00:00
Fan Zhang
c1ae9cd296 Update string description and char limits
Change-Id: Idba5977e614094c3a96b1101f1234f26433300c8
Fix: 36680364
Test: builds
2017-04-10 16:08:30 -07:00
Jack He
e86bdcaed1 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
2017-04-10 19:49:36 +00:00
Daniel Nishi
140ceb1dcc Use the real filters when determining Other Apps.
This fixes a bug where an app could be classified twice.

Fixes: 36535527
Test: SettingsLib Unit Test
Change-Id: I830a76fa33680b1dd71b285d9419139f84f1d60d
2017-04-07 14:26:38 -07:00
Daniel Nishi
45c23fa689 Add support for movies & tv apps querying.
Bug: 36223441
Test: Robotest
Change-Id: Icbb9b8947112f45d37858ceb5cfb1d76f06bda32
Merged-In: Icfb34844601f87d11b7309eacf9385d49ed36338
2017-04-07 14:20:36 -07:00
Bill Yi
a7916661b8 Import translations. DO NOT MERGE
Change-Id: I47751b435795e850ded7fcc84e0d8fa88dd5c694
Auto-generated-cl: translation import
2017-04-07 08:30:10 -07:00
Filip Pavlis
3b3bf87165 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev
am: 59dd2ebfc1

Change-Id: I2ad78ef36e3c459308bb201d0798e8af3d55f2eb
2017-04-07 10:38:35 +00:00
Filip Pavlis
59dd2ebfc1 Merge "Omit using ctor of PreferenceViewHolder in tests." into oc-dev 2017-04-07 10:31:44 +00:00
Tadashi G. Takaoka
46699675aa Remove supportsDismissingSelfWindow attribute of IME
This partially reverts CL I0f6b130a7df57557e40b52a7b7ac00be965a17c3.

Fixes: 34133139
Test: Confirm that unit test passed.
    adb install out/target/product/.../data/app/FrameworksCoreTests/FrameworksCoreTests.apk
    adb shell am instrument -w \
        -e class android.view.inputmethod.InputMethodInfoTest \
        com.android.frameworks.coretests/android.support.test.runner.AndroidJUnitRunner
Change-Id: I2b94263b2a0bf330bf9973567fea2d35176754d7
2017-04-07 10:43:43 +09:00
William Luh
5669141382 Merge "Fix injected settings titles not matching a locale change." into oc-dev
am: 1b54760eee

Change-Id: Icdeb7d2e65a0c6061b773765cb6470684d24c5b2
2017-04-07 00:09:34 +00:00
William Luh
1b54760eee Merge "Fix injected settings titles not matching a locale change." into oc-dev 2017-04-07 00:00:44 +00:00
jackqdyulei
cd98c5dd0f Merge "Add lower case charging string." into oc-dev
am: e263940142

Change-Id: Iad64dbd0b57028e2a5567c81bb86152cdb6d17a4
2017-04-06 22:39:20 +00:00
TreeHugger Robot
e263940142 Merge "Add lower case charging string." into oc-dev 2017-04-06 22:30:49 +00:00
jackqdyulei
2ffa7db9f0 Merge "Add showChargingMethod in BatteryInfo" into oc-dev
am: 5883a40931

Change-Id: Ic110cc08f3bcd4720210744531703e0be15c9371
2017-04-06 22:17:47 +00:00
TreeHugger Robot
5883a40931 Merge "Add showChargingMethod in BatteryInfo" into oc-dev 2017-04-06 22:06:25 +00:00
William Luh
4c978a302a Fix injected settings titles not matching a locale change.
The injected tiles code currently treats the string metadata value
for the title key in the Activity's manifest as the title itself.
When the language on the device is changed the title remains in the
previous language until a reboot.

This CL will make injected tiles attempt to treat the string metadata
value as a resource variable to get the integer res id and then
properly load the localized title using the res id. To be backwards
compatible, if the res id is 0, we treat the string metadata value as
the title itself (current behavior).

Bug:36470694
Test: make RunSettingsLibRoboTests
Change-Id: I3963534a3a3a27d0455c4ed1ad4fa574b03d67fc
2017-04-06 14:35:51 -07:00
Daniel Nishi
b28c9d6b2d Fix crash when measuring storage.
If we are measuring storage and a volume is removed at the same time,
we can enter a state where we previously verified the volume existed,
but it no longer does. This causes an NPE.

By adding in a null check, we can avoid this crash.

Change-Id: Ib8dbf05102a122bdf4bb6063374e993a1de68425
Fixes: 36689190
Test: None
2017-04-06 14:32:13 -07:00
Sundeep Ghuman
ca53b1fcfe Merge "Update comment on why Keep is needed." into oc-dev
am: 696a83b0c7

Change-Id: I3d55f1601a6a491550f3d22fb66f4331ddad1eef
2017-04-06 20:40:11 +00:00
TreeHugger Robot
696a83b0c7 Merge "Update comment on why Keep is needed." into oc-dev 2017-04-06 20:32:44 +00:00