Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
201,270 Commits 3 Branches 0 Tags
aeddd628645d669448ea25fb72f25d72602cd8ca
Commit Graph

10650 Commits

Author SHA1 Message Date
John Spurlock
a6a9a9e2f6 am 4d6ac6ae: am c3409dd2: Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 
* commit '4d6ac6ae30a5437e0ce8605141151721348ff2a7':
  Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
 2015-06-29 20:29:27 +00:00
John Spurlock
4d6ac6ae30 am c3409dd2: Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 
* commit 'c3409dd25353000fd8ba644e04caeba4dc08ea5f':
  Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS.
 2015-06-29 20:16:38 +00:00
John Spurlock
c3409dd253 Merge "Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS." into mnc-dev 2015-06-29 20:08:44 +00:00
John Spurlock
bc7233a8a3 Volume: Force dismiss on ACTION_CLOSE_SYSTEM_DIALOGS. 
Use ACTION_CLOSE_SYSTEM_DIALOGS as an additional signal to immediately
dismiss the volume dialog, if showing.  Otherwise nav bar navigation
will not immediately dismiss the dialog.

Bug: 22173890
Change-Id: I3eee85a4579b4673b19402cf0f4048068009be35
 2015-06-29 15:34:18 -04:00
Makoto Onuki
c561497116 am 08dfa1b4: am cadf3969: Merge "Notification for non-adopotable disks shouldn\'t be snoozed" into mnc-dev 
* commit '08dfa1b45633d55da2d3da045f076dc4a6b4d58a':
  Notification for non-adopotable disks shouldn't be snoozed
 2015-06-29 17:14:17 +00:00
Makoto Onuki
08dfa1b456 am cadf3969: Merge "Notification for non-adopotable disks shouldn\'t be snoozed" into mnc-dev 
* commit 'cadf3969c313bd0e354157eef9e0bcc552cb0c8a':
  Notification for non-adopotable disks shouldn't be snoozed
 2015-06-29 17:06:09 +00:00
Makoto Onuki
cadf3969c3 Merge "Notification for non-adopotable disks shouldn't be snoozed" into mnc-dev 2015-06-29 16:56:09 +00:00
Jason Monk
9117f34bea am 7b3550c0: am 435a1dfb: Merge "Fix weird case of multi cell icons" into mnc-dev 
* commit '7b3550c09a3e9c27ca8924721efe8efe1a316f48':
  Fix weird case of multi cell icons
 2015-06-29 16:46:32 +00:00
Jason Monk
7b3550c09a am 435a1dfb: Merge "Fix weird case of multi cell icons" into mnc-dev 
* commit '435a1dfbd67371849c60ecd46df1d82a0f496cd8':
  Fix weird case of multi cell icons
 2015-06-29 16:32:53 +00:00
Jason Monk
435a1dfbd6 Merge "Fix weird case of multi cell icons" into mnc-dev 2015-06-29 16:19:48 +00:00
John Spurlock
fb3f2642af am 090a9437: am f21f1a91: Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev 
* commit '090a9437b3ce5bc23746d56850bf72f6b5edeac1':
  Volume Dialog: Fix NPE found in monkey testing.
 2015-06-29 16:13:27 +00:00
John Spurlock
090a9437b3 am f21f1a91: Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev 
* commit 'f21f1a915833783917b598f843b946975421ffd2':
  Volume Dialog: Fix NPE found in monkey testing.
 2015-06-29 16:02:10 +00:00
John Spurlock
f21f1a9158 Merge "Volume Dialog: Fix NPE found in monkey testing." into mnc-dev 2015-06-29 15:50:51 +00:00
John Spurlock
dc005a8965 Volume Dialog: Fix NPE found in monkey testing. 
Bug: 22116033
Change-Id: I34c586ec77bd0d2baae4e84c07afc781cda09ec3
 2015-06-29 11:42:28 -04:00
Jason Monk
8fcab35828 Fix weird case of multi cell icons 
- Don't auto-inflate cell icons
 - Move callback to better time (shouldn't get callbacks before
   setSubs)
 - Fix accidental callback in MobileSignalController constructor
 - Fix subscription listener to run on the right thread to avoid
   the thread issue allowing this bug

Bug: 21504138
Change-Id: Ie1adf8eb05e1042245eead5354b29b314a2e0aae
 2015-06-29 11:00:24 -04:00
Geoff Mendal
3945defe60 Import translations. DO NOT MERGE 
Change-Id: I0a27f1d72cdcad094a9651c223f14e3a928ea2c3
Auto-generated-cl: translation import
 2015-06-29 08:52:39 -05:00
Robin Lee
6598e805c5 am 51c54489: am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev 
* commit '51c5448949111132b565276b27a2ecd91b0aaf64':
  SystemUI: show owner VPN for restricted profile
 2015-06-26 21:11:47 +00:00
Robin Lee
51c5448949 am cd7ceb07: Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev 
* commit 'cd7ceb0711672eabd1de578f2452ddcb8a322f68':
  SystemUI: show owner VPN for restricted profile
 2015-06-26 20:58:21 +00:00
Robin Lee
cd7ceb0711 Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev 2015-06-26 20:44:57 +00:00
Robin Lee
63204eeafe SystemUI: show owner VPN for restricted profile 
Restricted profiles don't have their own VPN configuration - whatever
is in charge of VPN for our USER_OWNER user will have network traffic
routed to it instead.

Bug: 18419023
Bug: 21188177
Change-Id: I7205d90032461c240048a036606c3a7938d0eda2
 2015-06-26 10:35:25 -07:00
Selim Cinek
2a2c81a75a am 018c33ce: am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev 
* commit '018c33ce72feeba5e3ab28aa2c2eee5be5c0e3fb':
  Fixed a crash where onTouch might have been called too early
 2015-06-26 15:46:25 +00:00
Selim Cinek
e4c4d0f919 am db82c17f: am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev 
* commit 'db82c17fc958ee5fe0683e64a46d5ee4559fd0dc':
  Now showing unlocked icon if both trusted and fingerprint running
 2015-06-26 15:46:18 +00:00
Selim Cinek
018c33ce72 am b84ace51: Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev 
* commit 'b84ace51b21b9b1d422e96ed023ef3860ca0710d':
  Fixed a crash where onTouch might have been called too early
 2015-06-26 15:33:24 +00:00
Selim Cinek
db82c17fc9 am eb4ce1d6: Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev 
* commit 'eb4ce1d6a3bfa99ec57604aa842835a381616346':
  Now showing unlocked icon if both trusted and fingerprint running
 2015-06-26 15:33:17 +00:00
Selim Cinek
b84ace51b2 Merge "Fixed a crash where onTouch might have been called too early" into mnc-dev 2015-06-26 15:26:29 +00:00
Selim Cinek
eb4ce1d6a3 Merge "Now showing unlocked icon if both trusted and fingerprint running" into mnc-dev 2015-06-26 15:26:08 +00:00
Selim Cinek
4e6b2d3e7d Fixed a crash where onTouch might have been called too early 
Bug: 21906153
Change-Id: I1fbc8b29f9cb0d7d71d6cb81e95a35da2fe9959e
 2015-06-25 20:15:33 -04:00
Selim Cinek
2a46d68571 Now showing unlocked icon if both trusted and fingerprint running 
Bug: 21781452
Change-Id: I7b04975b36f7a135358cdd68c1bdae1e73f22cc0
 2015-06-25 19:44:05 -04:00
Jorim Jaggi
8043ea5f8c am ba654e6c: am 91617a79: Hide assist when launching an activity over an action 
* commit 'ba654e6c0408951d24d65019626fd6da0e696bac':
  Hide assist when launching an activity over an action
 2015-06-25 22:55:22 +00:00
Jorim Jaggi
6457e8a223 am 37a2b992: am 7e6571f1: Use long press of KeyButtonView to invoke assist 
* commit '37a2b9929a1fd9298b64e740a832c29c63b1a414':
  Use long press of KeyButtonView to invoke assist
 2015-06-25 22:55:16 +00:00
Jorim Jaggi
ba654e6c04 am 91617a79: Hide assist when launching an activity over an action 
* commit '91617a793ed6a80f3abfd3653b0f74b9321fe0f6':
  Hide assist when launching an activity over an action
 2015-06-25 22:50:14 +00:00
Jorim Jaggi
37a2b9929a am 7e6571f1: Use long press of KeyButtonView to invoke assist 
* commit '7e6571f13da776dca4966dee0159e7741102fca9':
  Use long press of KeyButtonView to invoke assist
 2015-06-25 22:50:10 +00:00
Jorim Jaggi
91617a793e Hide assist when launching an activity over an action 
Also make sure to resume app switches in this case.

Bug: 22071080
Change-Id: Ib30e064f4a5d0768b608e23183a34e326ada32e6
 2015-06-25 22:39:53 +00:00
Jorim Jaggi
7e6571f13d Use long press of KeyButtonView to invoke assist 
This makes sure that accessibility is handled properly.

Bug: 18778078
Change-Id: I967b387aabff973b5a9fea649a805540ee08eea8
 2015-06-25 22:39:21 +00:00
Selim Cinek
81c53e5f55 am 6a75422b: am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev 
* commit '6a75422b6224a51bb7ed8cb72bbee98cd4ca43e7':
  Fixed a HUN crash with notification children
 2015-06-25 20:00:59 +00:00
Selim Cinek
6a75422b62 am 0ebd001f: Merge "Fixed a HUN crash with notification children" into mnc-dev 
* commit '0ebd001f3068116b93e8a447f35f01a5b96ec161':
  Fixed a HUN crash with notification children
 2015-06-25 19:03:37 +00:00
Selim Cinek
0ebd001f30 Merge "Fixed a HUN crash with notification children" into mnc-dev 2015-06-25 18:37:56 +00:00
Winson Chung
73d86f9d39 am 04ececc6: am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev 
* commit '04ececc6feb89e522e833ffa417e7c2fb07b6743':
  Refactoring recents search bar widget logic.
 2015-06-25 18:04:23 +00:00
Winson Chung
04ececc6fe am b49dbeef: Merge "Refactoring recents search bar widget logic." into mnc-dev 
* commit 'b49dbeef5253c346a172b7516c4526fa79dadd77':
  Refactoring recents search bar widget logic.
 2015-06-25 17:35:06 +00:00
Winson Chung
b49dbeef52 Merge "Refactoring recents search bar widget logic." into mnc-dev 2015-06-25 17:24:55 +00:00
Selim Cinek
eaee9c0190 Fixed a HUN crash with notification children 
Notification children were not properly handled
before when added lead to a crash.
This will fix this bug finally.

Bug: 21868047
Change-Id: I92f2f7e71659de8274711a448e370084d423ca9f
 2015-06-25 11:05:52 -04:00
Winson Chung
af3bb69367 Refactoring recents search bar widget logic. 
Bug: 19062975

Change-Id: I303710598675aeebca8f34ac57de6249462ec033
 2015-06-24 18:44:44 -07:00
Selim Cinek
2a0295144a am 60b716ef: am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev 
* commit '60b716ef006091d335eda01c73cfe322b6208901':
  Fixed a bug with encryption where the keyguard was never shown with PIN
 2015-06-24 22:39:21 +00:00
Selim Cinek
60b716ef00 am 3b9fbd2f: Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev 
* commit '3b9fbd2f2de75e53a836d3cb73bcfc25fdb3a67a':
  Fixed a bug with encryption where the keyguard was never shown with PIN
 2015-06-24 22:25:25 +00:00
Selim Cinek
3b9fbd2f2d Merge "Fixed a bug with encryption where the keyguard was never shown with PIN" into mnc-dev 2015-06-24 22:19:38 +00:00
Winson Chung
5ef494e004 am b7874005: am 6301d802: Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev 
* commit 'b78740052d28369260587b8fcb165558124952fc':
  Catching launch errors when trying to go Home while Home is updating.
 2015-06-24 21:44:27 +00:00
Winson Chung
b78740052d am 6301d802: Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev 
* commit '6301d802244f6e6c9fc6084e4bedd20ba0bd3064':
  Catching launch errors when trying to go Home while Home is updating.
 2015-06-24 21:32:06 +00:00
Winson Chung
6301d80224 Merge "Catching launch errors when trying to go Home while Home is updating." into mnc-dev 2015-06-24 21:21:24 +00:00
Winson Chung
b8f03072d4 Catching launch errors when trying to go Home while Home is updating. 
Bug: 21442898

Change-Id: I7fc74422b220cb02acb195b5c9121ff72bc16dbe
 2015-06-24 14:11:45 -07:00
John Spurlock
14114aea3c am 4d2c6a5e: am 6b0f384f: Merge "Volume Motion: Initial show and expand transition." into mnc-dev 
* commit '4d2c6a5e9f458437b73a472ab545af639d72553f':
  Volume Motion: Initial show and expand transition.
 2015-06-24 19:11:03 +00:00