Ruben Brunk
823ea696c7
am 2585210c: am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
...
* commit '2585210c8da69c8882f8f86fd3273d5f623248fd':
Add UI for camera + flashlight battery reporting.
2015-06-06 00:41:12 +00:00
Ruben Brunk
2585210c8d
am bf493816: am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
...
* commit 'bf4938166fc539d348dfb8167b03637fecf4d6c0':
Add UI for camera + flashlight battery reporting.
2015-06-06 00:29:46 +00:00
Ruben Brunk
bf4938166f
am e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
...
* commit 'e35df2ff3b8188bdf710f84390f0fc60ec329ab5':
Add UI for camera + flashlight battery reporting.
2015-06-06 00:16:22 +00:00
Ruben Brunk
e35df2ff3b
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
2015-06-06 00:04:19 +00:00
Ruben Brunk
2627190bac
Add UI for camera + flashlight battery reporting.
...
Bug: 11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
2015-06-05 16:05:18 -07:00
Maurice Lam
7c8e7d7ad8
am 32d1728a: am e8f39de6: am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
...
* commit '32d1728aa3419321e9e09113ceb9ba9642777e28':
Update Setup Wizard redaction interstitial styles
2015-06-05 19:46:10 +00:00
Maurice Lam
32d1728aa3
am e8f39de6: am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
...
* commit 'e8f39de661a4a22ced8c72677f53f5420792736e':
Update Setup Wizard redaction interstitial styles
2015-06-05 19:34:20 +00:00
Maurice Lam
e8f39de661
am 26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
...
* commit '26a42d1099fece0bc388db2b923ad5c5411bd4f3':
Update Setup Wizard redaction interstitial styles
2015-06-05 19:22:46 +00:00
Maurice Lam
26a42d1099
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
2015-06-05 19:13:18 +00:00
Jorim Jaggi
00eeb30800
am 3975dbc5: am 685a359c: am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev
...
* commit '3975dbc5e88bf38df41e65ae7e5b2495468bb8e0':
Fix lockpattern weirdness
2015-06-05 18:51:59 +00:00
Jorim Jaggi
3975dbc5e8
am 685a359c: am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev
...
* commit '685a359ca1b3a20fcdc8dae92a5a050c2a7ea3bd':
Fix lockpattern weirdness
2015-06-05 18:39:14 +00:00
Jorim Jaggi
685a359ca1
am 5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev
...
* commit '5ae7cf3a144d1a55fcd40e84567408caf1ced9f4':
Fix lockpattern weirdness
2015-06-05 18:26:21 +00:00
Jorim Jaggi
5ae7cf3a14
Merge "Fix lockpattern weirdness" into mnc-dev
2015-06-05 18:12:17 +00:00
ztenghui
cb791ec938
am 99b66dc7: am b1651d0e: am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
...
* commit '99b66dc776ca624b30303b8a6405657aee834c25':
Setup the animation callback for AnimatedVectorDrawable
2015-06-05 17:14:31 +00:00
ztenghui
99b66dc776
am b1651d0e: am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
...
* commit 'b1651d0e1f3d99bca8cec07f53258b05d169e618':
Setup the animation callback for AnimatedVectorDrawable
2015-06-05 17:02:40 +00:00
ztenghui
b1651d0e1f
am 167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
...
* commit '167a6bcdb74f9f47943a8f16b52e7d1b5ac35589':
Setup the animation callback for AnimatedVectorDrawable
2015-06-05 16:50:14 +00:00
ztenghui
167a6bcdb7
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
2015-06-05 16:37:05 +00:00
Jason Monk
2055685bfd
am 9344bf62: am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
...
* commit '9344bf62321c4c344677b10684935c44be159e7c':
Settings > Apps list style updates
2015-06-05 14:08:44 +00:00
Jason Monk
9344bf6232
am 92f53c02: am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
...
* commit '92f53c0223a84526b51d22d0799e55bc486d63c1':
Settings > Apps list style updates
2015-06-05 13:55:14 +00:00
Jason Monk
2ccfdac69f
am 28efc11e: am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit '28efc11e2bfd94f4b5ba962201f99bbf946b7d27':
Fix some dark theme issues (Take 2)
2015-06-05 13:54:33 +00:00
Jason Monk
92f53c0223
am 1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
...
* commit '1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
Settings > Apps list style updates
2015-06-05 13:48:13 +00:00
Jason Monk
28efc11e2b
am f5a7d673: am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit 'f5a7d673fa1f5707f277e426f9c1e3ef33acee6e':
Fix some dark theme issues (Take 2)
2015-06-05 13:43:35 +00:00
Jason Monk
1b93ef1d9b
Merge "Settings > Apps list style updates" into mnc-dev
2015-06-05 13:36:27 +00:00
Jason Monk
f5a7d673fa
am d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
...
* commit 'd7dbe16142b0fc3faf448a81f3be13af7e95909f':
Fix some dark theme issues (Take 2)
2015-06-05 13:31:00 +00:00
Jason Monk
d7dbe16142
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
2015-06-05 13:23:13 +00:00
Jorim Jaggi
58c5fb38c7
Fix lockpattern weirdness
...
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.
Bug: 21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0
2015-06-04 18:00:34 -07:00
Ye Wen
f5f51ae4ba
am 0bc79df5: am 6d3e900c: am 1cb267ae: Enhance change default SMS app dialog to show list of apps
...
* commit '0bc79df5efd859b6466dfcf031d5027b42a28b0d':
Enhance change default SMS app dialog to show list of apps
2015-06-05 00:47:33 +00:00
Maurice Lam
25e3081575
Update Setup Wizard redaction interstitial styles
...
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug: 21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
2015-06-04 17:17:07 -07:00
Ye Wen
0bc79df5ef
am 6d3e900c: am 1cb267ae: Enhance change default SMS app dialog to show list of apps
...
* commit '6d3e900c3dce4c6277505edb07c0a66f7a1d6bee':
Enhance change default SMS app dialog to show list of apps
2015-06-04 23:08:50 +00:00
Ye Wen
6d3e900c3d
am 1cb267ae: Enhance change default SMS app dialog to show list of apps
...
* commit '1cb267ae67fdff22e2058eb3ee1e6b32994f24d6':
Enhance change default SMS app dialog to show list of apps
2015-06-04 22:45:02 +00:00
Ye Wen
1cb267ae67
Enhance change default SMS app dialog to show list of apps
...
Settings shows a dialog to android.provider.Telephony.ACTION_CHANGE_DEFAULT
intent to confirm if user wants to change default SMS app to a new one.
This is used by SMS apps to obtain default status. In the opposite direction,
i.e. giving up default status, SMS apps have to bring up the wireless
settings page where the default SMS app setting was originally located.
MNC moved this setting to a different location therefore broke the
function. This change enhances the SmsDefaultDialog to display a list of
SMS apps so that user can choose a different default SMS app, when the
new default SMS app package name is not specified within the above
intent.
b/20430567
Change-Id: I75d518900a7cf17f51b0d466bc2d062c470790bb
2015-06-04 15:16:56 -07:00
ztenghui
4d1bec4730
Setup the animation callback for AnimatedVectorDrawable
...
b/21341096
Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4
2015-06-04 12:55:23 -07:00
Jason Monk
bf593b6d36
am 050785af: am 98aedcd6: am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
...
* commit '050785aff5300af9c83a9a06a66b76c79856a50d':
Fix apps/memory screen's spinner alignment
2015-06-04 19:27:11 +00:00
Jason Monk
e103cb157b
Settings > Apps list style updates
...
Bug: 21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c
2015-06-04 15:17:16 -04:00
Jason Monk
050785aff5
am 98aedcd6: am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
...
* commit '98aedcd64f7c180488c33ba6c2f96d22b0a92e96':
Fix apps/memory screen's spinner alignment
2015-06-04 19:13:24 +00:00
Tom O'Neill
fb94c5b73e
am 01af0f21: Merge commit \'1542f9c7\' into manualmerge
...
* commit '01af0f21a9bbccb8dfda5fe4a6621a7233a5d05f':
LocationSettings javadoc describes what's in the UI
2015-06-04 19:11:28 +00:00
Tom O'Neill
01af0f21a9
Merge commit '1542f9c7' into manualmerge
...
Change-Id: I6cb2a52ecb587bb3437ced58a404a2c028a185d9
2015-06-04 11:52:58 -07:00
Jason Monk
98aedcd64f
am 0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
...
* commit '0ad408e646fe6d8f75286a2838bf640d79fcf2ea':
Fix apps/memory screen's spinner alignment
2015-06-04 18:43:28 +00:00
Jason Monk
2d499533b7
Fix some dark theme issues (Take 2)
...
Now with visible lock patterns! Both light and dark!
Bug: 21117509
Bug: 21077345
Bug: 21480587
Bug: 21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
2015-06-04 14:16:10 -04:00
Jason Monk
0ad408e646
Merge "Fix apps/memory screen's spinner alignment" into mnc-dev
2015-06-04 18:09:09 +00:00
Jason Monk
9ed8a0bc64
Fix apps/memory screen's spinner alignment
...
Bug: 21587762
Change-Id: I80d7f2622330b02e63281aca8bd53261c0ad4d9b
2015-06-04 13:54:06 -04:00
Jason Monk
9e57ec3ea3
am 888605de: am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit '888605debd9d5ae35fed839893711aa2c3a3cc70':
Fix dashboard shadows on tablets
2015-06-04 16:53:49 +00:00
Jason Monk
888605debd
am f680c691: am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit 'f680c6919184cbe6750d64b3d0e7a4487514f9db':
Fix dashboard shadows on tablets
2015-06-04 16:43:08 +00:00
Tom O'Neill
1542f9c7d3
Merge "LocationSettings javadoc describes what's in the UI"
2015-06-04 16:28:21 +00:00
Jason Monk
f680c69191
am 34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
...
* commit '34784ec862d86e2f3b3b115e7c065b052b7bc888':
Fix dashboard shadows on tablets
2015-06-04 16:21:43 +00:00
John Spurlock
11d500c9d1
am dec8f810: am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'dec8f8107c13a0a6f0ff4e8d65139eb139a20850':
Settings: Add zen rule name warning text.
2015-06-04 16:16:16 +00:00
Jason Monk
34784ec862
Merge "Fix dashboard shadows on tablets" into mnc-dev
2015-06-04 16:14:32 +00:00
Jason Monk
00dccfcbe8
Fix dashboard shadows on tablets
...
Bug: 19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
2015-06-04 12:04:30 -04:00
John Spurlock
dec8f8107c
am afa64f45: am 1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
...
* commit 'afa64f45ab40457af9a2a70f9aa795e65167693d':
Settings: Add zen rule name warning text.
2015-06-04 16:04:13 +00:00
Jason Monk
d2a7126de4
am 34bdee37: am 06840b31: am cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
...
* commit '34bdee377c74db609b60e2c650d9ce9dd29ca981':
Fix updates of the enable/disable button
2015-06-04 15:57:26 +00:00