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

14611 Commits

Author SHA1 Message Date
Wink Saville
494601e39a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
automerge: 9482799

* commit '948279954ac88ecfd0678713158175702d981c73':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 21:09:10 +00:00
Jason Monk
44f397efcf am 2168062b: am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev automerge: a50a668 
* commit '2168062b23c8c343330f9a7b074a51efc4780cde':
  Carrier text handle sim removal
 2015-01-13 20:31:32 +00:00
Wink Saville
948279954a am 6a903c31: am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '6a903c31fede2fabdbcda7b5fe0cddcf467f1eb7':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:15:58 +00:00
Wink Saville
6a903c31fe am 84c5e8eb: Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 
* commit '84c5e8ebf0185ca65d4bab148f6d72d71940aba8':
  Rename reg/unreg OnSubscriptionsChangedListener.
 2015-01-13 19:09:48 +00:00
Wink Saville
84c5e8ebf0 Merge "Rename reg/unreg OnSubscriptionsChangedListener." into lmp-mr1-dev 2015-01-13 19:02:07 +00:00
Winson Chung
7ce662ef87 Merge "DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes." into lmp-mr1-dev 2015-01-13 18:16:22 +00:00
Wink Saville
071743f0cb Rename reg/unreg OnSubscriptionsChangedListener. 
To addOnSubscriptionsChangedListener and
removeOnSubscriptionsChangedListener.

Bug: 18984103
Change-Id: I6636905093812af89c1c3702840e44c8c5ea891f
 2015-01-13 08:36:24 -08:00
Jason Monk
49accefb6f resolve merge conflicts of afeefb6 to master. 
Change-Id: I754a8439f77e4f9e2f636c5b7a04280a01721c95
 2015-01-13 09:15:17 -05:00
Winson Chung
98e8f7ac5e DO NOT MERGE. Ensure screen pinning UI appears immediately after setting changes. 
Fixes an issue where the screen pinning UI in the Overview space would
not appear on the first load after changing the setting, this was because
the updated flag was not read before the tasks were preloaded prior to
entering the Overview space.

Bug: 18986736
Change-Id: I50dc9ff6d369fb3f2593f2bf2c1dc4608878820f
 2015-01-12 17:36:47 -08:00
Jason Monk
2168062b23 am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
automerge: a50a668

* commit 'a50a66824c3cb17bc618b4e2ca3166003b6ddc26':
  Carrier text handle sim removal
 2015-01-12 21:08:38 +00:00
Jason Monk
a50a66824c am 0a1eb640: Merge "Carrier text handle sim removal" into lmp-mr1-dev 
* commit '0a1eb640d29830813bb478b8635763a708b6310c':
  Carrier text handle sim removal
 2015-01-12 21:06:46 +00:00
Jason Monk
0a1eb640d2 Merge "Carrier text handle sim removal" into lmp-mr1-dev 2015-01-12 21:00:09 +00:00
Jason Monk
afeefb63c6 am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
automerge: 3454612

* commit '3454612e2c0879ece4ac17c8b7ba93dce59b1907':
  Avoid showing emergency calls when not possible
 2015-01-12 16:28:02 +00:00
Jason Monk
3454612e2c am d74a331a: Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 
* commit 'd74a331ae16b17cf1967186b5392676d2e3c427c':
  Avoid showing emergency calls when not possible
 2015-01-12 16:25:56 +00:00
Geoff Mendal
91a9bfc346 Merge "Import translations. DO NOT MERGE" 2015-01-12 15:10:53 +00:00
Geoff Mendal
07adc61c66 Import translations. DO NOT MERGE 
Change-Id: I819509b5730478b287816b9f6f8c09623bd12dd2
Auto-generated-cl: translation import
 2015-01-12 07:10:22 -08:00
Geoff Mendal
881f8d1ee3 Import translations. DO NOT MERGE 
Change-Id: Ic7e685a040aabf416658ed9d70fbbdef047f7cb9
Auto-generated-cl: translation import
 2015-01-12 06:49:42 -08:00
Jason Monk
d74a331ae1 Merge "Avoid showing emergency calls when not possible" into lmp-mr1-dev 2015-01-12 14:01:04 +00:00
Jason Monk
6c985dcc2d Carrier text handle sim removal 
Have KeyguardUpdateMonitor send the onRefreshCarrierInfo when the
subscription info changes, regardless of whether there are any
subscriptions (because there might be no sims).

Bug: 18752587
Change-Id: I8976c76aae9e3e633b6adace48dccb1e940dbc18
 2015-01-09 16:07:14 -05:00
Christopher Tate
0c3e78c93f am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev automerge: 68dabad 
automerge: f3ac99f

* commit 'f3ac99f2e093f851ca52bcd5aefb251046db10fa':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:25:31 +00:00
Christopher Tate
f3ac99f2e0 am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
automerge: 68dabad

* commit '68dabada9e6e380ec0c6dacbc2ce7a46aa663a07':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:20:01 +00:00
Christopher Tate
68dabada9e am a97fe138: Merge "Exclude ephemeral networks from wifi backup" into lmp-mr1-dev 
* commit 'a97fe1387df731ddbbdae7c75dfbdfa4f1eb0339':
  Exclude ephemeral networks from wifi backup
 2015-01-09 20:16:21 +00:00
Chet Haase
5058c38a31 Add backgroundColor getter to View 
Change-Id: I3a75169a2e91ec712fb1db4d130089a1261fc66b
 2015-01-09 10:00:22 -08:00
Jim Miller
83eb4443a9 Merge "Remove unused string from keyguard_presentation." 2015-01-09 03:10:54 +00:00
Christopher Tate
cab915a327 Exclude ephemeral networks from wifi backup 
We compare the set of networks defined in the supplicant with the
set of networks described as "configured" by the Wifi Manager.  The
latter excludes ephemeral networks, so any network definition we
find in the supplicant data that we do not also find in the
configured network set, we ignore for backup purposes.

Bug 18917753

Change-Id: I8e0f258d0cdb72d7bf9482fafe64dc921419fcb2
 2015-01-08 19:05:04 -08:00
Alan Viverette
5b0467522c Fix bad super call in PhoneStatusBarView accessibility 
Change-Id: Ie18e6c9b74dce498c1c830ce983a73aa619c6df3
 2015-01-08 11:13:06 -08:00
Jason Monk
b36becff08 Avoid showing emergency calls when not possible 
Tablets aren't phones, so we shouldn't be showing an emergency calls
only message when in airplane mode or no sims are in them.

Bug: 18897573
Change-Id: I8cf31fe73dfd6dfd672a5ee58524815475a76c9c
 2015-01-08 11:12:39 -05:00
Alan Viverette
2d4c476aca Merge "Fix accessibility delegation" 2015-01-08 00:07:25 +00:00
Alan Viverette
a54956a0bc Fix accessibility delegation 
Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.

By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.

BUG: 17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740
 2015-01-07 16:05:02 -08:00
John Spurlock
ee7712c0a9 Merge "Remove two obsolete status bar icons." 2015-01-07 16:45:23 +00:00
John Spurlock
f55bb573b2 Remove two obsolete status bar icons. 
Change-Id: I054d90044b889642ae3ba7affce71304ca44ca8d
 2015-01-07 11:36:32 -05:00
Jason Monk
5c530d8803 Merge "SysUI: Separate SignalControllers into separate files" 2015-01-07 16:32:52 +00:00
Jason Monk
da68f59628 SysUI: Separate SignalControllers into separate files 
and remove the TODO that says to do it.

Change-Id: I54ac3f27f9246aea87d21f2a1da6608ae675aae6
 2015-01-07 11:19:10 -05:00
John Spurlock
5b13e92271 Remove detestable tab characters. 
Change-Id: Ia225720af80c07580e5a6ea5098b3d85da7a8dfe
 2015-01-07 11:12:58 -05:00
Jorim Jaggi
4af69ea0cf Merge "Remove dead code #8: Remove old keyguard "bouncer"" 2015-01-07 16:10:27 +00:00
Jorim Jaggi
26118d5260 Merge "Remove dead code #7: Remove unused SysUI resources" 2015-01-07 16:09:44 +00:00
Jorim Jaggi
e020360350 Merge "Remove dead code #6: Delete old recents implementation" 2015-01-07 16:09:05 +00:00
Jorim Jaggi
c892238496 Merge "Remove dead code #5: Remove KeyguardAccountView" 2015-01-07 16:08:26 +00:00
Jorim Jaggi
0603209463 Merge "Remove dead code #4: Remove unused Keyguard strings" 2015-01-07 16:06:30 +00:00
Jorim Jaggi
359fc655ce Merge "Remove dead code #3: Remove unused Keyguard drawables" 2015-01-07 16:04:59 +00:00
Jorim Jaggi
d1a9feb322 Merge "Remove dead code #2: Remove unused Keyguard resources" 2015-01-07 16:04:41 +00:00
Jorim Jaggi
7b5eb5ca04 Merge "Remove dead code #1: Remove unused Keyguard classes" 2015-01-07 16:04:23 +00:00
Geoff Mendal
719d5b3df0 Import translations. DO NOT MERGE 
Change-Id: Idcfd4c630d636eeaaafd95085223178e395d0584
Auto-generated-cl: translation import
 2015-01-07 06:38:31 -08:00
Jorim Jaggi
6b88cdfba7 Remove dead code #8: Remove old keyguard "bouncer" 
Also squashes KeyguardViewBase and KeyguardSimpleHostView into
KeyguardHostView, uses a constant for the user activity timeout
(custom value no longer used).

Change-Id: I919b7d3de1dd1590b20e0f14f0e193ee2b3dc21e
 2015-01-07 15:20:37 +01:00
Jorim Jaggi
a9ef7929b8 Remove dead code #7: Remove unused SysUI resources 
Change-Id: I6e338dee76063d7d200967bef0ed1122c2769d42
 2015-01-07 15:20:28 +01:00
Jorim Jaggi
d61f2271c4 Remove dead code #6: Delete old recents implementation 
Change-Id: I93b1257563d6352a54141bd4c90d2d4587782fd2
 2015-01-07 15:20:13 +01:00
Jorim Jaggi
cd3b5b52ac Remove dead code #5: Remove KeyguardAccountView 
Change-Id: I04431625e922e9554ce55b852bd8ee571049339b
 2015-01-07 15:01:00 +01:00
Jorim Jaggi
8a8941aa1b Remove dead code #4: Remove unused Keyguard strings 
And also remove an unused class.

Change-Id: I50a8a21d99a85cf0d3c301e7b54f434679e1be26
 2015-01-07 15:00:41 +01:00
Jorim Jaggi
4726247b97 Remove dead code #3: Remove unused Keyguard drawables 
Change-Id: Ie11f0834bf55ae979bff78f249221afd553bfd8b
 2015-01-07 15:00:26 +01:00
Jorim Jaggi
a29e81bc7f Remove dead code #2: Remove unused Keyguard resources 
Change-Id: If5e2b62556e6ee158e09e399c7ddec337dba15d5
 2015-01-07 15:00:16 +01:00