Commit Graph

199292 Commits

Author SHA1 Message Date
Jason Monk
db97900feb am cd8b462e: am 87b86a2d: am 46c272d6: Merge "Don\'t dismiss volume during animation" into mnc-dev
* commit 'cd8b462ec4cfc2652346dc3dc8eba3858f9b7c28':
  Don't dismiss volume during animation
2015-07-07 16:22:20 +00:00
Jason Monk
43d88d9a65 am 63138aed: am 9dc0cc00: am f18ed45f: Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev
* commit '63138aedc74a3ceee23b993aad6d579fa9309799':
  Fix to work statusbar configs as mcc/mnc
2015-07-07 16:22:13 +00:00
John Reck
6ac3b54df6 am 8e5d4761: am dfbae1f9: am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev
* commit '8e5d47610a31a5d9a62cdd775ef15506cfe29f52':
  Adjust for pipeline stalls
2015-07-07 16:22:06 +00:00
Zoltan Szatmary-Ban
6ad7925954 am 745873f4: am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev
* commit '745873f4f53d9d66f8e6174760d3078486047aa3':
  Update javadoc on DPM.setGlobalSetting
2015-07-07 16:21:58 +00:00
Richard Coles
2ec1f9d594 am 604e0cc7: am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev
* commit '604e0cc71cc8be9e5d17995adfc02da1ddc06e12':
  Add WebView permission MIDI sysex
2015-07-07 16:21:51 +00:00
Esteban Talavera
156cc70db9 am d4241a86: am 0e9ffff4: am 5a81b61e: Merge "Notify the profile when cloned settings are changed." into mnc-dev
* commit 'd4241a86a28459ee82074c177a147f92385310da':
  Notify the profile when cloned settings are changed.
2015-07-07 16:21:43 +00:00
Andrei Stingaceanu
8f40a25de7 am 5fcfa576: am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev
* commit '5fcfa5761fc2180ccb754ae5fa87e60634fb4e29':
  Drag handles persist after lost focus in extracted mode
2015-07-07 16:21:37 +00:00
Ian Pedowitz
9cde04553b am 78229bbe: am 6d45f279: am 5bc88b9f: Merge "Final resource IDs." into mnc-dev
* commit '78229bbe84c7ecfa87a7e148189cbb6711d7bcef':
  Final resource IDs.
2015-07-07 16:21:30 +00:00
Abodunrinwa Toki
10daed5ebf am b9e46b9d: am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev
* commit 'b9e46b9de0c07e2d138eb5b6ae7234cc1cf7088e':
  FloatingToolbar: Offset visible rect by the rootview's offset
2015-07-07 16:21:24 +00:00
Jason Monk
cd8b462ec4 am 87b86a2d: am 46c272d6: Merge "Don\'t dismiss volume during animation" into mnc-dev
* commit '87b86a2d5418e23f858393f1f074f07a06e9b981':
  Don't dismiss volume during animation
2015-07-07 16:07:19 +00:00
Jason Monk
63138aedc7 am 9dc0cc00: am f18ed45f: Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev
* commit '9dc0cc00563aaa0890d2b8494bfd4c475098417d':
  Fix to work statusbar configs as mcc/mnc
2015-07-07 16:07:16 +00:00
John Reck
8e5d47610a am dfbae1f9: am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev
* commit 'dfbae1f9935cdbfa8662d9437cabd5b9f6e767e0':
  Adjust for pipeline stalls
2015-07-07 16:07:11 +00:00
Zoltan Szatmary-Ban
745873f4f5 am bf307991: am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev
* commit 'bf3079917a03d0244c192faf80503997a8e82d4c':
  Update javadoc on DPM.setGlobalSetting
2015-07-07 16:07:07 +00:00
Richard Coles
604e0cc71c am 2bb68288: am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev
* commit '2bb682883925ad29dccf902397e216d103c95cef':
  Add WebView permission MIDI sysex
2015-07-07 16:07:03 +00:00
Esteban Talavera
d4241a86a2 am 0e9ffff4: am 5a81b61e: Merge "Notify the profile when cloned settings are changed." into mnc-dev
* commit '0e9ffff45889a125290358aea8dc1286e5142ed0':
  Notify the profile when cloned settings are changed.
2015-07-07 16:06:59 +00:00
Andrei Stingaceanu
5fcfa5761f am bb09a7cd: am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev
* commit 'bb09a7cd09428807e3a2d4ba01f20d74b2abc0bc':
  Drag handles persist after lost focus in extracted mode
2015-07-07 16:06:54 +00:00
Ian Pedowitz
78229bbe84 am 6d45f279: am 5bc88b9f: Merge "Final resource IDs." into mnc-dev
* commit '6d45f2793eed19dbdb3922ea6d9113d4deaa37fb':
  Final resource IDs.
2015-07-07 16:06:49 +00:00
Abodunrinwa Toki
b9e46b9de0 am 0bb0e226: am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev
* commit '0bb0e226199102f27179efa6dd1b58bb4bf04558':
  FloatingToolbar: Offset visible rect by the rootview's offset
2015-07-07 16:06:42 +00:00
Jason Monk
87b86a2d54 am 46c272d6: Merge "Don\'t dismiss volume during animation" into mnc-dev
* commit '46c272d6bfc0dd5bbeeb536a9057fa18b754f9ba':
  Don't dismiss volume during animation
2015-07-07 15:50:06 +00:00
Jason Monk
9dc0cc0056 am f18ed45f: Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev
* commit 'f18ed45faf24fdc45ce7c158d46d8ab25d39a6e3':
  Fix to work statusbar configs as mcc/mnc
2015-07-07 15:50:02 +00:00
John Reck
dfbae1f993 am 15b64099: Merge "Adjust for pipeline stalls" into mnc-dev
* commit '15b64099a440a5f6256f4c51c6d9ae13a754f94d':
  Adjust for pipeline stalls
2015-07-07 15:49:55 +00:00
Zoltan Szatmary-Ban
bf3079917a am 41df5bfc: Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev
* commit '41df5bfc0d50d36cb2c46d539043813bebbb1289':
  Update javadoc on DPM.setGlobalSetting
2015-07-07 15:49:49 +00:00
Richard Coles
2bb6828839 am fad2e49c: Merge "Add WebView permission MIDI sysex" into mnc-dev
* commit 'fad2e49c425e2cae88c297cb6cf2ac42e5f6fdd8':
  Add WebView permission MIDI sysex
2015-07-07 15:49:44 +00:00
Esteban Talavera
0e9ffff458 am 5a81b61e: Merge "Notify the profile when cloned settings are changed." into mnc-dev
* commit '5a81b61e879d7f6031c28d0d89d4b785654d2a00':
  Notify the profile when cloned settings are changed.
2015-07-07 15:49:39 +00:00
Andrei Stingaceanu
bb09a7cd09 am bc687f96: Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev
* commit 'bc687f96c74bd164f5d030cebe80d38274ca336c':
  Drag handles persist after lost focus in extracted mode
2015-07-07 15:49:34 +00:00
Ian Pedowitz
6d45f2793e am 5bc88b9f: Merge "Final resource IDs." into mnc-dev
* commit '5bc88b9f46a17d6578d8f8a8b93c7c607d06e063':
  Final resource IDs.
2015-07-07 15:48:57 +00:00
Abodunrinwa Toki
0bb0e22619 am 4603bd34: Merge "FloatingToolbar: Offset visible rect by the rootview\'s offset" into mnc-dev
* commit '4603bd34ce8a5557729e3912a081ec9f8c0d7ab5':
  FloatingToolbar: Offset visible rect by the rootview's offset
2015-07-07 15:48:48 +00:00
Jason Monk
46c272d6bf Merge "Don't dismiss volume during animation" into mnc-dev 2015-07-07 14:34:59 +00:00
Jason Monk
f18ed45faf Merge "Fix to work statusbar configs as mcc/mnc" into mnc-dev 2015-07-07 14:34:47 +00:00
John Reck
15b64099a4 Merge "Adjust for pipeline stalls" into mnc-dev 2015-07-07 14:08:49 +00:00
Sungmin Choi
6be4f6b18d Fix to work statusbar configs as mcc/mnc
Call handleConfigurationChanged() at the end of
PhoneStatusBar#onConfigurationChanged to update statusbar configs.

BUG: 22215928
Change-Id: I7329d4949a8a47717ea037cf007ef0baa63507bd
2015-07-07 09:35:36 -04:00
Zoltan Szatmary-Ban
41df5bfc0d Merge "Update javadoc on DPM.setGlobalSetting" into mnc-dev 2015-07-07 10:17:07 +00:00
Richard Coles
fad2e49c42 Merge "Add WebView permission MIDI sysex" into mnc-dev 2015-07-07 10:15:17 +00:00
Esteban Talavera
5a81b61e87 Merge "Notify the profile when cloned settings are changed." into mnc-dev 2015-07-07 09:27:27 +00:00
Andrei Stingaceanu
bc687f96c7 Merge "Drag handles persist after lost focus in extracted mode" into mnc-dev 2015-07-07 09:14:37 +00:00
Ian Pedowitz
5bc88b9f46 Merge "Final resource IDs." into mnc-dev 2015-07-07 06:13:14 +00:00
Abodunrinwa Toki
4603bd34ce Merge "FloatingToolbar: Offset visible rect by the rootview's offset" into mnc-dev 2015-07-07 03:59:46 +00:00
Jan Nordqvist
6077640a47 am 4f7fb2f1: am 3eaebfe5: am 2047929e: Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev
* commit '4f7fb2f18b0536da592c7197139afa575ed9c938':
  Changed config_wifi_hotspot2_enabled to false.
2015-07-07 02:21:40 +00:00
Selim Cinek
f237470eb9 am 04d71710: am 2b0db74a: am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev
* commit '04d71710a6d04d921cdccb202bb65d5de1832ca2':
  Fixed a bug where redacted notifications had the wrong height
2015-07-07 02:21:34 +00:00
Jan Nordqvist
4f7fb2f18b am 3eaebfe5: am 2047929e: Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev
* commit '3eaebfe5e988561c8b64080144635e2c3652d536':
  Changed config_wifi_hotspot2_enabled to false.
2015-07-07 02:06:05 +00:00
Selim Cinek
04d71710a6 am 2b0db74a: am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev
* commit '2b0db74ad21367427372bdfb1e28319a72b454b3':
  Fixed a bug where redacted notifications had the wrong height
2015-07-07 02:06:01 +00:00
Jan Nordqvist
3eaebfe5e9 am 2047929e: Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev
* commit '2047929ef7c4484e81215b9146f9e435d4d33025':
  Changed config_wifi_hotspot2_enabled to false.
2015-07-07 01:49:01 +00:00
Selim Cinek
2b0db74ad2 am 4d696690: Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev
* commit '4d696690e6fb4059608d239624fde255c916b8e2':
  Fixed a bug where redacted notifications had the wrong height
2015-07-07 01:48:57 +00:00
Jan Nordqvist
2047929ef7 Merge "Changed config_wifi_hotspot2_enabled to false." into mnc-dev 2015-07-07 01:41:17 +00:00
Zhijun He
c16cd2ad66 am 6c7dc58f: am 1f67e4c8: am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev
* commit '6c7dc58f463a2aad431d0d2801dc5ad87385cd69':
  ImageUtils: fix image copy issue
2015-07-07 01:39:19 +00:00
Selim Cinek
4d696690e6 Merge "Fixed a bug where redacted notifications had the wrong height" into mnc-dev 2015-07-07 01:37:07 +00:00
Zhijun He
6c7dc58f46 am 1f67e4c8: am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev
* commit '1f67e4c826f6333ee5d7f174931a5042a0b6fb55':
  ImageUtils: fix image copy issue
2015-07-07 01:31:03 +00:00
Zhijun He
1f67e4c826 am 1f52fce6: Merge "ImageUtils: fix image copy issue" into mnc-dev
* commit '1f52fce6b9535b0c83e703d0141f2f80a4a2ebfa':
  ImageUtils: fix image copy issue
2015-07-07 01:16:39 +00:00
Zhijun He
1f52fce6b9 Merge "ImageUtils: fix image copy issue" into mnc-dev 2015-07-07 01:07:17 +00:00
Adam Lesinski
f036847f2f am c6c21522: am a5bd0e3a: am fe45b29a: Merge "BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore" into mnc-dev
* commit 'c6c215227fd78f04c0959c12bebb1dd44730f0f2':
  BatteryStats: Remove isolated UIDs from /proc/uid_cputime when they are not in use anymore
2015-07-07 01:02:32 +00:00